CodeClimate based cleanup

brokencube · Sep 8, 2017 · 452ebf6 · 452ebf6
1 parent 934297f
commit 452ebf6
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 10 deletions.
diff --git a/src/Exception/BadRequest.php b/src/Exception/BadRequest.php
@@ -8,4 +8,4 @@ public function __construct($message, $context = null, \Throwable $previous = nu
     {
         parent::__construct($message, $context, $previous, 400);
     }
-}
+}
diff --git a/src/Exception/Exception.php b/src/Exception/Exception.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Circuit\Exception;
+
 use Circuit\Interfaces\ExceptionContextInterface;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpFoundation\Response;
@@ -37,4 +38,4 @@ public function setHeaders($header, $value)
     {
         $this->headers[$header] = $value;
     }    
-}
+}
diff --git a/src/Exception/Forbidden.php b/src/Exception/Forbidden.php
@@ -8,4 +8,4 @@ public function __construct($message, $context = null, \Throwable $previous = nu
     {
         parent::__construct($message, $context, $previous, 403);
     }
-}
+}
diff --git a/src/Exception/Gone.php b/src/Exception/Gone.php
@@ -8,4 +8,4 @@ public function __construct($message, $context = null, \Throwable $previous = nu
     {
         parent::__construct($message, $context, $previous, 410);
     }
-}
+}
diff --git a/src/Exception/MethodNotAllowed.php b/src/Exception/MethodNotAllowed.php
@@ -9,4 +9,4 @@ public function __construct(array $allowed, $message, $context = null, \Throwabl
         parent::__construct($message, $context, $previous, 405);
         $this->setHeaders('Allow', strtoupper(implode(', ', $allowed)));
     }
-}
+}
diff --git a/src/Exception/NotFound.php b/src/Exception/NotFound.php
@@ -8,4 +8,4 @@ public function __construct($message, $context = null, \Throwable $previous = nu
     {
         parent::__construct($message, $context, $previous, 404);
     }
-}
+}
diff --git a/src/Exception/UncaughtException.php b/src/Exception/UncaughtException.php
@@ -8,4 +8,4 @@ public function __construct(\Throwable $previous)
     {
         parent::__construct('Uncaught Exception', null, $previous, 500);
     }
-}
+}
diff --git a/src/ExceptionHandler/DefaultHandler.php b/src/ExceptionHandler/DefaultHandler.php
@@ -9,8 +9,14 @@
 
 class DefaultHandler implements ExceptionHandler
 {
-    public function handle(Exception $e, Request $request, $context) : Response
+    public function handle(Exception $e, Request $request) : Response
     {
+        if (in_array('application/json', $request->getAcceptableContentTypes())) {
+            return new JsonResponse(
+                ['error' => $e->getStatusCode() . ' ' . Response::$statusTexts[$e->getStatusCode()] ],
+                $e->getStatusCode()
+            );
+        }
         return new Response(
             $e->getStatusCode() . ' ' . Response::$statusTexts[$e->getStatusCode()],
             $e->getStatusCode(),

diff --git a/src/Router.php b/src/Router.php
@@ -206,12 +206,19 @@ public function process(Request $request) : Response
 
                     case Dispatcher::METHOD_NOT_ALLOWED:
                         $this->log("Router: Method not Allowed");
-                        throw new Exception\MethodNotAllowed($dispatch[1], 'Router: Method not Allowed: ' . $request->getMethod());
+                        throw new Exception\MethodNotAllowed(
+                            $dispatch[1],
+                            'Router: Method not Allowed: ' . $request->getMethod()
+                        );
 
                     case Dispatcher::FOUND:
                         try {
                             $dispatcher = unserialize($dispatch[1]);
-                            $this->log("Router: Route matched: %s@%s", $dispatcher->controllerClass, $dispatcher->controllerMethod);
+                            $this->log(
+                                "Router: Route matched: %s@%s",
+                                $dispatcher->controllerClass,
+                                $dispatcher->controllerMethod
+                            );
                             return $dispatcher->startProcessing($this, $request, $dispatch[2]);
                         } catch (\Throwable $e) {
                             return $this->handleException($e, $request);