Merge 4.1

Author: soyuka

.github/patches/phpunit.patch

@@ -264,15 +264,14 @@ jobs:
         continue-on-error: true
 
   phpunit-components:
-    name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php.version }} ${{ matrix.php.deprecations && 'no deprecations' || '' }})
+    name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php.version }} ${{ matrix.php.coverage && 'coverage' || '' }}${{ matrix.php.deprecations && 'no deprecations' || '' }})
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
       matrix:
         php:
           - version: '8.2'
           - version: '8.3'
-          - version: '8.4'
           - version: '8.4'
             coverage: true
           - version: '8.4'
@@ -305,18 +304,19 @@ jobs:
           tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite, mongodb
           ini-values: memory_limit=-1
-      - name: Allow unstable project dependencies
-        if: matrix.php.deprecations == true
-        run: composer config minimum-stability dev
-      - name: Run ${{ matrix.component }} install
+      - name: Linking
         run: |
           composer global require soyuka/pmu
           composer global config allow-plugins.soyuka/pmu true --no-interaction
           composer global link . --permanent
-          composer ${{matrix.component}} update
-      - name: Patch phpunit
+      - name: Allow unstable project dependencies
         if: matrix.php.deprecations == true
-        run: git apply --directory vendor/phpunit/phpunit .github/patches/phpunit.patch
+        run: |
+          cd $(composer ${{matrix.component}} --cwd)
+          composer config minimum-stability dev
+      - name: Run ${{ matrix.component }} install
+        run: |
+          composer ${{matrix.component}} update
       - name: Run ${{ matrix.component }} tests
         run: |
           mkdir -p /tmp/build/logs/phpunit
@@ -867,8 +867,6 @@ jobs:
           composer global link .
       - name: Clear test app cache
         run: tests/Fixtures/app/console cache:clear --ansi
-      - name: Patch phpunit
-        run: git apply --directory vendor/phpunit/phpunit .github/patches/phpunit.patch
       - name: Run PHPUnit tests
         run: vendor/bin/phpunit --fail-on-deprecation --display-deprecations
 

.github/workflows/ci.yml

@@ -151,12 +151,12 @@
         "phpstan/phpstan-doctrine": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
-        "phpunit/phpunit": "^11.2",
+        "phpunit/phpunit": "11.5.x-dev",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "ramsey/uuid": "^4.7",
         "ramsey/uuid-doctrine": "^2.0",
         "soyuka/contexts": "^3.3.10",
-        "soyuka/pmu": "^0.0.15",
+        "soyuka/pmu": "^0.1.0",
         "soyuka/stubs-mongodb": "^1.0",
         "symfony/asset": "^6.4 || ^7.0",
         "symfony/browser-kit": "^6.4 || ^7.0",
@@ -214,6 +214,7 @@
         {
             "type": "vcs",
             "url": "https://github.com/symfony/type-info"
-        }
+        },
+        {"type": "vcs", "url": "https://github.com/soyuka/phpunit"}
     ]
 }

composer.json

@@ -34,7 +34,7 @@
         "doctrine/mongodb-odm": "^2.10",
         "doctrine/orm": "^2.17 || ^3.0",
         "phpspec/prophecy-phpunit": "^2.2",
-        "phpunit/phpunit": "^11.2",
+        "phpunit/phpunit": "11.5.x-dev",
         "symfony/type-info": "^7.3-dev"
     },
     "conflict": {
@@ -79,6 +79,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/symfony/type-info"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/soyuka/phpunit"
         }
     ]
 }

src/Doctrine/Common/composer.json

@@ -36,7 +36,7 @@
         "doctrine/doctrine-bundle": "^2.11",
         "doctrine/mongodb-odm-bundle": "^5.0",
         "phpspec/prophecy-phpunit": "^2.2",
-        "phpunit/phpunit": "^11.2",
+        "phpunit/phpunit": "11.5.x-dev",
         "symfony/cache": "^6.4 || ^7.0",
         "symfony/framework-bundle": "^6.4 || ^7.0",
         "symfony/property-access": "^6.4 || ^7.0",
@@ -79,6 +79,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/symfony/type-info"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/soyuka/phpunit"
         }
     ]
 }

src/Doctrine/Odm/composer.json

@@ -33,7 +33,7 @@
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.11",
         "phpspec/prophecy-phpunit": "^2.2",
-        "phpunit/phpunit": "^11.2",
+        "phpunit/phpunit": "11.5.x-dev",
         "ramsey/uuid": "^4.7",
         "ramsey/uuid-doctrine": "^2.0",
         "symfony/cache": "^6.4 || ^7.0",
@@ -79,6 +79,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/symfony/type-info"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/soyuka/phpunit"
         }
     ]
 }

src/Doctrine/Orm/composer.json

@@ -37,12 +37,16 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^11.2"
+        "phpunit/phpunit": "11.5.x-dev"
     },
     "repositories": [
         {
             "type": "vcs",
             "url": "https://github.com/symfony/type-info"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/soyuka/phpunit"
         }
     ]
 }

src/Documentation/composer.json

@@ -38,7 +38,7 @@
     },
     "require-dev": {
         "phpspec/prophecy-phpunit": "^2.2",
-        "phpunit/phpunit": "^11.2"
+        "phpunit/phpunit": "11.5.x-dev"
     },
     "autoload": {
         "psr-4": {
@@ -79,6 +79,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/symfony/type-info"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/soyuka/phpunit"
         }
     ]
 }

src/Elasticsearch/composer.json

@@ -8,7 +8,7 @@
       <directory>./Tests/</directory>
     </testsuite>
   </testsuites>
-  <source>
+  <source ignoreSuppressionOfDeprecations="true" ignoreIndirectDeprecations="false" >
     <deprecationTrigger>
         <function>trigger_deprecation</function>
     </deprecationTrigger>

src/Elasticsearch/phpunit.xml.dist

@@ -36,7 +36,7 @@
         "symfony/mercure-bundle": "*",
         "symfony/routing": "^6.4 || ^7.0",
         "symfony/type-info": "^7.3-dev",
-        "phpunit/phpunit": "^11.2"
+        "phpunit/phpunit": "11.5.x-dev"
     },
     "autoload": {
         "psr-4": {
@@ -82,6 +82,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/symfony/type-info"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/soyuka/phpunit"
         }
     ]
 }