Use the latest PHPUnit wherever possible

phpstan · Apr 19, 2021 · 8db956f · 8db956f
1 parent 592d3d1
commit 8db956f
Show file tree

Hide file tree

Showing 6 changed files with 801 additions and 503 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -140,9 +140,9 @@ jobs:
       - name: "Install dependencies"
         run: "composer install --no-interaction --no-progress --no-suggest"
 
-      - name: "Update PHPUnit"
-        if: matrix.php-version == '7.4' || matrix.php-version == '8.0'
-        run: "composer remove --dev brianium/paratest && composer require phpdocumentor/reflection-docblock:'5.2.0' && composer require --dev phpspec/prophecy:'^1.11.1' && composer require --dev phpunit/phpunit:'^9.3' --update-with-dependencies"
+      - name: "Downgrade PHPUnit"
+        if: matrix.php-version == '7.1' || matrix.php-version == '7.2'
+        run: "composer require --dev brianium/paratest:^4.0 phpunit/phpunit:^7.5.20 --update-with-dependencies"
 
       - name: "Transform source code"
         if: matrix.php-version != '7.4' && matrix.php-version != '8.0'
@@ -217,9 +217,9 @@ jobs:
       - name: "Install dependencies"
         run: "composer install --no-interaction --no-progress --no-suggest"
 
-      - name: "Update PHPUnit"
-        if: matrix.php-version == '7.4' || matrix.php-version == '8.0'
-        run: "composer remove --dev brianium/paratest && composer require phpdocumentor/reflection-docblock:'5.2.0' && composer require --dev phpspec/prophecy:'^1.11.1' && composer require --dev phpunit/phpunit:'^9.3' --update-with-dependencies"
+      - name: "Downgrade PHPUnit"
+        if: matrix.php-version == '7.1' || matrix.php-version == '7.2'
+        run: "composer require --dev brianium/paratest:^4.0 phpunit/phpunit:^7.5.20 --update-with-dependencies"
 
       - name: "Transform source code"
         if: matrix.php-version != '7.4' && matrix.php-version != '8.0'

diff --git a/build.xml b/build.xml
@@ -191,6 +191,7 @@
 			<arg path="${phpunit.executable}"/>
 			<arg value="-c"/>
 			<arg value="tests/phpunit.xml"/>
+			<arg value="--no-coverage"/>
 			<arg path="tests/PHPStan"/>
 		</exec>
 	</target>
@@ -209,6 +210,7 @@
 			<arg value="tests/phpunit.xml"/>
 			<arg value="--exclude-group"/>
 			<arg value="exec"/>
+			<arg value="--no-coverage"/>
 			<arg path="tests/PHPStan"/>
 		</exec>
 	</target>
@@ -229,6 +231,7 @@
 			<arg value="exec"/>
 			<arg value="--bootstrap"/>
 			<arg path="tests/bootstrap-static-reflection.php"/>
+			<arg value="--no-coverage"/>
 			<arg path="tests/PHPStan"/>
 		</exec>
 	</target>

diff --git a/composer.json b/composer.json
@@ -40,15 +40,15 @@
 		"phpstan/phpstan": "self.version"
 	},
 	"require-dev": {
-		"brianium/paratest": "^4.0",
+		"brianium/paratest": "^6.2.0",
 		"nategood/httpful": "^0.2.20",
 		"phing/phing": "^2.16.0",
 		"php-parallel-lint/php-parallel-lint": "^1.2.0",
 		"phpstan/phpstan-deprecation-rules": "^0.12.3",
 		"phpstan/phpstan-php-parser": "^0.12",
 		"phpstan/phpstan-phpunit": "^0.12",
 		"phpstan/phpstan-strict-rules": "^0.12",
-		"phpunit/phpunit": "^7.5.18"
+		"phpunit/phpunit": "^9.5.4"
 	},
 	"config": {
 		"platform": {