Better way to extract Command list

synolia · Sep 9, 2023 · 1a36a44 · 1a36a44
1 parent e4f3bf7
commit 1a36a44
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -75,7 +75,8 @@
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "symfony/thanks": true,
             "phpro/grumphp": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "ergebnis/composer-normalize": true
         }
     },
     "scripts": {

diff --git a/src/Parser/CommandParser.php b/src/Parser/CommandParser.php
@@ -5,8 +5,6 @@
 namespace Synolia\SyliusSchedulerCommandPlugin\Parser;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Webmozart\Assert\Assert;
 
@@ -24,47 +22,16 @@ public function __construct(private KernelInterface $kernel, array $excludedName
     public function getCommands(): array
     {
         $application = new Application($this->kernel);
-        $application->setAutoExit(false);
 
-        $input = new ArrayInput(
-            [
-                'command' => 'list',
-                '--format' => 'json',
-            ],
-        );
-
-        $stream = fopen('php://memory', 'w+');
-
-        if ($stream === false) {
-            throw new \Exception('PHP Memory stream not available');
-        }
-
-        $output = new StreamOutput($stream);
-        $application->run($input, $output);
-        rewind($output->getStream());
-
-        return $this->extractCommandsFromJson((string) stream_get_contents($output->getStream()));
-    }
-
-    private function extractCommandsFromJson(string $string): array
-    {
-        if ($string === '') {
-            return [];
-        }
-
-        $node = \json_decode($string, null, 512, \JSON_THROW_ON_ERROR);
         $commandsList = [];
-
-        if (null === $node || !\is_array($node->namespaces)) {
-            return [];
-        }
-
-        foreach ($node->namespaces as $namespace) {
-            if (!in_array($namespace->id, $this->excludedNamespaces, true)) {
-                foreach ($namespace->commands as $command) {
-                    $commandsList[$namespace->id][$command] = $command;
-                }
+        $commands = $application->all();
+        foreach ($commands as $command) {
+            $name = $command->getName() ?? '';
+            $namespace = \explode(':', $name)[0];
+            if (in_array($namespace, $this->excludedNamespaces, true)) {
+                continue;
             }
+            $commandsList[$namespace][$command->getName()] = $name;
         }
 
         return $commandsList;

diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
@@ -22,7 +22,7 @@ services:
 
     Synolia\SyliusSchedulerCommandPlugin\Parser\CommandParser:
         arguments:
-            $excludedNamespaces: ['_global']
+            $excludedNamespaces: ['_complete']
 
     app.grid_field.scheduled_command.url:
         class: Synolia\SyliusSchedulerCommandPlugin\Grid\FieldType\ScheduledCommandUrlType