Skip to content

Commit a3e5e53

Browse files
soyukasoyuka
committed
Merge 4.1
2 parents dd33568 + 51991c7 commit a3e5e53

37 files changed

+128
-126
lines changed

‎.github/patches/phpunit.patch

-77
This file was deleted.

‎.github/workflows/ci.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -264,15 +264,14 @@ jobs:
264264
continue-on-error: true
265265

266266
phpunit-components:
267-
name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php.version }} ${{ matrix.php.deprecations && 'no deprecations' || '' }})
267+
name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php.version }} ${{ matrix.php.coverage && 'coverage' || '' }}${{ matrix.php.deprecations && 'no deprecations' || '' }})
268268
runs-on: ubuntu-latest
269269
timeout-minutes: 20
270270
strategy:
271271
matrix:
272272
php:
273273
- version: '8.2'
274274
- version: '8.3'
275-
- version: '8.4'
276275
- version: '8.4'
277276
coverage: true
278277
- version: '8.4'
@@ -305,18 +304,19 @@ jobs:
305304
tools: pecl, composer
306305
extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite, mongodb
307306
ini-values: memory_limit=-1
308-
- name: Allow unstable project dependencies
309-
if: matrix.php.deprecations == true
310-
run: composer config minimum-stability dev
311-
- name: Run ${{ matrix.component }} install
307+
- name: Linking
312308
run: |
313309
composer global require soyuka/pmu
314310
composer global config allow-plugins.soyuka/pmu true --no-interaction
315311
composer global link . --permanent
316-
composer ${{matrix.component}} update
317-
- name: Patch phpunit
312+
- name: Allow unstable project dependencies
318313
if: matrix.php.deprecations == true
319-
run: git apply --directory vendor/phpunit/phpunit .github/patches/phpunit.patch
314+
run: |
315+
cd $(composer ${{matrix.component}} --cwd)
316+
composer config minimum-stability dev
317+
- name: Run ${{ matrix.component }} install
318+
run: |
319+
composer ${{matrix.component}} update
320320
- name: Run ${{ matrix.component }} tests
321321
run: |
322322
mkdir -p /tmp/build/logs/phpunit
@@ -867,8 +867,6 @@ jobs:
867867
composer global link .
868868
- name: Clear test app cache
869869
run: tests/Fixtures/app/console cache:clear --ansi
870-
- name: Patch phpunit
871-
run: git apply --directory vendor/phpunit/phpunit .github/patches/phpunit.patch
872870
- name: Run PHPUnit tests
873871
run: vendor/bin/phpunit --fail-on-deprecation --display-deprecations
874872

‎composer.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@
151151
"phpstan/phpstan-doctrine": "^1.0",
152152
"phpstan/phpstan-phpunit": "^1.0",
153153
"phpstan/phpstan-symfony": "^1.0",
154-
"phpunit/phpunit": "^11.2",
154+
"phpunit/phpunit": "11.5.x-dev",
155155
"psr/log": "^1.0 || ^2.0 || ^3.0",
156156
"ramsey/uuid": "^4.7",
157157
"ramsey/uuid-doctrine": "^2.0",
158158
"soyuka/contexts": "^3.3.10",
159-
"soyuka/pmu": "^0.0.15",
159+
"soyuka/pmu": "^0.1.0",
160160
"soyuka/stubs-mongodb": "^1.0",
161161
"symfony/asset": "^6.4 || ^7.0",
162162
"symfony/browser-kit": "^6.4 || ^7.0",
@@ -214,6 +214,7 @@
214214
{
215215
"type": "vcs",
216216
"url": "https://github.com/symfony/type-info"
217-
}
217+
},
218+
{"type": "vcs", "url": "https://github.com/soyuka/phpunit"}
218219
]
219220
}

