Merge pull request #16 from sansecio/phar

create phar release when tag is made

Author: danslo

.github/workflows/release.yml

@@ -0,0 +1,34 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Install Dependencies
+        run: composer install
+
+      - name: Install Box
+        run: composer global require humbug/box
+
+      - name: Create PHAR
+        run: box compile
+
+      - name: Create Release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: composer-integrity.phar
+          artifactContentType: application/x-php

.gitignore

@@ -1,4 +1,5 @@
 /.idea
 /vendor
 /test/vendor
-/test/composer.lock
+/test/composer.lock
+/composer-integrity.phar

box.json

@@ -0,0 +1,3 @@
+{
+    "main": "composer-integrity.php"
+}

composer-integrity.php

@@ -0,0 +1,20 @@
+<?php
+
+use DI\Container;
+use Sansec\Integrity\IntegrityCommand;
+use Sansec\Integrity\PackageResolver\LockReaderStrategy;
+use Symfony\Component\Console\Application;
+
+require_once 'vendor/autoload.php';
+
+$container = new Container();
+
+$application = $container->get(Application::class);
+$application->add($container->make(IntegrityCommand::class, [
+    'packageResolverStrategy' => $container->make(
+        LockReaderStrategy::class,
+        ['rootDirectory' => \getcwd()]
+    )
+]));
+$application->setDefaultCommand('integrity');
+$application->run();

src/CommandProvider.php

@@ -4,6 +4,7 @@
 
 use Composer\Composer;
 use DI\Container;
+use Sansec\Integrity\PackageResolver\ComposerStrategy;
 
 class CommandProvider implements \Composer\Plugin\Capability\CommandProvider
 {
@@ -19,7 +20,16 @@ public function __construct(array $config)
     public function getCommands()
     {
         return [
-            $this->container->make(IntegrityCommand::class, ['composer' => $this->composer])
+            $this->container->make(
+                ComposerIntegrityCommand::class,
+                [
+                    'composer' => $this->composer,
+                    'packageResolverStrategy' => $this->container->make(
+                        ComposerStrategy::class,
+                        ['composer' => $this->composer]
+                    )
+                ]
+            )
         ];
     }
 }

src/ComposerIntegrityCommand.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Sansec\Integrity;
+
+use Composer\Composer;
+use DI\Container;
+
+class ComposerIntegrityCommand extends IntegrityCommand
+{
+    private ?PatchDetector $patchDetector = null;
+
+    public function __construct(
+        private readonly Container $container,
+        private readonly PackageResolverStrategy $packageResolverStrategy,
+        private readonly Composer $composer,
+        string $name = null
+    ) {
+        parent::__construct($container, $packageResolverStrategy, $name);
+    }
+
+    private function getPatchDetector(): PatchDetector
+    {
+        if ($this->patchDetector === null) {
+            $this->patchDetector = $this->container->make(
+                PatchDetector::class,
+                [
+                    'composer' => $this->composer,
+                    // We must use a getter because the application object is not known to us during construction
+                    'application' => $this->getApplication()
+                ]
+            );
+        }
+        return $this->patchDetector;
+    }
+
+    protected function getRendererOptions(bool $json): array
+    {
+        $options = parent::getRendererOptions($json);
+
+        if (!$this->getPatchDetector()->hasPatchPlugin()) {
+            return $options;
+        }
+
+        $options['additionalColumns'] = ['Patched'];
+        $options['verdictEnricher'] = new class($options['json'], $this->getPatchDetector()->getPatchedPackages()) implements VerdictEnricher
+        {
+            public function __construct(private readonly bool $json, private readonly array $patchedPackages)
+            {
+            }
+
+            public function enrich(PackageVerdict $packageVerdict): array
+            {
+                $patchApplied = in_array($packageVerdict->name, $this->patchedPackages);
+                return ['patch_applied' => $this->json ? $patchApplied : ($patchApplied ? 'Yes' : 'No')];
+            }
+        };
+
+        return $options;
+    }
+}

src/IntegrityCommand.php

@@ -3,9 +3,7 @@
 namespace Sansec\Integrity;
 
 use Composer\Command\BaseCommand;
-use Composer\Composer;
 use DI\Container;
-use Sansec\Integrity\PackageResolver\ComposerStrategy;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -17,11 +15,10 @@ class IntegrityCommand extends BaseCommand
     private const OPTION_NAME_JSON = 'json';
 
     private ?PackageSubmitter $packageSubmitter = null;
-    private ?PatchDetector $patchDetector = null;
 
     public function __construct(
         private readonly Container $container,
-        private readonly Composer $composer,
+        private readonly PackageResolverStrategy $packageResolverStrategy,
         string $name = null
     ) {
         parent::__construct($name);
@@ -41,32 +38,12 @@ private function getPackageSubmitter(): PackageSubmitter
         if ($this->packageSubmitter === null) {
             $this->packageSubmitter = $this->container->make(
                 PackageSubmitter::class,
-                [
-                    'packageResolverStrategy' => $this->container->make(
-                        ComposerStrategy::class,
-                        ['composer' => $this->composer]
-                    )
-                ]
+                ['packageResolverStrategy' => $this->packageResolverStrategy]
             );
         }
         return $this->packageSubmitter;
     }
 
-    private function getPatchDetector(): PatchDetector
-    {
-        // We must use a getter because the application object is not known to us during construction
-        if ($this->patchDetector === null) {
-            $this->patchDetector = $this->container->make(
-                PatchDetector::class,
-                [
-                    'composer' => $this->composer,
-                    'application' => $this->getApplication()
-                ]
-            );
-        }
-        return $this->patchDetector;
-    }
-
     private function hasMismatchingVerdicts(array $verdicts): bool
     {
         return count(array_filter($verdicts, fn (PackageVerdict $verdict) => $verdict->verdict == 'mismatch')) > 0;
@@ -78,29 +55,9 @@ private function filterMatchVerdicts(array $verdicts): array
         return array_filter($verdicts, fn (PackageVerdict $verdict) => $verdict->verdict != 'match');
     }
 
-    private function getRendererOptions(bool $json): array
+    protected function getRendererOptions(bool $json): array
     {
-        $hasPatchPlugin = $this->getPatchDetector()->hasPatchPlugin();
-        $patchedPackages = $this->getPatchDetector()->getPatchedPackages();
-
-        $options = ['json' => $json];
-        if ($hasPatchPlugin) {
-            $options['additionalColumns'] = ['Patched'];
-            $options['verdictEnricher'] = new class($options['json'], $patchedPackages) implements VerdictEnricher
-            {
-                public function __construct(private readonly bool $json, private readonly array $patchedPackages)
-                {
-                }
-
-                public function enrich(PackageVerdict $packageVerdict): array
-                {
-                    $patchApplied = in_array($packageVerdict->name, $this->patchedPackages);
-                    return ['patch_applied' => $this->json ? $patchApplied : ($patchApplied ? 'Yes' : 'No')];
-                }
-            };
-        }
-
-        return $options;
+        return ['json' => $json];
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)