Fixed Trait. Methods are now protected and objects namespace have been corrected

Author: Nil Portugues Caldero

src/Serializer/JsonApiResponseTrait.php

@@ -2,16 +2,26 @@
 
 namespace NilPortugues\Symfony\JsonApiBundle\Serializer;
 
+use NilPortugues\Api\JsonApi\Http\Response\BadRequest;
+use NilPortugues\Api\JsonApi\Http\Response\ResourceCreated;
+use NilPortugues\Api\JsonApi\Http\Response\ResourceDeleted;
+use NilPortugues\Api\JsonApi\Http\Response\ResourceNotFound;
+use NilPortugues\Api\JsonApi\Http\Response\ResourceProcessing;
+use NilPortugues\Api\JsonApi\Http\Response\ResourceUpdated;
+use NilPortugues\Api\JsonApi\Http\Response\Response;
+use NilPortugues\Api\JsonApi\Http\Response\UnprocessableEntity;
+use NilPortugues\Api\JsonApi\Http\Response\UnsupportedAction;
+use Psr\Http\Message\ResponseInterface;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 
 trait JsonApiResponseTrait
 {
     /**
-     * @param \Psr\Http\Message\ResponseInterface $response
+     * @param ResponseInterface $response
      *
-     * @return \Psr\Http\Message\ResponseInterface
+     * @return ResponseInterface
      */
-    protected function addHeaders(\Psr\Http\Message\ResponseInterface $response)
+    protected function addHeaders(ResponseInterface $response)
     {
         return $response;
     }
@@ -21,108 +31,108 @@ protected function addHeaders(\Psr\Http\Message\ResponseInterface $response)
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function errorResponse($json)
+    protected function errorResponse($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\ErrorResponse($json)));
+            ->createResponse($this->addHeaders(new BadRequest($json)));
     }
 
     /**
      * @param string $json
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function resourceCreatedResponse($json)
+    protected function resourceCreatedResponse($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\ResourceCreatedResponse($json)));
+            ->createResponse($this->addHeaders(new ResourceCreated($json)));
     }
 
     /**
      * @param string $json
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function resourceDeletedResponse($json)
+    protected function resourceDeletedResponse($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\ResourceDeletedResponse($json)));
+            ->createResponse($this->addHeaders(new ResourceDeleted($json)));
     }
 
     /**
      * @param string $json
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function resourceNotFoundResponse($json)
+    protected function resourceNotFoundResponse($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\ResourceNotFoundResponse($json)));
+            ->createResponse($this->addHeaders(new ResourceNotFound($json)));
     }
 
     /**
      * @param string $json
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function resourcePatchErrorResponse($json)
+    protected function resourcePatchErrorResponse($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\ResourcePatchErrorResponse($json)));
+            ->createResponse($this->addHeaders(new UnprocessableEntity($json)));
     }
 
     /**
      * @param string $json
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function resourcePostErrorResponse($json)
+    protected function resourcePostErrorResponse($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\ResourcePostErrorResponse($json)));
+            ->createResponse($this->addHeaders(new UnprocessableEntity($json)));
     }
 
     /**
      * @param string $json
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function resourceProcessingResponse($json)
+    protected function resourceProcessingResponse($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\ResourceProcessingResponse($json)));
+            ->createResponse($this->addHeaders(new ResourceProcessing($json)));
     }
 
     /**
      * @param string $json
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function resourceUpdatedResponse($json)
+    protected function resourceUpdatedResponse($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\ResourceUpdatedResponse($json)));
+            ->createResponse($this->addHeaders(new ResourceUpdated($json)));
     }
 
     /**
      * @param string $json
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function response($json)
+    protected function response($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\Response($json)));
+            ->createResponse($this->addHeaders(new Response($json)));
     }
 
     /**
      * @param string $json
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function unsupportedActionResponse($json)
+    protected function unsupportedActionResponse($json)
     {
         return (new HttpFoundationFactory())
-            ->createResponse($this->addHeaders(new \NilPortugues\Api\JsonApi\Http\Message\UnsupportedActionResponse($json)));
+            ->createResponse($this->addHeaders(new UnsupportedAction($json)));
     }
 }