Skip to content

Commit c9de725

Browse files
seebeenseebeen
committedDec 16, 2024··
fix: Indentation sniff tweaks
·
v1.2.6v1.2.0
1 parent e66b020 commit c9de725

File tree

8 files changed

+161
-108
lines changed

8 files changed

+161
-108
lines changed
 

‎.gitattributes

+14-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,14 @@
1-
.phpcs.xml export-ignore
1+
/.github export-ignore
2+
/docs export-ignore
3+
/tests export-ignore
4+
/.codeclimate.yml export-ignore
5+
/.editorconfig export-ignore
6+
/.gitattributes export-ignore
7+
/.gitignore export-ignore
8+
/.releaserc export-ignore
9+
/CODE_OF_CONDUCT.md export-ignore
10+
/CONTRIBUTING.md export-ignore
11+
/README.md export-ignore
12+
/SECURITY.md export-ignore
13+
/.phpcs.xml export-ignore
14+
/phpunit.xml export-ignore

‎.github/workflows/release.yml

+26-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
name: Release
1+
name: CI
22
on:
3-
workflow_dispatch:
43
push:
54
branches:
65
- master
6+
- develop
7+
- alpha
8+
- beta
9+
710
jobs:
811
release:
912
name: Release
@@ -13,13 +16,25 @@ jobs:
1316
uses: actions/checkout@v4
1417
with:
1518
fetch-depth: 0
16-
token: ${{ secrets.OBLAK_BOT_TOKEN }}
17-
- name: Publish a composer package
18-
uses: better-php-actions/publish-composer-package@v1
19+
token: ${{ secrets.OBLAKBOT_PAT }}
20+
- name: Import GPG key
21+
uses: crazy-max/ghaction-import-gpg@v6
22+
id: gpg
1923
with:
20-
package_slug: 'oblak-wordpress-coding-standard'
21-
package_name: 'Oblak WP Coding Standard'
22-
with_gpg: true
23-
gpg_key: ${{ secrets.GPG_PRIVATE_KEY }}
24-
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
25-
release_token: ${{ secrets.OBLAK_BOT_TOKEN }}
24+
gpg_private_key: ${{ secrets.OBLAKBOT_GPG_KEY }}
25+
passphrase: ${{ secrets.OBLAKBOT_GPG_PASS }}
26+
git_config_global: true
27+
git_user_signingkey: true
28+
git_commit_gpgsign: true
29+
- name: Semantic Release
30+
uses: cycjimmy/semantic-release-action@v4
31+
with:
32+
extra_plugins: |
33+
@semantic-release/github
34+
@semantic-release/exec
35+
env:
36+
GIT_AUTHOR_NAME: ${{ steps.gpg.outputs.name}}
37+
GIT_AUTHOR_EMAIL: ${{ steps.gpg.outputs.email}}
38+
GIT_COMMITTER_NAME: ${{ steps.gpg.outputs.name}}
39+
GIT_COMMITTER_EMAIL: ${{ steps.gpg.outputs.email}}
40+
GITHUB_TOKEN: ${{ secrets.OBLAKBOT_PAT }}

‎.releaserc

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"branches": [
3+
"master",
4+
{
5+
"name": "develop",
6+
"prerelease": true
7+
},
8+
{
9+
"name": "alpha",
10+
"prerelease": true
11+
},
12+
{
13+
"name": "beta",
14+
"prerelease": true
15+
}
16+
],
17+
"plugins": [
18+
"@semantic-release/commit-analyzer",
19+
"@semantic-release/release-notes-generator",
20+
[
21+
"@semantic-release/exec",
22+
{
23+
"prepareCmd": "zip -r '/tmp/release.zip' ./src README.md ./composer.json"
24+
}
25+
],
26+
[
27+
"@semantic-release/github",
28+
{
29+
"assets": [
30+
{
31+
"path": "/tmp/release.zip",
32+
"name": "oblak-wp-coding-standards-v${nextRelease.version}.zip",
33+
"label": "Oblak WordPress Coding Standards v${nextRelease.version}"
34+
}
35+
]
36+
}
37+
]
38+
]
39+
}

‎README.md

Whitespace-only changes.

‎src/Oblak-Core/ruleset.xml

+59-71
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,100 @@
11
<?xml version="1.0"?>
22
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Oblak WordPress Core coding standard">
33

4-
<!--
4+
<!--
55
#############################################################################
66
BASE CONFIG
77
#############################################################################
88
-->
9-
<arg value="sp"/> <!-- Show sniff and progress -->
10-
<arg name="parallel" value="8"/> <!-- Enables parallel processing when available for faster results. -->
11-
<arg name="colors"/> <!-- Show colors -->
12-
<arg name="extensions" value="php"/> <!-- File extensions to check -->
9+
<arg name="tab-width" value="4"/> <!-- Set the tab width -->
10+
<arg value="sp"/> <!-- Show sniff and progress -->
11+
<arg name="parallel" value="8"/> <!-- Enables parallel processing when available for faster results. -->
12+
<arg name="colors"/> <!-- Show colors -->
13+
<arg name="extensions" value="php"/> <!-- File extensions to check -->
1314

