returned phpunit into main composer.json

doctrine · Oct 25, 2023 · ef5fdb8 · ef5fdb8
1 parent db702e3
commit ef5fdb8
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 1,847 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -73,11 +73,6 @@ jobs:
           ini-values: "zend.assertions=1"
           extensions: "pdo_sqlite"
 
-      - name: Install dependencies
-        run: |
-          composer update
-          composer bin all install
-
       - name: "Globally install symfony/flex"
         run: "composer require --no-progress --no-scripts --no-plugins symfony/flex"
 

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -35,5 +35,8 @@ jobs:
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v2"
 
+      - name: "Install tools"
+        run: "composer bin all install"
+
       - name: "Run a static analysis with vimeo/psalm"
         run: "vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --find-unused-psalm-suppress"
diff --git a/composer.json b/composer.json
@@ -50,7 +50,9 @@
         "doctrine/deprecations": "^1.0",
         "doctrine/orm": "^2.14 || ^3.0",
         "friendsofphp/proxy-manager-lts": "^1.0",
+        "phpunit/phpunit": "^9.5.26 || ^10.0",
         "psr/log": "^1.1.4 || ^2.0 || ^3.0",
+        "symfony/phpunit-bridge": "^6.1",
         "symfony/property-info": "^5.4 || ^6.0",
         "symfony/proxy-manager-bridge": "^5.4 || ^6.0",
         "symfony/security-bundle": "^5.4 || ^6.0",

diff --git a/vendor-bin/phpunit/autoload.php b/vendor-bin/phpunit/autoload.php
diff --git a/vendor-bin/phpunit/composer.json b/vendor-bin/phpunit/composer.json