Avoid the PHPUnit bridge

sulu · Mar 15, 2023 · 7c3c42b · 7c3c42b
1 parent 7654e60
commit 7c3c42b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -24,21 +24,18 @@ jobs:
                     - php-version: '7.2'
                       coverage: false
                       dependency-versions: 'lowest'
-                      tools: 'composer:v1'
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: disabled
 
                     - php-version: '7.4'
-                      coverage: true
+                      coverage: false
                       dependency-versions: 'highest'
-                      tools: 'composer:v2'
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak
 
                     - php-version: '8.0'
                       coverage: false
                       dependency-versions: 'highest'
-                      tools: 'composer:v2'
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak
 
@@ -48,6 +45,12 @@ jobs:
                       env:
                           SYMFONY_DEPRECATIONS_HELPER: weak
 
+                    - php-version: '8.2'
+                      coverage: true
+                      dependency-versions: 'highest'
+                      env:
+                          SYMFONY_DEPRECATIONS_HELPER: weak
+
         services:
             mysql:
                 image: mysql:5.7
@@ -67,7 +70,7 @@ jobs:
                   php-version: ${{ matrix.php-version }}
                   extensions: ctype, iconv, mysql
                   coverage: pcov
-                  tools: ${{ matrix.tools }}
+                  tools: 'composer:v2'
 
             - name: Install composer dependencies
               uses: ramsey/composer-install@v2

diff --git a/composer.json b/composer.json
@@ -46,13 +46,13 @@
         "matthiasnoback/symfony-config-test": "^4.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "phpspec/prophecy": "^1.14",
-        "phpspec/prophecy-phpunit": "^2.0",
+        "phpspec/prophecy-phpunit": "^1.1 || ^2.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-doctrine": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "phpstan/phpstan-webmozart-assert": "^1.0",
-        "qossmic/deptrac-shim": "^0.11.1 || ^0.23.0",
+        "qossmic/deptrac-shim": "^0.11.1 || ^0.23.0 || ^1.0",
         "sulu/automation-bundle": "^2.0@dev",
         "symfony/browser-kit": "^4.4 || ^5.4 || ^6.0",
         "symfony/console": "^4.4 || ^5.4 || ^6.0",
@@ -107,14 +107,13 @@
         "test": [
             "@phpunit"
         ],
-        "phpunit": "vendor/bin/simple-phpunit",
+        "phpunit": "vendor/bin/phpunit",
         "test-with-coverage": "@phpunit --coverage-php Tests/reports/coverage.php --coverage-html Tests/reports/html --log-junit Tests/reports/unit/junit.xml --coverage-clover Tests/reports/clover.xml",
         "check-coverage": [
             "@php vendor/bin/code-coverage-checker \"Tests/reports/coverage.php\" \"line\" \"100.00\" \"Content\" \"DependencyInjection\""
         ],
         "phpstan": [
             "Tests/Application/bin/adminconsole cache:warmup --env dev",
-            "@test install",
             "vendor/bin/phpstan analyze"
         ],
         "php-cs": "vendor/bin/php-cs-fixer fix --verbose --diff --dry-run",