Skip to content

Commit e83701c

Browse files
committed
Simplify CS build
1 parent 01c9872 commit e83701c

File tree

7 files changed

+278
-52
lines changed

7 files changed

+278
-52
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
version: 2
22
updates:
3-
- package-ecosystem: composer
4-
directory: "/build-cs"
5-
schedule:
6-
interval: weekly
7-
open-pull-requests-limit: 10
83
- package-ecosystem: composer
94
directory: "/compiler"
105
schedule:

build-cs/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

build-cs/composer.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

build.xml

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -146,44 +146,28 @@
146146
</target>
147147

148148
<target name="cs">
149-
<if>
150-
<equals arg1="${isPHP74}" arg2="true" />
151-
<then>
152-
<exec
153-
executable="composer"
154-
logoutput="true"
155-
passthru="true"
156-
checkreturn="true"
157-
>
158-
<arg value="install"/>
159-
<arg value="--working-dir"/>
160-
<arg path="build-cs"/>
161-
<arg value="--ansi"/>
162-
</exec>
163-
<exec
164-
executable="build-cs/vendor/bin/phpcs"
165-
logoutput="true"
166-
passthru="true"
167-
checkreturn="true"
168-
>
169-
<arg value="--colors"/>
170-
<arg value="--extensions=php"/>
171-
<arg value="--encoding=utf-8"/>
172-
<arg value="--tab-width=4"/>
173-
<arg value="--cache=tmp/cache/phpcs"/>
174-
<arg value="--ignore=tests/*/data,tests/*/traits,tests/notAutoloaded,tests/*/cache,src/Reflection/SignatureMap/functionMap.php,tests/e2e/magic-setter,tests/e2e/anon-class"/>
175-
<arg value="-sp"/>
176-
<arg path="src"/>
177-
<arg path="tests"/>
178-
<arg path="compiler/src" />
179-
</exec>
180-
</then>
181-
</if>
149+
<exec
150+
executable="vendor/bin/phpcs"
151+
logoutput="true"
152+
passthru="true"
153+
checkreturn="true"
154+
>
155+
<arg value="--colors"/>
156+
<arg value="--extensions=php"/>
157+
<arg value="--encoding=utf-8"/>
158+
<arg value="--tab-width=4"/>
159+
<arg value="--cache=tmp/cache/phpcs"/>
160+
<arg value="--ignore=tests/*/data,tests/*/traits,tests/notAutoloaded,tests/*/cache,src/Reflection/SignatureMap/functionMap.php,tests/e2e/magic-setter,tests/e2e/anon-class"/>
161+
<arg value="-sp"/>
162+
<arg path="src"/>
163+
<arg path="tests"/>
164+
<arg path="compiler/src" />
165+
</exec>
182166
</target>
183167

184168
<target name="cs-fix">
185169
<exec
186-
executable="build-cs/vendor/bin/phpcbf"
170+
executable="vendor/bin/phpcbf"
187171
logoutput="true"
188172
passthru="true"
189173
checkreturn="true"

composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,18 @@
4242
},
4343
"require-dev": {
4444
"brianium/paratest": "^4.0",
45+
"consistence-community/coding-standard": "^3.11",
46+
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
4547
"nategood/httpful": "^0.2.20",
4648
"phing/phing": "^2.16.0",
4749
"php-parallel-lint/php-parallel-lint": "^1.2.0",
4850
"phpstan/phpstan-deprecation-rules": "^0.12.3",
4951
"phpstan/phpstan-php-parser": "^0.12",
5052
"phpstan/phpstan-phpunit": "^0.12",
5153
"phpstan/phpstan-strict-rules": "^0.12",
52-
"phpunit/phpunit": "^7.5.18"
54+
"phpunit/phpunit": "^7.5.18",
55+
"slevomat/coding-standard": "^6.4",
56+
"squizlabs/php_codesniffer": "^3.5"
5357
},
5458
"config": {
5559
"platform": {

composer.lock

Lines changed: 254 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpcs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<ruleset name="PHPStan">
3-
<rule ref="build-cs/vendor/consistence-community/coding-standard/Consistence/ruleset.xml">
3+
<rule ref="vendor/consistence-community/coding-standard/Consistence/ruleset.xml">
44
<exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat"/>
55
<exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable"/>
66
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>

0 commit comments

Comments
 (0)