Merge 6d70c49 into 64d820b

Dockerfile

@@ -62,7 +62,9 @@ RUN /usr/local/bin/php -dxdebug.mode=off /usr/local/bin/composer config reposito
 
 RUN /usr/local/bin/php -dxdebug.mode=off /usr/local/bin/composer require 'darkaonline/l5-swagger:dev-master'
 
-RUN ln -s /app/tests/storage/annotations/ app/annotations
+RUN cp -r /app/tests/storage/annotations /app/l5-swagger-app/app/Annotations
+
+RUN for f in $(find app/Annotations/* -name '*.php'); do sed -i 's/namespace Tests\\storage\\annotations/namespace App\\Annotations/' $f; done
 
 RUN chown -R $user:$user .
 #

config/l5-swagger.php

@@ -140,6 +140,12 @@
              * @see \OpenApi\scan
             */
             'exclude' => [],
+
+            /*
+             * Allows to generate specs either for OpenAPI 3.0.0 or OpenAPI 3.1.0.
+             * By default the spec will be in version 3.0.0
+             */
+            'open_api_spec_version' => env('L5_SWAGGER_OPEN_API_SPEC_VERSION', \OpenApi\Annotations\OpenApi::DEFAULT_VERSION),
         ],
 
         /*

src/Generator.php

@@ -200,6 +200,11 @@ protected function createOpenApiGenerator(): OpenApiGenerator
     {
         $generator = new OpenApiGenerator();
 
+        // OpenApi spec version.
+        $generator->setVersion(
+            $this->scanOptions['open_api_spec_version'] ?? OpenApi::DEFAULT_VERSION
+        );
+
         // Processors.
         $this->setProcessors($generator);
 

tests/GeneratorTest.php

@@ -171,6 +171,7 @@ public function canGenerateWithScanOptions(): void
 
         $cfg['scanOptions']['pattern'] = 'L5SwaggerAnnotationsExample*.*';
         $cfg['scanOptions']['analyser'] = new TokenAnalyser;
+        $cfg['scanOptions']['open_api_spec_version'] = '3.1.0';
         $cfg['scanOptions']['processors'] = [
             new CleanUnmerged,
         ];
@@ -189,8 +190,10 @@ public function canGenerateWithScanOptions(): void
 
         $this->assertTrue(file_exists($this->jsonDocsFile()));
 
-        $this->get(route('l5-swagger.default.docs'))
-            ->assertSee('L5 Swagger')
+        $response = $this->get(route('l5-swagger.default.docs'));
+
+        $response->assertSee('L5 Swagger')
+            ->assertSee('3.1.0')
             ->assertSee('my-default-host.com')
             ->assertSee('getProjectsList')
             ->assertSee('getProductsList')