Feature/improve (#4)

Author: yoanm

phpunit.xml.dist

@@ -8,10 +8,6 @@
          processIsolation="false"
 
          stopOnRisky="true"
-         processUncoveredFilesFromWhitelist="true"
-         addUncoveredFilesFromWhitelist="true"
-         checkForUnintentionallyCoveredCode="true"
-
          stopOnError="true"
          stopOnFailure="true"
 

src/DependencyInjection/JsonRpcHttpServerOpenAPIDocExtension.php

@@ -23,7 +23,8 @@ public function load(array $configs, ContainerBuilder $container)
             $container,
             new FileLocator(__DIR__.'/../Resources/config')
         );
-        $loader->load('services.sdk.yaml');
+        $loader->load('services.sdk.app.yaml');
+        $loader->load('services.sdk.infra.yaml');
         $loader->load('services.public.yaml');
     }
 

src/Provider/DocProvider.php

@@ -2,8 +2,7 @@
 namespace Yoanm\SymfonyJsonRpcHttpServerOpenAPIDoc\Provider;
 
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Yoanm\JsonRpcHttpServerOpenAPIDoc\Normalizer\DocNormalizer;
-use Yoanm\JsonRpcServerDoc\Domain\Model\HttpServerDoc;
+use Yoanm\JsonRpcHttpServerOpenAPIDoc\Infra\Normalizer\DocNormalizer;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Creator\HttpServerDocCreator;
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Provider\DocProviderInterface;
 use Yoanm\SymfonyJsonRpcHttpServerOpenAPIDoc\Event\OpenAPIDocCreatedEvent;
@@ -16,7 +15,7 @@ class DocProvider implements DocProviderInterface
     /** @var EventDispatcherInterface */
     private $dispatcher;
     /** @var HttpServerDocCreator */
-    private $HttpServerDocCreator;
+    private $httpServerDocCreator;
     /** @var DocNormalizer */
     private $docNormalizer;
 
@@ -31,7 +30,7 @@ public function __construct(
         DocNormalizer $docNormalizer
     ) {
         $this->dispatcher = $dispatcher;
-        $this->HttpServerDocCreator = $HttpServerDocCreator;
+        $this->httpServerDocCreator = $HttpServerDocCreator;
         $this->docNormalizer = $docNormalizer;
     }
 
@@ -40,9 +39,9 @@ public function __construct(
      *
      * @return array
      */
-    public function getDoc($host = null)
+    public function getDoc($host = null) : array
     {
-        $rawDoc = $this->HttpServerDocCreator->create($host);
+        $rawDoc = $this->httpServerDocCreator->create($host);
 
         $openApiDoc = $this->docNormalizer->normalize($rawDoc);
 
@@ -55,7 +54,7 @@ public function getDoc($host = null)
     /**
      * {@inheritdoc}
      */
-    public function supports($filename, $host = null)
+    public function supports($filename, $host = null) : bool
     {
         return 'openapi.json' === $filename;
     }

src/Resources/config/services.sdk.app.yaml

@@ -0,0 +1,47 @@
+services:
+  _defaults:
+    public: false
+
+
+  # Def resolver
+  json_rpc_http_server_open_api_doc_sdk.app.resolver.definition_ref:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\App\Resolver\DefinitionRefResolver
+
+  ## Components
+  json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.schema_type:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\App\Normalizer\Component\SchemaTypeNormalizer
+  json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.parameter_doc:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\App\Normalizer\Component\TypeDocNormalizer
+    arguments:
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.schema_type'
+  json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.shape:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\App\Normalizer\Component\ShapeNormalizer
+    arguments:
+     - '@json_rpc_http_server_open_api_doc_sdk.app.resolver.definition_ref'
+  json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.error:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\App\Normalizer\Component\ErrorDocNormalizer
+    arguments:
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.parameter_doc'
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.shape'
+  json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.external_schema_list:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\App\Normalizer\Component\ExternalSchemaListDocNormalizer
+    arguments:
+     - '@json_rpc_http_server_open_api_doc_sdk.app.resolver.definition_ref'
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.parameter_doc'
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.error'
+  json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.request_doc:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\App\Normalizer\Component\RequestDocNormalizer
+    arguments:
+     - '@json_rpc_http_server_open_api_doc_sdk.app.resolver.definition_ref'
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.shape'
+  json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.response:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\App\Normalizer\Component\ResponseDocNormalizer
+    arguments:
+     - '@json_rpc_http_server_open_api_doc_sdk.app.resolver.definition_ref'
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.shape'
+  json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.operation:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\App\Normalizer\Component\OperationDocNormalizer
+    arguments:
+     - '@json_rpc_http_server_open_api_doc_sdk.app.resolver.definition_ref'
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.request_doc'
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.response'

src/Resources/config/services.sdk.infra.yaml

@@ -0,0 +1,10 @@
+services:
+  _defaults:
+    public: true
+
+  # Normalizer
+  json_rpc_http_server_open_api_doc_sdk.normalizer.doc:
+    class: Yoanm\JsonRpcHttpServerOpenAPIDoc\Infra\Normalizer\DocNormalizer
+    arguments:
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.external_schema_list'
+     - '@json_rpc_http_server_open_api_doc_sdk.normalizer.app.component.operation'