Refactor GenerateCommand and GenerateInput to use OpenApi annotations and simplify path exclusion handling

Author: yceruto

src/Console/GenerateCommand.php

@@ -6,10 +6,7 @@
 
 namespace OpenApi\Console;
 
-use OpenApi\Analysers\AttributeAnnotationFactory;
-use OpenApi\Analysers\DocBlockAnnotationFactory;
-use OpenApi\Analysers\ReflectionAnalyser;
-use OpenApi\Annotations\OpenApi;
+use OpenApi\Annotations as OA;
 use OpenApi\Generator;
 use OpenApi\SourceFinder;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -68,7 +65,7 @@ public function __invoke(#[MapInput] GenerateInput $input, SymfonyStyle $io): in
         return $this->logger->hasErrored() ? 1 : 0;
     }
 
-    private function generate(GenerateInput $input): OpenApi
+    private function generate(GenerateInput $input): OA\OpenApi
     {
         $generator = new Generator($this->logger);
 
@@ -89,37 +86,9 @@ private function generate(GenerateInput $input): OpenApi
             $generator->getProcessorPipeline()->remove($class);
         }
 
-        $analyser = new ReflectionAnalyser([
-            new AttributeAnnotationFactory(),
-            new DocBlockAnnotationFactory(),
-        ]);
-        $analyser->setGenerator($generator);
-
         return $generator
             ->setVersion($input->version)
             ->setConfig($input->config)
-            ->setAnalyser($analyser)
-            ->generate(new SourceFinder($input->paths, $this->normalizeExcludePaths($input->exclude), $input->pattern));
-    }
-
-    /**
-     * @param list<string> $exclude
-     *
-     * @return list<string>
-     */
-    private function normalizeExcludePaths(array $exclude): array
-    {
-        if (!$exclude) {
-            return [];
-        }
-
-        if (str_contains($exclude[0], ',')) {
-            $exploded = explode(',', $exclude[0]);
-            $this->logger->error('Comma-separated exclude paths are deprecated, use multiple --exclude statements: --exclude ' . $exploded[0] . ' --exclude ' . $exploded[1]);
-            $exclude[0] = array_shift($exploded);
-            $exclude = array_merge($exclude, $exploded);
-        }
-
-        return $exclude;
+            ->generate(new SourceFinder($input->paths, $input->exclude, $input->pattern));
     }
 }

src/Console/GenerateInput.php

@@ -6,7 +6,7 @@
 
 namespace OpenApi\Console;
 
-use OpenApi\Annotations\OpenApi;
+use OpenApi\Annotations as OA;
 use Symfony\Component\Console\Attribute\Argument;
 use Symfony\Component\Console\Attribute\Option;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
@@ -44,7 +44,7 @@ class GenerateInput
     public array $removeProcessor = [];
 
     #[Option('The OpenAPI version')]
-    public string $version = OpenApi::DEFAULT_VERSION;
+    public string $version = OA\OpenApi::DEFAULT_VERSION;
 
     #[Option('Show additional error information', shortcut: 'd')]
     public bool $debug = false;

tests/CommandlineTest.php

@@ -68,16 +68,6 @@ public function testRemoveProcessor(): void
         $this->assertSame(0, $retval, $cmd . PHP_EOL . implode(PHP_EOL, $output));
     }
 
-    public function testExcludeListWarning(): void
-    {
-        $basePath = self::examplePath('petstore');
-        $path = "{$basePath}/annotations";
-        exec($this->getCommandToExecute(__DIR__ . '/../bin/openapi -e foo,bar ' . escapeshellarg($path) . ' 2>&1'), $output, $retval);
-        $this->assertSame(1, $retval);
-        $output = implode(PHP_EOL, $output);
-        $this->assertStringContainsString('Comma-separated exclude paths are deprecated', $output);
-    }
-
     public function testMissingArg(): void
     {
         $basePath = self::examplePath('petstore');