Improve GeneratorAware trait and interface

bin/openapi

@@ -218,6 +218,7 @@ foreach ($options["processor"] as $processor) {
 }
 
 $analyser = new ReflectionAnalyser([new DocBlockAnnotationFactory(), new AttributeAnnotationFactory()]);
+$analyser->setGenerator($generator);
 
 $openapi = $generator
     ->setVersion($options['version'])

src/Analysers/AnalyserInterface.php

@@ -8,11 +8,9 @@
 
 use OpenApi\Analysis;
 use OpenApi\Context;
-use OpenApi\Generator;
+use OpenApi\GeneratorAwareInterface;
 
-interface AnalyserInterface
+interface AnalyserInterface extends GeneratorAwareInterface
 {
-    public function setGenerator(Generator $generator): void;
-
     public function fromFile(string $filename, Context $context): Analysis;
 }

src/Analysers/AnnotationFactoryInterface.php

@@ -8,17 +8,15 @@
 
 use OpenApi\Annotations as OA;
 use OpenApi\Context;
-use OpenApi\Generator;
+use OpenApi\GeneratorAwareInterface;
 
-interface AnnotationFactoryInterface
+interface AnnotationFactoryInterface extends GeneratorAwareInterface
 {
     /**
      * Checks if this factory is supported by the current runtime.
      */
     public function isSupported(): bool;
 
-    public function setGenerator(Generator $generator): void;
-
     /**
      * @return array<OA\AbstractAnnotation> top level annotations
      */

src/Analysers/AttributeAnnotationFactory.php

@@ -9,6 +9,7 @@
 use OpenApi\Annotations as OA;
 use OpenApi\Context;
 use OpenApi\Generator;
+use OpenApi\GeneratorAwareTrait;
 
 class AttributeAnnotationFactory implements AnnotationFactoryInterface
 {

src/Analysers/DocBlockAnnotationFactory.php

@@ -9,6 +9,7 @@
 use OpenApi\Annotations as OA;
 use OpenApi\Context;
 use OpenApi\Generator;
+use OpenApi\GeneratorAwareTrait;
 
 class DocBlockAnnotationFactory implements AnnotationFactoryInterface
 {
@@ -26,11 +27,13 @@ public function isSupported(): bool
         return DocBlockParser::isEnabled();
     }
 
-    public function setGenerator(Generator $generator): void
+    public function setGenerator(Generator $generator)
     {
         $this->generator = $generator;
 
         $this->docBlockParser->setAliases($generator->getAliases());
+
+        return $this;
     }
 
     public function build(\Reflector $reflector, Context $context): array

src/Analysers/ReflectionAnalyser.php

@@ -10,6 +10,7 @@
 use OpenApi\Annotations as OA;
 use OpenApi\Context;
 use OpenApi\Generator;
+use OpenApi\GeneratorAwareTrait;
 use OpenApi\OpenApiException;
 
 /**

src/GeneratorAwareInterface.php

@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi;
+
+interface GeneratorAwareInterface
+{
+    public function setGenerator(Generator $generator);
+}

src/Analysers/GeneratorAwareTrait.php → src/GeneratorAwareTrait.php

@@ -4,16 +4,16 @@
  * @license Apache 2.0
  */
 
-namespace OpenApi\Analysers;
-
-use OpenApi\Generator;
+namespace OpenApi;
 
 trait GeneratorAwareTrait
 {
     protected ?Generator $generator = null;
 
-    public function setGenerator(Generator $generator): void
+    public function setGenerator(Generator $generator)
     {
         $this->generator = $generator;
+
+        return $this;
     }
 }