Merge pull request #28 from cs278/upgrade-phpunit

Upgrade PHPUnit Bridge
cs278 · Feb 17, 2025 · 8bfc909 · 8bfc909
2 parents 16a81ad + fe2ef84
commit 8bfc909
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "composer/composer": "^2@RC",
         "composer/semver": "*",
         "symfony/filesystem": "^4.4 || ^5 || ^6 || ^7",
-        "symfony/phpunit-bridge": "^5.2",
+        "symfony/phpunit-bridge": "^5.2 || ^6.4 || ^7",
         "symfony/process": "^4.4 || ^5 || ^6 || ^7"
     },
     "conflict": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -25,6 +25,6 @@
 
     <php>
         <ini name="zend.assertions" value="1" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="baselineFile=tests/allowed.json" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="verbose=0" />
     </php>
 </phpunit>
diff --git a/tests/allowed.json b/tests/allowed.json
diff --git a/tests/integration/IntegrationTest.php b/tests/integration/IntegrationTest.php
@@ -7,7 +7,6 @@
 use Composer\Composer;
 use Composer\Semver\Semver;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
@@ -20,17 +19,18 @@
  */
 final class IntegrationTest extends TestCase
 {
-    use SetUpTearDownTrait;
-
     /** @var string|null */
     private static $cacheDir = null;
 
     /** @var \Closure[]  */
     private static $cleanupAfterClass = [];
 
-    public static function doSetUpBeforeClass()
+    /**
+     * @beforeClass
+     */
+    public static function prepareCache()
     {
-        // Find cache directory of the users Composer installtion, if it cannot
+        // Find cache directory of the users Composer installation, if it cannot
         // be found fallback to a temporary one for the lifetime of these tests.
         $process = new Process([
             'composer',
@@ -55,7 +55,10 @@ public static function doSetUpBeforeClass()
         };
     }
 
-    public static function doTearDownAfterClass()
+    /**
+     * @afterClass
+     */
+    public static function cleanup()
     {
         try {
             foreach (self::$cleanupAfterClass as $callback) {
@@ -214,7 +217,7 @@ private static function extractLockedPackages(string $lockFile): array
         return $packages;
     }
 
-    private static function executeCondition(string $condition, array $packages = null): bool
+    private static function executeCondition(string $condition, ?array $packages = null): bool
     {
         $template = <<<'EOT'
 $isComposer = function ($constraint) {

diff --git a/tests/unit/AdvisoriesManagerTest.php b/tests/unit/AdvisoriesManagerTest.php
@@ -7,7 +7,6 @@
 use Composer\Composer;
 use Composer\Semver\Semver;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
@@ -19,8 +18,6 @@
  */
 final class AdvisoriesManagerTest extends TestCase
 {
-    use SetUpTearDownTrait;
-
     /**
      * @dataProvider dataFindByPackageNameAndVersion
      *