Add return and scalar argument types

cundd · Mar 12, 2019 · e16bbba · e16bbba
1 parent 37b83f1
commit e16bbba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/Classes/ResponseFactory.php b/Classes/ResponseFactory.php
@@ -14,7 +14,7 @@
  */
 class ResponseFactory implements SingletonInterface, ResponseFactoryInterface
 {
-    public function createResponse($data, $status)
+    public function createResponse($data, int $status): ResponseInterface
     {
         $responseClass = $this->getResponseImplementationClass();
         /** @var ResponseInterface $response */
@@ -25,12 +25,12 @@ public function createResponse($data, $status)
         return $response;
     }
 
-    public function createErrorResponse($data, $status, RestRequestInterface $request)
+    public function createErrorResponse($data, int $status, RestRequestInterface $request): ResponseInterface
     {
         return $this->createFormattedResponse($data, $status, true, $request);
     }
 
-    public function createSuccessResponse($data, $status, RestRequestInterface $request)
+    public function createSuccessResponse($data, int $status, RestRequestInterface $request): ResponseInterface
     {
         return $this->createFormattedResponse($data, $status, false, $request);
     }
@@ -44,8 +44,12 @@ public function createSuccessResponse($data, $status, RestRequestInterface $requ
      * @param RestRequestInterface $request
      * @return ResponseInterface
      */
-    private function createFormattedResponse($data, $status, $forceError, RestRequestInterface $request)
-    {
+    private function createFormattedResponse(
+        $data,
+        int $status,
+        bool $forceError,
+        RestRequestInterface $request
+    ): ResponseInterface {
         $responseClass = $this->getResponseImplementationClass();
         /** @var ResponseInterface $response */
         $response = new $responseClass();

diff --git a/Classes/ResponseFactoryInterface.php b/Classes/ResponseFactoryInterface.php
@@ -18,7 +18,7 @@ interface ResponseFactoryInterface
      * @param int          $status Status code of the response
      * @return ResponseInterface
      */
-    public function createResponse($data, $status);
+    public function createResponse($data, int $status): ResponseInterface;
 
     /**
      * Returns a response with the given message and status code
@@ -31,7 +31,7 @@ public function createResponse($data, $status);
      * @param RestRequestInterface $request
      * @return ResponseInterface
      */
-    public function createErrorResponse($data, $status, RestRequestInterface $request);
+    public function createErrorResponse($data, int $status, RestRequestInterface $request): ResponseInterface;
 
     /**
      * Returns a response with the given message and status code
@@ -44,5 +44,5 @@ public function createErrorResponse($data, $status, RestRequestInterface $reques
      * @param RestRequestInterface $request
      * @return ResponseInterface
      */
-    public function createSuccessResponse($data, $status, RestRequestInterface $request);
+    public function createSuccessResponse($data, int $status, RestRequestInterface $request): ResponseInterface;
 }