Merge pull request #608 from FriendsOfSymfony/fix-readthedocs

fix readthedocs build
FriendsOfSymfony · Dec 19, 2023 · d3da27a · d3da27a
2 parents 5391f80 + c6b38d0
commit d3da27a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -62,17 +62,16 @@ jobs:
           SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
         run: |
           composer update ${{ matrix.composer-flag }} --prefer-dist --no-interaction --no-progress
-          vendor/bin/simple-phpunit install
 
       - name: Composer validate
         run: composer validate --strict --no-check-lock
         if: ${{ matrix.stability != 'dev' }}
 
       - name: Run tests
-        run: php vendor/bin/simple-phpunit -v
+        run: php vendor/bin/phpunit -v
         if: ${{ matrix.stability != 'dev' }}
 
       - name: Run tests allow to fail
-        run: php vendor/bin/simple-phpunit -v || true
+        run: php vendor/bin/phpunit -v || true
         continue-on-error: true
         if: ${{ matrix.stability == 'dev' }}
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -1,5 +1,10 @@
 version: 2
 
+build:
+    os: ubuntu-22.04
+    tools:
+        python: "3.11"
+
 sphinx:
     configuration: Resources/doc/conf.py
 
@@ -8,6 +13,5 @@ formats:
     - pdf
 
 python:
-    version: "3.7"
     install:
         - requirements: Resources/doc/requirements.txt
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
         "symfony/console": "^4.4 || ^5.0 || ^6.0",
         "symfony/finder": "^4.4 || ^5.0 || ^6.0",
-        "symfony/phpunit-bridge": "v5.3.7",
+        "phpunit/phpunit": "^9.6.15",
         "symfony/security-bundle": "^4.4 || ^5.0 || ^6.0",
         "symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0",
         "twig/twig": "^2.13",
@@ -49,8 +49,8 @@
         "symfony/expression-language": "^4.4 || ^5.0 || ^6.0",
         "symfony/monolog-bundle": "^3.0",
         "symfony/routing": "^4.4 || ^5.0 || ^6.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
-        "sebastian/exporter": "^2.0"
+        "matthiasnoback/symfony-config-test": "^4.3.0 || ^5.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0"
     },
     "suggest": {
         "jean-beru/fos-http-cache-cloudfront": "To use CloudFront proxy",
@@ -74,5 +74,10 @@
         "classmap": [
             "tests/Functional/Fixtures/app/AppKernel.php"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -25,25 +25,11 @@
 
     <listeners>
         <listener class="\Mockery\Adapter\Phpunit\TestListener" />
-        <!--DebugClassLoaded is enable by default from 4.2
-            https://github.com/symfony/symfony/pull/28412
-            It has to be disabled to avoid tests failed
-        -->
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
-            <arguments>
-                <array>
-                    <element key="debug-class-loader">
-                        <integer>0</integer>
-                    </element>
-                </array>
-            </arguments>
-        </listener>
     </listeners>
 
     <php>
         <env name="KERNEL_DIR" value="./tests/Functional/Fixtures/app" />
         <env name="KERNEL_CLASS" value="AppKernel" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
     </php>
 </phpunit>