add commands optinally

rectorphp · Jun 8, 2023 · 827b364 · 827b364
1 parent 3c7cba3
commit 827b364
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 29 deletions.
diff --git a/config/config.php b/config/config.php
@@ -206,10 +206,17 @@
     $services->set(DynamicSourceLocatorProvider::class)
         ->factory([service(PHPStanServicesFactory::class), 'createDynamicSourceLocatorProvider']);
 
-    $services->set(MissingInSetCommand::class);
-    $services->set(OutsideAnySetCommand::class);
+    // add commands optinally
+    if (class_exists(MissingInSetCommand::class)) {
+        $services->set(Application::class)
+            ->call('add', [service(MissingInSetCommand::class)])
+            ->call('add', [service(OutsideAnySetCommand::class)]);
+
+        $services->set(MissingInSetCommand::class);
+        $services->set(OutsideAnySetCommand::class);
+    }
 
-    // phpdoc parser
+        // phpdoc parser
     $services->set(SmartPhpParser::class)
         ->factory([service(SmartPhpParserFactory::class), 'create']);
 

diff --git a/src/Console/ConsoleApplication.php b/src/Console/ConsoleApplication.php
@@ -12,12 +12,7 @@
 use Rector\Core\Console\Command\ProcessCommand;
 use Rector\Core\Console\Command\SetupCICommand;
 use Rector\Core\Console\Command\WorkerCommand;
-use Rector\RectorGenerator\Command\GenerateCommand;
-use Rector\RectorGenerator\Command\InitRecipeCommand;
-use Rector\Utils\Command\MissingInSetCommand;
-use Rector\Utils\Command\OutsideAnySetCommand;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -35,32 +30,11 @@ public function __construct(
         WorkerCommand $workerCommand,
         SetupCICommand $setupCICommand,
         ListRulesCommand $listRulesCommand,
-        // dev
-        MissingInSetCommand $missingInSetCommand = null,
-        OutsideAnySetCommand $outsideAnySetCommand = null,
-        GenerateCommand $generateCommand = null,
-        InitRecipeCommand $initRecipeCommand = null,
     ) {
         parent::__construct(self::NAME, VersionResolver::PACKAGE_VERSION);
 
         $this->addCommands([$processCommand, $workerCommand, $setupCICommand, $listRulesCommand]);
 
-        if ($missingInSetCommand instanceof Command) {
-            $this->add($missingInSetCommand);
-        }
-
-        if ($outsideAnySetCommand instanceof Command) {
-            $this->add($outsideAnySetCommand);
-        }
-
-        if ($generateCommand instanceof Command) {
-            $this->add($generateCommand);
-        }
-
-        if ($initRecipeCommand instanceof Command) {
-            $this->add($initRecipeCommand);
-        }
-
         $this->setDefaultCommand('process');
     }