‎src/Doctrine/Common/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"doctrine/mongodb-odm": "^2.10",
3535
"doctrine/orm": "^2.17 || ^3.0",
3636
"phpspec/prophecy-phpunit": "^2.2",
37-
"phpunit/phpunit": "^11.2",
37+
"phpunit/phpunit": "11.5.x-dev",
3838
"symfony/type-info": "^7.3-dev"
3939
},
4040
"conflict": {
@@ -79,6 +79,10 @@
7979
{
8080
"type": "vcs",
8181
"url": "https://github.com/symfony/type-info"
82+
},
83+
{
84+
"type": "vcs",
85+
"url": "https://github.com/soyuka/phpunit"
8286
}
8387
]
8488
}

‎src/Doctrine/Odm/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"doctrine/doctrine-bundle": "^2.11",
3737
"doctrine/mongodb-odm-bundle": "^5.0",
3838
"phpspec/prophecy-phpunit": "^2.2",
39-
"phpunit/phpunit": "^11.2",
39+
"phpunit/phpunit": "11.5.x-dev",
4040
"symfony/cache": "^6.4 || ^7.0",
4141
"symfony/framework-bundle": "^6.4 || ^7.0",
4242
"symfony/property-access": "^6.4 || ^7.0",
@@ -79,6 +79,10 @@
7979
{
8080
"type": "vcs",
8181
"url": "https://github.com/symfony/type-info"
82+
},
83+
{
84+
"type": "vcs",
85+
"url": "https://github.com/soyuka/phpunit"
8286
}
8387
]
8488
}

‎src/Doctrine/Orm/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"require-dev": {
3434
"doctrine/doctrine-bundle": "^2.11",
3535
"phpspec/prophecy-phpunit": "^2.2",
36-
"phpunit/phpunit": "^11.2",
36+
"phpunit/phpunit": "11.5.x-dev",
3737
"ramsey/uuid": "^4.7",
3838
"ramsey/uuid-doctrine": "^2.0",
3939
"symfony/cache": "^6.4 || ^7.0",
@@ -79,6 +79,10 @@
7979
{
8080
"type": "vcs",
8181
"url": "https://github.com/symfony/type-info"
82+
},
83+
{
84+
"type": "vcs",
85+
"url": "https://github.com/soyuka/phpunit"
8286
}
8387
]
8488
}

‎src/Documentation/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,16 @@
3737
}
3838
},
3939
"require-dev": {
40-
"phpunit/phpunit": "^11.2"
40+
"phpunit/phpunit": "11.5.x-dev"
4141
},
4242
"repositories": [
4343
{
4444
"type": "vcs",
4545
"url": "https://github.com/symfony/type-info"
46+
},
47+
{
48+
"type": "vcs",
49+
"url": "https://github.com/soyuka/phpunit"
4650
}
4751
]
4852
}

‎src/Elasticsearch/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"require-dev": {
4040
"phpspec/prophecy-phpunit": "^2.2",
41-
"phpunit/phpunit": "^11.2"
41+
"phpunit/phpunit": "11.5.x-dev"
4242
},
4343
"autoload": {
4444
"psr-4": {
@@ -79,6 +79,10 @@
7979
{
8080
"type": "vcs",
8181
"url": "https://github.com/symfony/type-info"
82+
},
83+
{
84+
"type": "vcs",
85+
"url": "https://github.com/soyuka/phpunit"
8286
}
8387
]
8488
}

‎src/Elasticsearch/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<directory>./Tests/</directory>
99
</testsuite>
1010
</testsuites>
11-
<source>
11+
<source ignoreSuppressionOfDeprecations="true" ignoreIndirectDeprecations="false" >
1212
<deprecationTrigger>
1313
<function>trigger_deprecation</function>
1414
</deprecationTrigger>

‎src/GraphQl/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"symfony/mercure-bundle": "*",
3737
"symfony/routing": "^6.4 || ^7.0",
3838
"symfony/type-info": "^7.3-dev",
39-
"phpunit/phpunit": "^11.2"
39+
"phpunit/phpunit": "11.5.x-dev"
4040
},
4141
"autoload": {
4242
"psr-4": {
@@ -82,6 +82,10 @@
8282
{
8383
"type": "vcs",
8484
"url": "https://github.com/symfony/type-info"
85+
},
86+
{
87+
"type": "vcs",
88+
"url": "https://github.com/soyuka/phpunit"
8589
}
8690
]
8791
}

