Fix for scrutinizer report

mcustiel · Jun 21, 2017 · 5fadf95 · 5fadf95
1 parent 7d03cf4
commit 5fadf95
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/src/Server/Actions/Base/AbstractRequestAction.php b/src/Server/Actions/Base/AbstractRequestAction.php
@@ -56,30 +56,34 @@ protected function constructErrorResponse(array $listOfErrors, ResponseInterface
             );
     }
 
-    protected function processAndGetResponse(
-        TransactionData $transactionData,
-        callable $process
-    ) {
+    protected function processAndGetResponse(TransactionData $transactionData, callable $process)
+    {
         try {
-            /**
-             * @var \Mcustiel\Phiremock\Domain\Expectation
-             */
-            $expectation = $this->requestBuilder->parseRequest(
-                $this->parseJsonBody($transactionData->getRequest()),
-                Expectation::class,
-                RequestBuilder::RETURN_ALL_ERRORS_IN_EXCEPTION
-            );
-            $this->logger->debug('Parsed expectation: ' . var_export($expectation, true));
-
-            return $process($transactionData, $expectation);
+            return $this->createExpectationFromRequestAndProcess($transactionData, $process);
         } catch (InvalidRequestException $e) {
             $this->logger->warning('Invalid request received');
-
             return $this->constructErrorResponse($e->getErrors(), $transactionData->getResponse());
         } catch (\Exception $e) {
             $this->logger->warning('An unexpected exception occurred: ' . $e->getMessage());
-
             return $this->constructErrorResponse([$e->getMessage()], $transactionData->getResponse());
         }
     }
+
+    private function createExpectationFromRequestAndProcess(
+        TransactionData $transactionData,
+        callable $process
+    ) {
+        /**
+         * @var \Mcustiel\Phiremock\Domain\Expectation
+         */
+        $expectation = $this->requestBuilder->parseRequest(
+            $this->parseJsonBody($transactionData->getRequest()),
+            Expectation::class,
+            RequestBuilder::RETURN_ALL_ERRORS_IN_EXCEPTION
+        );
+        $this->logger->debug('Parsed expectation: ' . var_export($expectation, true));
+
+        return $process($transactionData, $expectation);
+    }
+
 }