Merge pull request dingo#557 from GrahamForks/cs

CS Fixes

Author: jasonlewis

.styleci.yml

@@ -1,4 +1,12 @@
-preset: psr2
+preset: recommended
+
+linting: true
 
 enabled:
-  - short_array_syntax
+  - logical_not_operators_with_successor_space
+
+disabled:
+  - align_double_arrow
+  - new_with_braces
+  - ordered_use
+  - psr0

config/api.php

@@ -123,7 +123,7 @@
         'errors' => ':errors',
         'code' => ':code',
         'status_code' => ':status_code',
-        'debug' => ':debug'
+        'debug' => ':debug',
     ],
 
     /*
@@ -188,6 +188,6 @@
 
         'json' => 'Dingo\Api\Http\Response\Format\Json',
 
-    ]
+    ],
 
 ];

src/Auth/Provider/OAuth2.php

@@ -58,7 +58,7 @@ public function __construct(ResourceServer $resource, $httpHeadersOnly = false)
     /**
      * Authenticate request with the OAuth 2.0 resource server.
      *
-     * @param \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
      * @param \Dingo\Api\Routing\Route $route
      *
      * @throws \Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException

src/Console/Command/Cache.php

@@ -5,7 +5,6 @@
 use Dingo\Api\Routing\Router;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
-use Symfony\Component\Console\Input\InputOption;
 
 class Cache extends Command
 {

src/Console/Command/Docs.php

@@ -15,7 +15,6 @@ class Docs extends Command
      *
      * @var \Dingo\Api\Routing\Router
      */
-
     protected $router;
 
     /**
@@ -150,7 +149,7 @@ protected function getControllers()
         foreach ($this->router->getRoutes() as $collections) {
             foreach ($collections as $route) {
                 if ($controller = $route->getController()) {
-                    if (!$controllers->contains($controller)) {
+                    if (! $controllers->contains($controller)) {
                         $controllers->push($controller);
                     }
                 }

src/Console/Command/Routes.php

@@ -40,7 +40,7 @@ class Routes extends RouteListCommand
     /**
      * Create a new routes command instance.
      *
-     * @param \Dingo\Api\Routing\Router  $router
+     * @param \Dingo\Api\Routing\Router $router
      *
      * @return void
      */
@@ -71,7 +71,7 @@ protected function getRoutes()
                     'action'    => $route->getActionName(),
                     'protected' => $this->routeHasAuthMiddleware($route) ? 'Yes' : 'No',
                     'versions'  => implode(', ', $route->versions()),
-                    'scopes'    => implode(', ', $route->scopes())
+                    'scopes'    => implode(', ', $route->scopes()),
                 ]);
             }
         }
@@ -143,7 +143,7 @@ protected function getOptions()
                 ['versions', null, InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'Filter the routes by version'],
                 ['scopes', 'S', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'Filter the routes by scopes'],
                 ['protected', null, InputOption::VALUE_NONE, 'Filter the protected routes'],
-                ['unprotected', null, InputOption::VALUE_NONE, 'Filter the unprotected routes']
+                ['unprotected', null, InputOption::VALUE_NONE, 'Filter the unprotected routes'],
             ]
         );
     }

src/Dispatcher.php

@@ -2,15 +2,12 @@
 
 namespace Dingo\Api;
 
-use RuntimeException;
 use Dingo\Api\Auth\Auth;
 use Illuminate\Http\Request;
 use Dingo\Api\Routing\Router;
 use Illuminate\Container\Container;
 use Dingo\Api\Http\InternalRequest;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Auth\GenericUser;
-use Illuminate\Database\Eloquent\Model;
 use Symfony\Component\HttpFoundation\Cookie;
 use Dingo\Api\Exception\InternalHttpException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;

src/Exception/Handler.php

@@ -214,7 +214,7 @@ protected function prepareReplacements(Exception $exception)
 
         $replacements = [
             ':message' => $message,
-            ':status_code' => $statusCode
+            ':status_code' => $statusCode,
         ];
 
         if ($exception instanceof ResourceException && $exception->hasErrors()) {
@@ -230,7 +230,7 @@ protected function prepareReplacements(Exception $exception)
                 'line' => $exception->getLine(),
                 'file' => $exception->getFile(),
                 'class' => get_class($exception),
-                'trace' => explode("\n", $exception->getTraceAsString())
+                'trace' => explode("\n", $exception->getTraceAsString()),
             ];
         }
 

src/Http/Middleware/Auth.php

@@ -26,7 +26,7 @@ class Auth
      * Create a new auth middleware instance.
      *
      * @param \Dingo\Api\Routing\Router $router
-     * @param \Dingo\Api\Auth\Auth $auth
+     * @param \Dingo\Api\Auth\Auth      $auth
      */
     public function __construct(Router $router, Authentication $auth)
     {
@@ -38,7 +38,7 @@ public function __construct(Router $router, Authentication $auth)
      * Perform authentication before a request is executed.
      *
      * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @param \Closure                 $next
      *
      * @return mixed
      */

src/Http/Middleware/RateLimit.php

@@ -97,7 +97,7 @@ protected function getHeaders()
         return [
             'X-RateLimit-Limit' => $this->handler->getThrottleLimit(),
             'X-RateLimit-Remaining' => $this->handler->getRemainingLimit(),
-            'X-RateLimit-Reset' => $this->handler->getRateLimitReset()
+            'X-RateLimit-Reset' => $this->handler->getRateLimitReset(),
         ];
     }
 }