OpenApi + Swagger

api-platform · Nov 17, 2021 · 63a1b89 · 63a1b89
1 parent ebd6034
commit 63a1b89
Show file tree

Hide file tree

Showing 46 changed files with 117 additions and 88 deletions.
diff --git a/src/Core/Bridge/Symfony/Bundle/Command/SwaggerCommand.php b/src/Core/Bridge/Symfony/Bundle/Command/SwaggerCommand.php
@@ -14,9 +14,9 @@
 namespace ApiPlatform\Core\Bridge\Symfony\Bundle\Command;
 
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
-use ApiPlatform\Core\Swagger\Serializer\ApiGatewayNormalizer;
 use ApiPlatform\Core\Swagger\Serializer\DocumentationNormalizer;
 use ApiPlatform\Documentation\Documentation;
+use ApiPlatform\OpenApi\Serializer\ApiGatewayNormalizer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Input\InputInterface;

diff --git a/src/Core/OpenApi/Factory/OpenApiFactory.php b/src/Core/OpenApi/Factory/OpenApiFactory.php
@@ -24,13 +24,14 @@
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
 use ApiPlatform\Core\Metadata\Resource\ResourceMetadata;
-use ApiPlatform\Core\OpenApi\Model;
-use ApiPlatform\Core\OpenApi\Model\ExternalDocumentation;
-use ApiPlatform\Core\OpenApi\Model\PathItem;
-use ApiPlatform\Core\OpenApi\OpenApi;
-use ApiPlatform\Core\OpenApi\Options;
 use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface;
 use ApiPlatform\Core\PathResolver\OperationPathResolverInterface;
+use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface;
+use ApiPlatform\OpenApi\Model;
+use ApiPlatform\OpenApi\Model\ExternalDocumentation;
+use ApiPlatform\OpenApi\Model\PathItem;
+use ApiPlatform\OpenApi\OpenApi;
+use ApiPlatform\OpenApi\Options;
 use ApiPlatform\State\Pagination\PaginationOptions;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\PropertyInfo\Type;

diff --git a/src/Core/Swagger/Serializer/DocumentationNormalizer.php b/src/Core/Swagger/Serializer/DocumentationNormalizer.php
@@ -32,13 +32,13 @@
 use ApiPlatform\Core\Metadata\Resource\ApiResourceToLegacyResourceMetadataTrait;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Resource\ResourceMetadata;
-use ApiPlatform\Core\OpenApi\OpenApi;
 use ApiPlatform\Core\Operation\Factory\SubresourceOperationFactoryInterface;
 use ApiPlatform\Core\PathResolver\OperationPathResolverInterface;
 use ApiPlatform\Documentation\Documentation;
 use ApiPlatform\Exception\ResourceClassNotFoundException;
 use ApiPlatform\Exception\RuntimeException;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\OpenApi\OpenApi;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;

diff --git a/src/Documentation/Action/DocumentationAction.php b/src/Documentation/Action/DocumentationAction.php
@@ -15,9 +15,9 @@
 
 use ApiPlatform\Core\Api\FormatsProviderInterface;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
-use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface;
 use ApiPlatform\Documentation\Documentation;
 use ApiPlatform\Documentation\DocumentationInterface;
+use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface;
 use ApiPlatform\Util\RequestAttributesExtractor;
 use Symfony\Component\HttpFoundation\Request;
 

diff --git a/src/OpenApi/Factory/OpenApiFactory.php b/src/OpenApi/Factory/OpenApiFactory.php
@@ -20,18 +20,17 @@
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface as LegacyPropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface as LegacyPropertyNameCollectionFactoryInterface;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
-use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface;
-use ApiPlatform\Core\OpenApi\Model;
-use ApiPlatform\Core\OpenApi\Model\ExternalDocumentation;
-use ApiPlatform\Core\OpenApi\OpenApi;
-use ApiPlatform\Core\OpenApi\Options;
 use ApiPlatform\Core\PathResolver\OperationPathResolverInterface;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
