use symfony dependency injection

Author: mpaden3

src/EventSubscriber/JsonApiErrorHandlerEvent.php

@@ -4,40 +4,50 @@
 
 use Paknahad\JsonApiBundle\Document\ValidationErrorDocument;
 use Paknahad\JsonApiBundle\Exception\ValidationException;
-use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
+use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Validator\Exception\ValidatorException;
 use Throwable;
-use WoohooLabs\Yin\JsonApi\Exception\DefaultExceptionFactory;
 use WoohooLabs\Yin\JsonApi\Exception\JsonApiExceptionInterface;
 use WoohooLabs\Yin\JsonApi\JsonApi;
-use WoohooLabs\Yin\JsonApi\Response\Responder;
 use WoohooLabs\Yin\JsonApi\Schema\Document\ErrorDocument;
+use WoohooLabs\Yin\JsonApi\Schema\Document\ErrorDocumentInterface;
 use WoohooLabs\Yin\JsonApi\Schema\Error\Error;
 use WoohooLabs\Yin\JsonApi\Schema\Link\DocumentLinks;
 use WoohooLabs\Yin\JsonApi\Schema\Link\Link;
-use WoohooLabs\Yin\JsonApi\Serializer\JsonSerializer;
 
 class JsonApiErrorHandlerEvent implements EventSubscriberInterface
 {
+    /**
+     * @var string
+     */
     private $environment;
-
+    /**
+     * @var JsonApi
+     */
     private $jsonApi;
-
+    /**
+     * @var bool
+     */
     private $debug;
+    /**
+     * @var HttpFoundationFactoryInterface
+     */
+    private $httpFoundationFactory;
 
-    public function __construct($environment, JsonApi $jsonApi, $debug)
+    public function __construct(string $environment, bool $debug, JsonApi $jsonApi, HttpFoundationFactoryInterface $httpFoundationFactory)
     {
         $this->environment = $environment;
         $this->jsonApi = $jsonApi;
         $this->debug = $debug;
+        $this->httpFoundationFactory = $httpFoundationFactory;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             KernelEvents::EXCEPTION => 'onKernelException',
@@ -46,28 +56,17 @@ public static function getSubscribedEvents()
 
     public function onKernelException(ExceptionEvent $event)
     {
-        $exceptionFactory = new DefaultExceptionFactory();
-
         $exception = $event->getThrowable();
 
-        $httpFoundationFactory = new HttpFoundationFactory();
-
-        $responder = new Responder(
-            $this->jsonApi->request,
-            $this->jsonApi->response,
-            $exceptionFactory,
-            new JsonSerializer()
-        );
-
         $additionalMeta = $this->getAdditionalMeta($exception);
 
-        $response = $responder->genericError(
+        $response = $this->jsonApi->respond()->genericError(
             $this->toErrorDocument($exception, $event->getRequest()->getRequestUri()),
             null,
             $additionalMeta
         );
 
-        $event->setResponse($httpFoundationFactory->createResponse($response));
+        $event->setResponse($this->httpFoundationFactory->createResponse($response));
     }
 
     protected function getExceptionMeta(Throwable $exception): array
@@ -90,7 +89,7 @@ protected function getExceptionMeta(Throwable $exception): array
         ];
     }
 
-    protected function toErrorDocument(Throwable $exception, string $url)
+    protected function toErrorDocument(Throwable $exception, string $url): ErrorDocumentInterface
     {
         if ($exception instanceof JsonApiExceptionInterface) {
             return $exception->getErrorDocument();

src/Factory/JsonApiFactory.php

@@ -5,29 +5,46 @@
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use WoohooLabs\Yin\JsonApi\Exception\DefaultExceptionFactory;
+use WoohooLabs\Yin\JsonApi\Exception\ExceptionFactoryInterface;
 use WoohooLabs\Yin\JsonApi\JsonApi;
 use WoohooLabs\Yin\JsonApi\Request\JsonApiRequest;
+use WoohooLabs\Yin\JsonApi\Serializer\SerializerInterface;
 
 class JsonApiFactory
 {
+    /**
+     * @var PsrHttpFactory
+     */
     private $psrFactory;
 
+    /**
+     * @var RequestStack
+     */
     private $requestStack;
+    /**
+     * @var ExceptionFactoryInterface
+     */
+    private $exceptionFactory;
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
 
-    public function __construct(PsrHttpFactory $psrFactory, RequestStack $requestStack)
+    public function __construct(PsrHttpFactory $psrFactory, RequestStack $requestStack, ExceptionFactoryInterface $exceptionFactory, SerializerInterface $serializer)
     {
         $this->psrFactory = $psrFactory;
         $this->requestStack = $requestStack;
+        $this->exceptionFactory = $exceptionFactory;
+        $this->serializer = $serializer;
     }
 
-    public function create()
+    public function create(): JsonApi
     {
         $jsonApiRequest = new JsonApiRequest(
             $this->psrFactory->createRequest($this->requestStack->getCurrentRequest()),
-            new DefaultExceptionFactory()
+            $this->exceptionFactory
         );
 
-        return new JsonApi($jsonApiRequest, $this->psrFactory->createResponse(new Response()));
+        return new JsonApi($jsonApiRequest, $this->psrFactory->createResponse(new Response()), $this->exceptionFactory, $this->serializer);
     }
 }

src/Resources/config/services.xml

@@ -9,18 +9,22 @@
 
         <service id="jsonapi.error.handler.event" class="Paknahad\JsonApiBundle\EventSubscriber\JsonApiErrorHandlerEvent" lazy="true">
             <tag name="event_subscriber" />
-            <argument type="service" id="WoohooLabs\Yin\JsonApi\JsonApi" />
+            <argument key="$jsonApi" type="service" id="WoohooLabs\Yin\JsonApi\JsonApi" />
             <argument key="$environment">%kernel.environment%</argument>
             <argument key="$debug">%kernel.debug%</argument>
+            <argument key="$httpFoundationFactory" type="service"
+                      id="sensio_framework_extra.psr7.http_foundation_factory"/>
         </service>
 
-        <service id="jsonapi.jsonApi.factory" class="Paknahad\JsonApiBundle\Factory\JsonApiFactory">
+        <service id="paknahad_json_api.factory.json_api_factory" class="Paknahad\JsonApiBundle\Factory\JsonApiFactory">
             <argument type="service" id="sensio_framework_extra.psr7.http_message_factory" />
             <argument type="service" id="request_stack" />
+            <argument type="service" id="WoohooLabs\Yin\JsonApi\Exception\ExceptionFactoryInterface"/>
+            <argument type="service" id="woohoo_labs.yin.json_api.serializer.json_serializer"/>
         </service>
 
         <service id="WoohooLabs\Yin\JsonApi\JsonApi" class="WoohooLabs\Yin\JsonApi\JsonApi">
-            <factory service="jsonapi.jsonApi.factory" method="create" />
+            <factory service="paknahad_json_api.factory.json_api_factory" method="create" />
         </service>
 
         <service id="jsonapi.postman_collection_generator" class="Paknahad\JsonApiBundle\Collection\PostmanCollectionGenerator">
@@ -66,9 +70,13 @@
 
         <service id="Paknahad\JsonApiBundle\Helper\Sorter" />
         <service id="Paknahad\JsonApiBundle\Helper\FieldManager" />
+
         <service id="WoohooLabs\Yin\JsonApi\Exception\DefaultExceptionFactory" />
         <service id="WoohooLabs\Yin\JsonApi\Exception\ExceptionFactoryInterface" alias="WoohooLabs\Yin\JsonApi\Exception\DefaultExceptionFactory"/>
 
+        <service id="woohoo_labs.yin.json_api.serializer.json_serializer" class="WoohooLabs\Yin\JsonApi\Serializer\JsonSerializer"/>
+        <service id="WoohooLabs\Yin\JsonApi\Serializer\SerializerInterface" alias="woohoo_labs.yin.json_api.serializer.json_serializer"/>
+
         <service id="Paknahad\JsonApiBundle\Helper\ResourceCollection" class="Paknahad\JsonApiBundle\Helper\ResourceCollection">
             <argument type="service" id="request_stack"/>
             <argument type="service" id="Paknahad\JsonApiBundle\Helper\Filter\FinderCollection" />