Skip to content

Commit 1d27c78

Browse files
committed
Improve build
2 parents b3c7c40 + e83701c commit 1d27c78

File tree

8 files changed

+294
-63
lines changed

8 files changed

+294
-63
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:

.github/workflows/build.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
matrix:
5858
php-version:
59-
- "7.4"
59+
- "8.0"
6060

6161
steps:
6262
- name: "Checkout"
@@ -74,10 +74,6 @@ jobs:
7474
- name: "Install dependencies"
7575
run: "composer install --no-interaction --no-progress --no-suggest"
7676

77-
- name: "Transform source code"
78-
if: matrix.php-version != '7.4' && matrix.php-version != '8.0'
79-
run: php bin/transform-source.php
80-
8177
- name: "Lint"
8278
run: "vendor/bin/phing lint"
8379

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: 33 additions & 40 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"
@@ -206,11 +190,14 @@
206190

207191
<target name="tests">
208192
<exec
209-
executable="${phpunit.executable}"
210-
logoutput="true"
211-
passthru="true"
212-
checkreturn="true"
193+
executable="php"
194+
logoutput="true"
195+
passthru="true"
196+
checkreturn="true"
213197
>
198+
<arg value="-d"/>
199+
<arg value="memory_limit=768M"/>
200+
<arg path="${phpunit.executable}"/>
214201
<arg value="-c"/>
215202
<arg value="tests/phpunit.xml"/>
216203
<arg path="tests/PHPStan"/>
@@ -219,11 +206,14 @@
219206

220207
<target name="tests-fast">
221208
<exec
222-
executable="${phpunit.executable}"
209+
executable="php"
223210
logoutput="true"
224211
passthru="true"
225212
checkreturn="true"
226213
>
214+
<arg value="-d"/>
215+
<arg value="memory_limit=768M"/>
216+
<arg path="${phpunit.executable}"/>
227217
<arg value="-c"/>
228218
<arg value="tests/phpunit.xml"/>
229219
<arg value="--exclude-group"/>
@@ -234,11 +224,14 @@
234224

235225
<target name="tests-fast-static-reflection">
236226
<exec
237-
executable="${phpunit.executable}"
227+
executable="php"
238228
logoutput="true"
239229
passthru="true"
240230
checkreturn="true"
241231
>
232+
<arg value="-d"/>
233+
<arg value="memory_limit=768M"/>
234+
<arg path="${phpunit.executable}"/>
242235
<arg value="-c"/>
243236
<arg value="tests/phpunit.xml"/>
244237
<arg value="--exclude-group"/>

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": {

0 commit comments

Comments
 (0)