Breaking change: Remove prepared Response argument and add return type (

Fix #58)
cundd · Apr 23, 2019 · 064a641 · 064a641
1 parent 23595da
commit 064a641
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/Classes/BootstrapDispatcher.php b/Classes/BootstrapDispatcher.php
@@ -115,11 +115,10 @@ private function configureDispatcher(ObjectManagerInterface $objectManager)
      * Entry point for the PSR 7 middleware
      *
      * @param ServerRequestInterface $request
-     * @param ResponseInterface      $response
      * @return ResponseInterface
      */
-    public function processRequest(ServerRequestInterface $request, ResponseInterface $response)
+    public function processRequest(ServerRequestInterface $request)
     {
-        return $this->dispatcher->processRequest($request, $response);
+        return $this->dispatcher->processRequest($request);
     }
 }
diff --git a/Classes/Dispatcher.php b/Classes/Dispatcher.php
@@ -44,7 +44,7 @@ class Dispatcher implements SingletonInterface, DispatcherInterface
     /**
      * The shared instance
      *
-     * @var \Cundd\Rest\Dispatcher
+     * @var Dispatcher
      */
     protected static $sharedDispatcher;
 
@@ -76,47 +76,41 @@ public function __construct(
      * Entry point for the PSR 7 middleware
      *
      * @param ServerRequestInterface $request
-     * @param ResponseInterface      $response
      * @return ResponseInterface
      * @throws \Exception
      */
-    public function processRequest(ServerRequestInterface $request, ResponseInterface $response)
+    public function processRequest(ServerRequestInterface $request): ResponseInterface
     {
         $this->requestFactory->registerCurrentRequest($request);
         if (method_exists($this->objectManager, 'reassignRequest')) {
             $this->objectManager->reassignRequest();
         }
 
-        return $this->dispatch($this->requestFactory->getRequest(), $response);
+        return $this->dispatch($this->requestFactory->getRequest());
     }
 
     /**
      * Dispatch the REST request
      *
      * @param RestRequestInterface $request
-     * @param ResponseInterface    $response
      * @return ResponseInterface
      */
-    public function dispatch(RestRequestInterface $request, ResponseInterface $response)
+    public function dispatch(RestRequestInterface $request): ResponseInterface
     {
         return $this->addCorsHeaders(
             $request,
-            $this->addAdditionalHeaders($this->dispatchInternal($request, $response))
+            $this->addAdditionalHeaders($this->dispatchInternal($request))
         );
     }
 
     /**
      * Checks the cache for an entry for the current request and returns it, or calls the handler if nothing is found
      *
      * @param RestRequestInterface $request
-     * @param ResponseInterface    $response
      * @return ResponseInterface
      */
-    private function getCachedResponseOrCallHandler(
-        RestRequestInterface $request,
-        /** @noinspection PhpUnusedParameterInspection */
-        ResponseInterface $response
-    ) {
+    private function getCachedResponseOrCallHandler(RestRequestInterface $request)
+    {
         $cache = $this->objectManager->getCache($request->getResourceType());
         $cachedResponse = $cache->getCachedValueForRequest($request);
 
@@ -197,7 +191,7 @@ public function greet(RestRequestInterface $request)
     /**
      * Returns the shared dispatcher instance
      *
-     * @return \Cundd\Rest\Dispatcher
+     * @return Dispatcher
      */
     public static function getSharedDispatcher()
     {
@@ -252,10 +246,9 @@ private function addCorsHeaders(RestRequestInterface $request, ResponseInterface
 
     /**
      * @param RestRequestInterface $request
-     * @param ResponseInterface    $response
      * @return ResponseInterface
      */
-    private function dispatchInternal(RestRequestInterface $request, ResponseInterface $response): ResponseInterface
+    private function dispatchInternal(RestRequestInterface $request): ResponseInterface
     {
         $requestPath = $request->getPath();
         if (!$requestPath || $requestPath === '/') {
@@ -277,7 +270,7 @@ private function dispatchInternal(RestRequestInterface $request, ResponseInterfa
                 return $this->responseFactory->createErrorResponse('Forbidden', 403, $request);
         }
 
-        $newResponse = $this->getCachedResponseOrCallHandler($request, $response);
+        $newResponse = $this->getCachedResponseOrCallHandler($request);
 
         $this->logger->logResponse(
             'response: ' . $newResponse->getStatusCode(),

diff --git a/Classes/Dispatcher/DispatcherInterface.php b/Classes/Dispatcher/DispatcherInterface.php
@@ -18,17 +18,15 @@ interface DispatcherInterface
      * Entry point for the PSR 7 middleware
      *
      * @param ServerRequestInterface $request
-     * @param ResponseInterface      $response
      * @return ResponseInterface
      */
-    public function processRequest(ServerRequestInterface $request, ResponseInterface $response);
+    public function processRequest(ServerRequestInterface $request): ResponseInterface;
 
     /**
      * Dispatch the request
      *
      * @param RestRequestInterface $request
-     * @param ResponseInterface    $response
      * @return ResponseInterface
      */
-    public function dispatch(RestRequestInterface $request, ResponseInterface $response);
+    public function dispatch(RestRequestInterface $request): ResponseInterface;
 }