‎src/GraphQl/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<directory>./Tests/</directory>
99
</testsuite>
1010
</testsuites>
11-
<source>
11+
<source ignoreSuppressionOfDeprecations="true" ignoreIndirectDeprecations="false" >
1212
<deprecationTrigger>
1313
<function>trigger_deprecation</function>
1414
</deprecationTrigger>

‎src/Hal/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,16 @@
6363
},
6464
"require-dev": {
6565
"symfony/type-info": "^7.3-dev",
66-
"phpunit/phpunit": "^11.2"
66+
"phpunit/phpunit": "11.5.x-dev"
6767
},
6868
"repositories": [
6969
{
7070
"type": "vcs",
7171
"url": "https://github.com/symfony/type-info"
72+
},
73+
{
74+
"type": "vcs",
75+
"url": "https://github.com/soyuka/phpunit"
7276
}
7377
]
7478
}

‎src/HttpCache/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"phpspec/prophecy-phpunit": "^2.2",
3434
"symfony/http-client": "^6.4 || ^7.0",
3535
"symfony/type-info": "^7.3-dev",
36-
"phpunit/phpunit": "^11.2"
36+
"phpunit/phpunit": "11.5.x-dev"
3737
},
3838
"autoload": {
3939
"psr-4": {
@@ -73,6 +73,10 @@
7373
{
7474
"type": "vcs",
7575
"url": "https://github.com/symfony/type-info"
76+
},
77+
{
78+
"type": "vcs",
79+
"url": "https://github.com/soyuka/phpunit"
7680
}
7781
]
7882
}

‎src/HttpCache/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<directory>./Tests/</directory>
99
</testsuite>
1010
</testsuites>
11-
<source>
11+
<source ignoreSuppressionOfDeprecations="true" ignoreIndirectDeprecations="false" >
1212
<deprecationTrigger>
1313
<function>trigger_deprecation</function>
1414
</deprecationTrigger>

‎src/Hydra/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"api-platform/doctrine-common": "^4.1",
4141
"phpspec/prophecy": "^1.19",
4242
"phpspec/prophecy-phpunit": "^2.2",
43-
"phpunit/phpunit": "^11.2"
43+
"phpunit/phpunit": "11.5.x-dev"
4444
},
4545
"autoload": {
4646
"psr-4": {
@@ -80,6 +80,10 @@
8080
{
8181
"type": "vcs",
8282
"url": "https://github.com/symfony/type-info"
83+
},
84+
{
85+
"type": "vcs",
86+
"url": "https://github.com/soyuka/phpunit"
8387
}
8488
]
8589
}

‎src/Hydra/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<directory>./Tests/</directory>
99
</testsuite>
1010
</testsuites>
11-
<source>
11+
<source ignoreSuppressionOfDeprecations="true" ignoreIndirectDeprecations="false" >
1212
<deprecationTrigger>
1313
<function>trigger_deprecation</function>
1414
</deprecationTrigger>

‎src/JsonApi/composer.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"require-dev": {
3535
"phpspec/prophecy": "^1.19",
3636
"phpspec/prophecy-phpunit": "^2.2",
37-
"phpunit/phpunit": "^11.2",
37+
"phpunit/phpunit": "11.5.x-dev",
3838
"symfony/type-info": "^7.3-dev"
3939
},
4040
"autoload": {
@@ -75,6 +75,10 @@
7575
{
7676
"type": "vcs",
7777
"url": "https://github.com/symfony/type-info"
78+
},
79+
{
80+
"type": "vcs",
81+
"url": "https://github.com/soyuka/phpunit"
7882
}
7983
]
8084
}

‎src/JsonApi/phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</testsuite>
1010
</testsuites>
1111
<coverage/>
12-
<source>
12+
<source ignoreSuppressionOfDeprecations="true" ignoreIndirectDeprecations="false" >
1313
<deprecationTrigger>
1414
<function>trigger_deprecation</function>
1515
</deprecationTrigger>

0 commit comments

Comments
 (0)