Merge pull request #23 from denga/symfony-v6-support

Add Symfony 6.x support

composer.json

@@ -13,15 +13,15 @@
     "require": {
         "php": ">= 7.1",
         "composer-plugin-api": "^1.1 || ^2",
-        "symfony/yaml": "^4.4 || ^5"
+        "symfony/yaml": "^4.4 || ^5 || ^6"
     },
     "require-dev": {
         "cs278/mktemp": "^1",
         "composer/composer": "^1 || ^2@RC",
         "composer/semver": "*",
-        "symfony/filesystem": "^4.4 || ^5",
+        "symfony/filesystem": "^4.4 || ^5 || ^6",
         "symfony/phpunit-bridge": "^5.2",
-        "symfony/process": "^4.4 || ^5"
+        "symfony/process": "^4.4 || ^5 || ^6"
     },
     "conflict": {
         "symfony/yaml": "=4.4.27 || =4.4.28 || =5.2.12 || =5.2.13 || =5.3.4 || =5.3.5"

tests/integration/IntegrationTest.php

@@ -126,9 +126,20 @@ public function testRun(int $expectedExit, string $expectedOutput, string $condi
                 // Update the lock file with new requirements.
                 file_put_contents($workingDir.'/composer.json', json_encode($composerJson));
                 $composer('update', '--no-install')->mustRun();
+
+                $lockedPackages = self::extractLockedPackages($workingDir.'/composer.lock');
             } else {
                 file_put_contents($workingDir.'/composer.json', json_encode($composerJson));
                 $composer('update')->mustRun();
+
+                $lockedPackages = file_exists($workingDir.'/composer.lock')
+                    ? self::extractLockedPackages($workingDir.'/composer.lock')
+                    : null;
+            }
+
+            // Execute condition again now package data is available.
+            if (!self::executeCondition($condition, $lockedPackages)) {
+                $this->markTestSkipped($condition);
             }
 
             $proc = $composer('security-audit', ...$args);
@@ -180,14 +191,48 @@ public function dataRun(): iterable
         }
     }
 
-    private static function executeCondition(string $condition): bool
+    /** @return array<string,string> */
+    private static function extractLockedPackages(string $lockFile): array
+    {
+        $result = \json_decode(file_get_contents($lockFile), true);
+
+        if ($result === null) {
+            throw new \RuntimeException(sprintf('Failed to parse lock file: %s', $lockFile));
+        }
+
+        $packages = [];
+
+        foreach (['packages', 'packages-dev'] as $type) {
+            if (isset($result[$type])) {
+                foreach ($result[$type] as $package) {
+                    $packages[$package['name']] = $package['version'];
+                }
+            }
+        }
+
+        return $packages;
+    }
+
+    private static function executeCondition(string $condition, array $packages = null): bool
     {
         $template = <<<'EOT'
 $isComposer = function ($constraint) {
     return \Composer\Semver\Semver::satisfies(\Composer\Composer::VERSION, $constraint);
 };
 
-return %s;
+if ($packages === null) {
+    $isPackage = function () { return true; };
+} else {
+    $isPackage = function (string $package, string $constraint) use ($packages) {
+        return isset($packages[$package])
+            ? \Composer\Semver\Semver::satisfies($packages[$package], $constraint)
+            : false;
+    };
+}
+
+unset($packages); // Prevent direct access to packages data.
+
+return (%1$s);
 EOT;
 
         return (bool) eval(sprintf($template, $condition));

tests/integration/verbose_debug_no_errors.test

@@ -1,7 +1,7 @@
 --TEST--
 No packages results in no errors (debug level messages)
 --CONDITION--
-true
+$isPackage('symfony/deprecation-contracts', '*')
 --COMPOSER--
 {}
 --ARGS--

tests/integration/verbose_debug_no_errors_2.test

@@ -0,0 +1,15 @@
+--TEST--
+No packages results in no errors (debug level messages)
+--CONDITION--
+!$isPackage('symfony/deprecation-contracts', '*')
+--COMPOSER--
+{}
+--ARGS--
+-vvv
+--EXPECT-EXIT--
+0
+--EXPECT-OUTPUT--
+Checking cs278/composer-audit (N/A) for advisories...
+Checking symfony/polyfill-ctype (N/A) for advisories...
+Checking symfony/yaml (N/A) for advisories...
+No advisories found for any packages.