+use ApiPlatform\OpenApi\Model;
+use ApiPlatform\OpenApi\Model\ExternalDocumentation;
+use ApiPlatform\OpenApi\OpenApi;
+use ApiPlatform\OpenApi\Options;
 use ApiPlatform\State\Pagination\PaginationOptions;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\PropertyInfo\Type;

diff --git a/...enApi/Factory/OpenApiFactoryInterface.php → ...enApi/Factory/OpenApiFactoryInterface.php b/...enApi/Factory/OpenApiFactoryInterface.php → ...enApi/Factory/OpenApiFactoryInterface.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Factory;
+namespace ApiPlatform\OpenApi\Factory;
 
-use ApiPlatform\Core\OpenApi\OpenApi;
+use ApiPlatform\OpenApi\OpenApi;
 
 interface OpenApiFactoryInterface
 {

diff --git a/src/Core/OpenApi/Model/Components.php → src/OpenApi/Model/Components.php b/src/Core/OpenApi/Model/Components.php → src/OpenApi/Model/Components.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Components
 {

diff --git a/src/Core/OpenApi/Model/Contact.php → src/OpenApi/Model/Contact.php b/src/Core/OpenApi/Model/Contact.php → src/OpenApi/Model/Contact.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Contact
 {

diff --git a/src/Core/OpenApi/Model/Encoding.php → src/OpenApi/Model/Encoding.php b/src/Core/OpenApi/Model/Encoding.php → src/OpenApi/Model/Encoding.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Encoding
 {

diff --git a/src/Core/OpenApi/Model/ExtensionTrait.php → src/OpenApi/Model/ExtensionTrait.php b/src/Core/OpenApi/Model/ExtensionTrait.php → src/OpenApi/Model/ExtensionTrait.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 trait ExtensionTrait
 {

diff --git a/...e/OpenApi/Model/ExternalDocumentation.php → src/OpenApi/Model/ExternalDocumentation.php b/...e/OpenApi/Model/ExternalDocumentation.php → src/OpenApi/Model/ExternalDocumentation.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class ExternalDocumentation
 {

diff --git a/src/Core/OpenApi/Model/Info.php → src/OpenApi/Model/Info.php b/src/Core/OpenApi/Model/Info.php → src/OpenApi/Model/Info.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Info
 {

diff --git a/src/Core/OpenApi/Model/License.php → src/OpenApi/Model/License.php b/src/Core/OpenApi/Model/License.php → src/OpenApi/Model/License.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class License
 {

diff --git a/src/Core/OpenApi/Model/Link.php → src/OpenApi/Model/Link.php b/src/Core/OpenApi/Model/Link.php → src/OpenApi/Model/Link.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Link
 {

diff --git a/src/Core/OpenApi/Model/MediaType.php → src/OpenApi/Model/MediaType.php b/src/Core/OpenApi/Model/MediaType.php → src/OpenApi/Model/MediaType.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class MediaType
 {

diff --git a/src/Core/OpenApi/Model/OAuthFlow.php → src/OpenApi/Model/OAuthFlow.php b/src/Core/OpenApi/Model/OAuthFlow.php → src/OpenApi/Model/OAuthFlow.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class OAuthFlow
 {

diff --git a/src/Core/OpenApi/Model/OAuthFlows.php → src/OpenApi/Model/OAuthFlows.php b/src/Core/OpenApi/Model/OAuthFlows.php → src/OpenApi/Model/OAuthFlows.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class OAuthFlows
 {

diff --git a/src/Core/OpenApi/Model/Operation.php → src/OpenApi/Model/Operation.php b/src/Core/OpenApi/Model/Operation.php → src/OpenApi/Model/Operation.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Operation
 {

diff --git a/src/Core/OpenApi/Model/Parameter.php → src/OpenApi/Model/Parameter.php b/src/Core/OpenApi/Model/Parameter.php → src/OpenApi/Model/Parameter.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Parameter
 {

diff --git a/src/Core/OpenApi/Model/PathItem.php → src/OpenApi/Model/PathItem.php b/src/Core/OpenApi/Model/PathItem.php → src/OpenApi/Model/PathItem.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class PathItem
 {

diff --git a/src/Core/OpenApi/Model/Paths.php → src/OpenApi/Model/Paths.php b/src/Core/OpenApi/Model/Paths.php → src/OpenApi/Model/Paths.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Paths
 {

diff --git a/src/Core/OpenApi/Model/RequestBody.php → src/OpenApi/Model/RequestBody.php b/src/Core/OpenApi/Model/RequestBody.php → src/OpenApi/Model/RequestBody.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class RequestBody
 {

diff --git a/src/Core/OpenApi/Model/Response.php → src/OpenApi/Model/Response.php b/src/Core/OpenApi/Model/Response.php → src/OpenApi/Model/Response.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Response
 {

diff --git a/src/Core/OpenApi/Model/Schema.php → src/OpenApi/Model/Schema.php b/src/Core/OpenApi/Model/Schema.php → src/OpenApi/Model/Schema.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 use ApiPlatform\Core\JsonSchema\Schema as JsonSchema;
 

diff --git a/src/Core/OpenApi/Model/SecurityScheme.php → src/OpenApi/Model/SecurityScheme.php b/src/Core/OpenApi/Model/SecurityScheme.php → src/OpenApi/Model/SecurityScheme.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class SecurityScheme
 {

diff --git a/src/Core/OpenApi/Model/Server.php → src/OpenApi/Model/Server.php b/src/Core/OpenApi/Model/Server.php → src/OpenApi/Model/Server.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Model;
+namespace ApiPlatform\OpenApi\Model;
 
 final class Server
 {

diff --git a/src/Core/OpenApi/OpenApi.php → src/OpenApi/OpenApi.php b/src/Core/OpenApi/OpenApi.php → src/OpenApi/OpenApi.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi;
+namespace ApiPlatform\OpenApi;
 
-use ApiPlatform\Core\OpenApi\Model\Components;
-use ApiPlatform\Core\OpenApi\Model\ExtensionTrait;
-use ApiPlatform\Core\OpenApi\Model\Info;
-use ApiPlatform\Core\OpenApi\Model\Paths;
 use ApiPlatform\Documentation\DocumentationInterface;
+use ApiPlatform\OpenApi\Model\Components;
+use ApiPlatform\OpenApi\Model\ExtensionTrait;
+use ApiPlatform\OpenApi\Model\Info;
+use ApiPlatform\OpenApi\Model\Paths;
 
 final class OpenApi implements DocumentationInterface
 {

diff --git a/src/Core/OpenApi/Options.php → src/OpenApi/Options.php b/src/Core/OpenApi/Options.php → src/OpenApi/Options.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi;
+namespace ApiPlatform\OpenApi;
 
 final class Options
 {

diff --git a/...agger/Serializer/ApiGatewayNormalizer.php → ...enApi/Serializer/ApiGatewayNormalizer.php b/...agger/Serializer/ApiGatewayNormalizer.php → ...enApi/Serializer/ApiGatewayNormalizer.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\Swagger\Serializer;
+namespace ApiPlatform\OpenApi\Serializer;
 
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;

diff --git a/.../OpenApi/Serializer/OpenApiNormalizer.php → src/OpenApi/Serializer/OpenApiNormalizer.php b/.../OpenApi/Serializer/OpenApiNormalizer.php → src/OpenApi/Serializer/OpenApiNormalizer.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Core\OpenApi\Serializer;
+namespace ApiPlatform\OpenApi\Serializer;
 
-use ApiPlatform\Core\OpenApi\Model\Paths;
-use ApiPlatform\Core\OpenApi\OpenApi;
+use ApiPlatform\OpenApi\Model\Paths;
+use ApiPlatform\OpenApi\OpenApi;
 use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;

diff --git a/src/Symfony/Bundle/Command/OpenApiCommand.php b/src/Symfony/Bundle/Command/OpenApiCommand.php
@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Symfony\Bundle\Command;
 
-use ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface;
+use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;

diff --git a/src/Symfony/Bundle/Resources/config/openapi.xml b/src/Symfony/Bundle/Resources/config/openapi.xml
@@ -5,7 +5,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="api_platform.openapi.normalizer" class="ApiPlatform\Core\OpenApi\Serializer\OpenApiNormalizer" public="false">
+        <service id="api_platform.openapi.normalizer" class="ApiPlatform\OpenApi\Serializer\OpenApiNormalizer" public="false">
             <argument type="service">
                 <service class="Symfony\Component\Serializer\Serializer">
                     <argument type="collection">
@@ -27,9 +27,9 @@
             <!-- Just after the DocumentationNormalizer see swagger.xml -->
             <tag name="serializer.normalizer" priority="-795" />
         </service>
-        <service id="ApiPlatform\Core\OpenApi\Serializer\OpenApiNormalizer" alias="api_platform.openapi.normalizer" />
+        <service id="ApiPlatform\OpenApi\Serializer\OpenApiNormalizer" alias="api_platform.openapi.normalizer" />
 
-        <service id="api_platform.openapi.options" class="ApiPlatform\Core\OpenApi\Options">
+        <service id="api_platform.openapi.options" class="ApiPlatform\OpenApi\Options">
             <argument>%api_platform.title%</argument>
             <argument>%api_platform.description%</argument>
             <argument>%api_platform.version%</argument>
@@ -48,7 +48,7 @@
             <argument>%api_platform.openapi.license.name%</argument>
             <argument>%api_platform.openapi.license.url%</argument>
         </service>
-        <service id="ApiPlatform\Core\OpenApi\Options" alias="api_platform.openapi.options" />
+        <service id="ApiPlatform\OpenApi\Options" alias="api_platform.openapi.options" />
 
         <service id="api_platform.openapi.factory.next" class="ApiPlatform\OpenApi\Factory\OpenApiFactory" public="false">
             <argument type="service" id="api_platform.metadata.resource.name_collection_factory" />
@@ -81,15 +81,15 @@
             <argument type="service" id="api_platform.pagination_options" />
         </service>
         <service id="api_platform.openapi.factory" alias="api_platform.openapi.factory.next" />
-        <service id="ApiPlatform\Core\OpenApi\Factory\OpenApiFactoryInterface" alias="api_platform.openapi.factory" />
+        <service id="ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface" alias="api_platform.openapi.factory" />
 
         <service id="api_platform.openapi.command" class="ApiPlatform\Symfony\Bundle\Command\OpenApiCommand">
             <argument type="service" id="api_platform.openapi.factory.next" />
             <argument type="service" id="api_platform.serializer" />
             <tag name="console.command" />
         </service>
 
-        <service id="api_platform.openapi.normalizer.api_gateway"  class="ApiPlatform\Core\Swagger\Serializer\ApiGatewayNormalizer" public="false" decorates="api_platform.openapi.normalizer" decoration-priority="-1">
+        <service id="api_platform.openapi.normalizer.api_gateway"  class="ApiPlatform\OpenApi\Serializer\ApiGatewayNormalizer" public="false" decorates="api_platform.openapi.normalizer" decoration-priority="-1">
             <argument type="service" id="api_platform.openapi.normalizer.api_gateway.inner" />
             <tag name="serializer.normalizer" priority="-780" />
         </service>

diff --git a/src/Symfony/Bundle/Resources/config/swagger.xml b/src/Symfony/Bundle/Resources/config/swagger.xml
@@ -37,7 +37,7 @@
             <tag name="serializer.normalizer" priority="-790" />
         </service>
 
-        <service id="api_platform.swagger.normalizer.api_gateway" class="ApiPlatform\Core\Swagger\Serializer\ApiGatewayNormalizer" public="false" decorates="api_platform.swagger.normalizer.documentation" decoration-priority="-1">
+        <service id="api_platform.swagger.normalizer.api_gateway" class="ApiPlatform\OpenApi\Serializer\ApiGatewayNormalizer" public="false" decorates="api_platform.swagger.normalizer.documentation" decoration-priority="-1">
             <argument type="service" id="api_platform.swagger.normalizer.api_gateway.inner" />
             <tag name="serializer.normalizer" priority="-780" />
         </service>