14-
15-
<!--
15+
<!--
1616
#############################################################################
1717
EXCLUDE PATTERNS
1818
#############################################################################
1919
-->
20-
<exclude-pattern>dist/*</exclude-pattern>
21-
<exclude-pattern>docker/*</exclude-pattern>
22-
<exclude-pattern>node_modules/*</exclude-pattern>
23-
<exclude-pattern>tests/*</exclude-pattern>
24-
<exclude-pattern>vendor/*</exclude-pattern>
20+
<exclude-pattern>dist/*</exclude-pattern>
21+
<exclude-pattern>docker/*</exclude-pattern>
22+
<exclude-pattern>node_modules/*</exclude-pattern>
23+
<exclude-pattern>tests/*</exclude-pattern>
24+
<exclude-pattern>vendor/*</exclude-pattern>
2525

26-
<!--
26+
<!--
2727
#############################################################################
2828
SET UP THE RULESETS - WordPress
2929
#############################################################################
3030
-->
3131
<rule ref="PHPCompatibilityWP"/>
32-
<rule ref="WordPress-Extra"/>
33-
<rule ref="WordPress-Docs"/>
34-
32+
<rule ref="WordPress-Extra"/>
33+
<rule ref="WordPress-Docs"/>
3534

36-
<!--
35+
<!--
3736
#############################################################################
3837
SET UP THE RULESETS - PHPCsExtra
3938
#############################################################################
4039
-->
41-
<rule ref="Modernize"/>
42-
<rule ref="Universal.Arrays.MixedKeyedUnkeyedArray"/>
43-
<rule ref="Universal.Files.SeparateFunctionsFromOO"/>
40+
<rule ref="Modernize"/>
41+
<rule ref="Universal.Arrays.MixedKeyedUnkeyedArray"/>
42+
<rule ref="Universal.Files.SeparateFunctionsFromOO"/>
4443

45-
<!--
44+
<!--
4645
#############################################################################
4746
Allow normal classnames for autoload
4847
#############################################################################
4948
-->
50-
<rule ref="WordPress-Core">
51-
<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
52-
<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
53-
</rule>
49+
<rule ref="WordPress-Core">
50+
<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
51+
<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
52+
</rule>
5453

55-
<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter">
56-
<severity>5</severity>
57-
</rule>
58-
<rule ref="Generic.Commenting.Todo"/>
54+
<rule ref="Generic.CodeAnalysis.UnusedFunctionParameter">
55+
<severity>5</severity>
56+
</rule>
57+
<rule ref="Generic.Commenting.Todo"/>
5958

60-
<!--
59+
<!--
6160
#############################################################################
6261
Add the default text domains
6362
#############################################################################
6463
-->
65-
<rule ref="WordPress.WP.I18n">
66-
<properties>
67-
<property name="text_domain" type="array">
68-
<element value="default"/>
69-
</property>
70-
</properties>
71-
</rule>
64+
<rule ref="WordPress.WP.I18n">
65+
<properties>
66+
<property name="text_domain" type="array">
67+
<element value="default"/>
68+
</property>
69+
</properties>
70+
</rule>
7271

73-
<!--
72+
<!--
7473
#############################################################################
7574
Use Tabs instead of spaces
7675
#############################################################################
77-
-->
78-
<rule ref="Generic.WhiteSpace.ScopeIndent">
79-
<properties>
80-
<property name="indent" value="4"/>
81-
<property name="tabIndent" value="false"/>
82-
</properties>
83-
</rule>
84-
<rule ref="Generic.WhiteSpace.DisallowTabIndent">
85-
<severity>0</severity>
86-
</rule>
87-
<rule ref="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed">
88-
<severity>0</severity>
89-
</rule>
90-
91-
<!-- Enforce the rule -->
92-
<rule ref="WordPress">
93-
<exclude name="Generic.WhiteSpace.DisallowSpaceIndent" />
94-
</rule>
95-
<rule ref="Generic.WhiteSpace.ScopeIndent">
96-
<properties>
97-
<property name="indent" value="4"/>
98-
<property name="tabIndent" value="false"/>
99-
</properties>
100-
</rule>
101-
<rule ref="Generic.WhiteSpace.DisallowTabIndent" />
76+
-->
77+
<rule ref="WordPress">
78+
<exclude name="Generic.WhiteSpace.DisallowSpaceIndent" />
79+
</rule>
80+
<rule ref="Generic.WhiteSpace.DisallowSpaceIndent">
81+
<severity>0</severity>
82+
</rule>
83+
<rule ref="Generic.WhiteSpace.ScopeIndent">
84+
<properties>
85+
<property name="indent" value="4"/>
86+
<property name="tabIndent" value="false"/>
87+
</properties>
88+
</rule>
89+
<rule ref="Generic.WhiteSpace.DisallowTabIndent" />
10290

103-
<!--
104-
#############################################################################
105-
Modernize dirname always, min php 7.0
106-
#############################################################################
107-
-->
108-
<rule ref="Modernize.FunctionCalls.Dirname.Nested">
109-
<severity>10</severity>
110-
</rule>
91+
<!--
92+
#############################################################################
93+
Modernize dirname always, min php 7.0
94+
#############################################################################
95+
-->
96+
<rule ref="Modernize.FunctionCalls.Dirname.Nested">
97+
<severity>10</severity>
98+
</rule>
11199

112100
</ruleset>

‎src/Oblak-Docs/ruleset.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Oblak WordPress Docs coding standard" >
33

4-
<!--
4+
<!--
55
#############################################################################
66
Include standards
77
#############################################################################
88
-->
9-
<rule ref="WordPress-Docs">
10-
<type>warning</type>
11-
</rule>
9+
<rule ref="WordPress-Docs">
10+
<type>warning</type>
11+
</rule>
1212

13-
</ruleset>
13+
</ruleset>

‎src/Oblak-Slevomat/ruleset.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Oblak Slevomat Extension">
33

4-
<!-- Slevomat Sniffs - Array -->
4+
<!-- Slevomat Sniffs - Array -->
55
<rule ref="SlevomatCodingStandard.Arrays.AlphabeticallySortedByKeys"/>
66
<rule ref="SlevomatCodingStandard.Arrays.DisallowImplicitArrayCreation"/>
77
<rule ref="SlevomatCodingStandard.Arrays.MultiLineArrayEndBracketPlacement"/>
@@ -53,9 +53,7 @@
5353
<!-- Slevomat Sniffs - Commenting -->
5454
<rule ref="SlevomatCodingStandard.Commenting.DeprecatedAnnotationDeclaration"/>
5555
<rule ref="SlevomatCodingStandard.Commenting.UselessFunctionDocComment"/>
56-
5756
<rule ref="SlevomatCodingStandard.Commenting.EmptyComment"/>
58-
5957
<rule ref="SlevomatCodingStandard.Commenting.UselessInheritDocComment"/>
6058

6159
<!-- Slevomat Sniffs - Complexity -->

‎src/Oblak-WooCommerce/ruleset.xml

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<ruleset name="Oblak-WooCommerce">
22

3-
<!--
3+
<!--
44
#############################################################################
55
Include standards
66
#############################################################################
77
-->
8-
<rule ref="WooCommerce"/>
8+
<rule ref="WooCommerce"/>
99

10-
<!--
10+
<!--
1111
#############################################################################
1212
Custom overrides
1313
#############################################################################
1414
-->
15-
<rule ref="WordPress.Security.ValidatedSanitizedInput">
15+
<rule ref="WordPress.Security.ValidatedSanitizedInput">
1616
<properties>
1717
<property name="customSanitizingFunctions" type="array" value="wc_clean,wc_sanitize_tooltip,wc_format_decimal,wc_stock_amount,wc_sanitize_permalink,wc_sanitize_textarea" />
1818
</properties>
@@ -24,23 +24,23 @@
2424
</properties>
2525
</rule>
2626

27-
<rule ref="WordPress.Security.EscapeOutput">
28-
<properties>
29-
<property name="customAutoEscapedFunctions" type="array" value="wc_price"/>
30-
</properties>
31-
</rule>
27+
<rule ref="WordPress.Security.EscapeOutput">
28+
<properties>
29+
<property name="customAutoEscapedFunctions" type="array" value="wc_price"/>
30+
</properties>
31+
</rule>
3232

3333
<rule ref="Squiz.Commenting">
3434
<exclude name="Squiz.Commenting.LongConditionClosingComment" />
3535
<exclude name="Squiz.Commenting.PostStatementComment" />
3636
</rule>
3737

38-
<rule ref="WordPress.WP.Capabilities">
39-
<properties>
40-
<property name="custom_capabilities" type="array" >
41-
<element value="manage_woocommerce"/>
42-
</property>
43-
</properties>
44-
</rule>
38+
<rule ref="WordPress.WP.Capabilities">
39+
<properties>
40+
<property name="custom_capabilities" type="array" >
41+
<element value="manage_woocommerce"/>
42+
</property>
43+
</properties>
44+
</rule>
4545

46-
</ruleset>
46+
</ruleset>

0 commit comments

Comments
 (0)
Please sign in to comment.