try entropy

Author: TomasVotruba

.github/workflows/code_analysis.yaml

@@ -56,7 +56,7 @@ jobs:
             # see https://github.com/shivammathur/setup-php
             -   uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.2
+                    php-version: 8.3
                     coverage: none
 
             # composer install cache - https://github.com/ramsey/composer-install

.github/workflows/downgraded_release.yaml

@@ -19,7 +19,7 @@ jobs:
             -
                 uses: "shivammathur/setup-php@v2"
                 with:
-                    php-version: 8.2
+                    php-version: 8.3
                     coverage: none
 
             # invoke patches

bin/jack.php

@@ -2,9 +2,7 @@
 
 declare(strict_types=1);
 
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Output\ConsoleOutput;
+use Entropy\Console\ConsoleApplication;
 use Rector\Jack\DependencyInjection\ContainerFactory;
 
 $scoperAutoloadFilepath = __DIR__ . '/../vendor/scoper-autoload.php';
@@ -32,7 +30,7 @@
 $containerFactory = new ContainerFactory();
 $container = $containerFactory->create();
 
-$application = $container->make(Application::class);
+$consoleApplication = $container->make(ConsoleApplication::class);
 
-$exitCode = $application->run(new ArgvInput(), new ConsoleOutput());
+$exitCode = $consoleApplication->run($argv);
 exit($exitCode);

composer.json

@@ -6,12 +6,11 @@
         "bin/jack"
     ],
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.3",
         "composer/semver": "^3.4",
-        "illuminate/container": "^12.37",
+        "entropy/entropy": "dev-main",
         "nette/utils": "^4.0",
         "symfony/console": "^6.4",
-        "symfony/finder": "^7.3",
         "symfony/process": "^7.3",
         "webmozart/assert": "^1.12"
     },
@@ -23,7 +22,6 @@
         "shipmonk/composer-dependency-analyser": "^1.8",
         "phpecs/phpecs": "^2.2",
         "symplify/phpstan-extensions": "^12.0",
-        "symplify/vendor-patches": "^11.5",
         "tomasvotruba/class-leak": "^2.0",
         "tracy/tracy": "^2.11"
     },
@@ -41,7 +39,6 @@
         "sort-packages": true,
         "platform-check": false,
         "allow-plugins": {
-            "cweagans/composer-patches": true,
             "phpstan/extension-installer": true
         }
     },

src/ComposerProcessor/RaiseToInstalledComposerProcessor.php

@@ -6,16 +6,16 @@
 
 use Composer\Semver\Comparator;
 use Composer\Semver\VersionParser;
+use Entropy\Attributes\RelatedTest;
 use Nette\Utils\Json;
 use Rector\Jack\Composer\InstalledVersionResolver;
 use Rector\Jack\Composer\VersionComparator;
 use Rector\Jack\FileSystem\ComposerJsonPackageVersionUpdater;
+use Rector\Jack\Tests\ComposerProcessor\RaiseToInstalledComposerProcessor\RaiseToInstalledComposerProcessorTest;
 use Rector\Jack\ValueObject\ChangedPackageVersion;
 use Rector\Jack\ValueObject\ComposerProcessorResult\ChangedPackageVersionsResult;
 
-/**
- * @see \Rector\Jack\Tests\ComposerProcessor\RaiseToInstalledComposerProcessor\RaiseToInstalledComposerProcessorTest
- */
+#[RelatedTest(RaiseToInstalledComposerProcessorTest::class)]
 final readonly class RaiseToInstalledComposerProcessor
 {
     public function __construct(

src/DependencyInjection/ContainerFactory.php

@@ -4,11 +4,9 @@
 
 namespace Rector\Jack\DependencyInjection;
 
-use Illuminate\Container\Container;
-use Rector\Jack\Console\JackConsoleApplication;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Finder\Finder;
-use Webmozart\Assert\Assert;
+use Entropy\Console\CommandRegistry;
+use Entropy\Console\Contract\CommandInterface;
+use Entropy\Container\Container;
 
 final class ContainerFactory
 {
@@ -19,57 +17,12 @@ public function create(): Container
     {
         $container = new Container();
 
-        // console
-        $container->singleton(Application::class, function (Container $container): Application {
-            $jackConsoleApplication = new JackConsoleApplication('Rector Jack');
-
-            $commandClasses = $this->findCommandClasses();
-
-            // register commands
-            foreach ($commandClasses as $commandClass) {
-                $command = $container->make($commandClass);
-                $jackConsoleApplication->add($command);
-            }
-
-            // remove basic command to make output clear
-            $this->hideDefaultCommands($jackConsoleApplication);
-
-            return $jackConsoleApplication;
+        // @todo avoid need of this
+        $container->service(CommandRegistry::class, function (Container $container): CommandRegistry {
+            $commands = $container->findByContract(CommandInterface::class);
+            return new CommandRegistry($commands);
         });
 
         return $container;
     }
-
-    public function hideDefaultCommands(Application $application): void
-    {
-        $application->get('list')
-            ->setHidden(true);
-        $application->get('completion')
-            ->setHidden(true);
-        $application->get('help')
-            ->setHidden(true);
-    }
-
-    /**
-     * @return string[]
-     */
-    private function findCommandClasses(): array
-    {
-        $commandFinder = Finder::create()
-            ->files()
-            ->name('*Command.php')
-            ->in(__DIR__ . '/../Command');
-
-        $commandClasses = [];
-        foreach ($commandFinder as $commandFile) {
-            $commandClass = 'Rector\\Jack\\Command\\' . $commandFile->getBasename('.php');
-
-            // make sure it exists
-            Assert::classExists($commandClass);
-
-            $commandClasses[] = $commandClass;
-        }
-
-        return $commandClasses;
-    }
 }

tests/AbstractTestCase.php

@@ -4,7 +4,7 @@
 
 namespace Rector\Jack\Tests;
 
-use Illuminate\Container\Container;
+use Entropy\Container\Container;
 use PHPUnit\Framework\TestCase;
 use Rector\Jack\DependencyInjection\ContainerFactory;
 
@@ -20,6 +20,7 @@ protected function setUp(): void
 
     /**
      * @template TType of object
+     *
      * @param class-string<TType> $type
      * @return TType
      */

tests/ComposerProcessor/RaiseToInstalledComposerProcessor/Fixture/double-piped.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "illuminate/container": "^12.14 || 13.0"
+        "symfony/console": "^5.4 || 6.4"
     }
-}
+}

tests/ComposerProcessor/RaiseToInstalledComposerProcessor/Fixture/single-piped.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "illuminate/container": "^12.14 | 13.0"
+        "symfony/console": "^5.4 | 6.4"
     }
-}
+}

tests/ComposerProcessor/RaiseToInstalledComposerProcessor/Fixture/skip-conflict.json

@@ -1,8 +1,8 @@
 {
     "require-dev": {
-        "illuminate/container": "^9.0"
+        "symfony/console": "^5.4"
     },
     "conflict": {
-        "illuminate/container": "<9.0"
+        "symfony/console": "<5.4"
     }
 }