Merge pull request #24 from Napp/analysis-x0BjDa

Mads Møller · web-flow · commit d6de26357798 · 2020-03-06T16:03:49.000+01:00
Apply fixes from StyleCI
diff --git a/src/Auth/ApiGuard.php b/src/Auth/ApiGuard.php
@@ -2,9 +2,9 @@
 
 namespace Napp\Core\Api\Auth;
 
-use Illuminate\Http\Request;
 use Illuminate\Auth\TokenGuard;
 use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Http\Request;
 
 /**
  * Class ApiGuard.
diff --git a/src/Auth/AuthServiceProvider.php b/src/Auth/AuthServiceProvider.php
@@ -30,7 +30,7 @@ public function boot()
     }
 
     /**
-     * Get the config path
+     * Get the config path.
      *
      * @return string
      */
diff --git a/src/Controllers/ApiController.php b/src/Controllers/ApiController.php
@@ -2,8 +2,8 @@
 
 namespace Napp\Core\Api\Controllers;
 
-use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Response;
 
 /**
diff --git a/src/Controllers/ApiInternalController.php b/src/Controllers/ApiInternalController.php
@@ -2,12 +2,12 @@
 
 namespace Napp\Core\Api\Controllers;
 
-use Illuminate\Http\Response;
 use Illuminate\Auth\AuthManager;
-use Napp\Core\Api\Router\Router;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
 use Napp\Core\Api\Auth\NappHttpHeaders;
 use Napp\Core\Api\Exceptions\Exceptions\ApiInternalCallException;
+use Napp\Core\Api\Router\Router;
 
 /**
  * Class ApiInternalController.
diff --git a/src/Controllers/ApiProxyController.php b/src/Controllers/ApiProxyController.php
@@ -2,8 +2,8 @@
 
 namespace Napp\Core\Api\Controllers;
 
-use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 /**
  * Class ApiProxyController.
diff --git a/src/Controllers/BaseController.php b/src/Controllers/BaseController.php
@@ -2,10 +2,10 @@
 
 namespace Napp\Core\Api\Controllers;
 
-use Illuminate\Routing\Controller;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller;
 
 /**
  * Class BaseController.
diff --git a/src/Exceptions/NappApiHandler.php b/src/Exceptions/NappApiHandler.php
@@ -3,10 +3,10 @@
 namespace Napp\Core\Api\Exceptions;
 
 use Illuminate\Http\JsonResponse;
-use Napp\Core\Api\Exceptions\Renderer\Renderer;
+use Napp\Core\Api\Exceptions\Exceptions\Exception as NappException;
 use Napp\Core\Api\Exceptions\Renderer\DebugRenderer;
+use Napp\Core\Api\Exceptions\Renderer\Renderer;
 use Napp\Core\Api\Exceptions\Renderer\RendererInterface;
-use Napp\Core\Api\Exceptions\Exceptions\Exception as NappException;
 
 /**
  * Class NappApiHandler.
diff --git a/src/Exceptions/Renderer/DebugRenderer.php b/src/Exceptions/Renderer/DebugRenderer.php
@@ -50,14 +50,14 @@ public function render(): JsonResponse
 
         return response()->json(
             [
-            'error' => [
-                'code'    => $this->statusCode,
-                'message' => $this->statusMessage,
-                'type'    => \get_class($this->exception),
-                'file'    => $this->exception->getFile(),
-                'line'    => $this->exception->getLine(),
-                'trace'   => $this->formatTrace($this->exception->getTrace()),
-            ], ],
+                'error' => [
+                    'code'    => $this->statusCode,
+                    'message' => $this->statusMessage,
+                    'type'    => \get_class($this->exception),
+                    'file'    => $this->exception->getFile(),
+                    'line'    => $this->exception->getLine(),
+                    'trace'   => $this->formatTrace($this->exception->getTrace()),
+                ], ],
             $this->responseCode
         );
     }
diff --git a/src/Exceptions/Renderer/Renderer.php b/src/Exceptions/Renderer/Renderer.php
@@ -42,10 +42,10 @@ public function render(): JsonResponse
 
             return response()->json(
                 [
-                'error' => [
-                    'code'    => $this->statusCode,
-                    'message' => $this->statusMessage,
-                ], ],
+                    'error' => [
+                        'code'    => $this->statusCode,
+                        'message' => $this->statusMessage,
+                    ], ],
                 $this->responseCode
             );
         }
@@ -54,10 +54,10 @@ public function render(): JsonResponse
             case 400:
                 return response()->json(
                     [
-                    'error' => [
-                        'code'    => $this->statusCode,
-                        'message' => 'Unprocessable Entity',
-                    ], ],
+                        'error' => [
+                            'code'    => $this->statusCode,
+                            'message' => 'Unprocessable Entity',
+                        ], ],
                     $this->responseCode
                 );
             case 401:
@@ -81,28 +81,28 @@ public function render(): JsonResponse
             case 404:
                 return response()->json(
                     [
-                    'error' => [
-                        'code'    => $this->statusCode,
-                        'message' => 'Not Found',
-                    ], ],
+                        'error' => [
+                            'code'    => $this->statusCode,
+                            'message' => 'Not Found',
+                        ], ],
                     $this->responseCode
                 );
             case 405:
                 return response()->json(
                     [
-                    'error' => [
-                        'code'    => $this->statusCode,
-                        'message' => 'Method Not Allowed',
-                    ], ],
+                        'error' => [
+                            'code'    => $this->statusCode,
+                            'message' => 'Method Not Allowed',
+                        ], ],
                     $this->responseCode
                 );
             default:
                 return response()->json(
                     [
-                    'error' => [
-                        'code'    => $this->statusCode,
-                        'message' => 'Internal Server Error',
-                    ], ],
+                        'error' => [
+                            'code'    => $this->statusCode,
+                            'message' => 'Internal Server Error',
+                        ], ],
                     500
                 );
         }
diff --git a/src/Requests/ApiRequest.php b/src/Requests/ApiRequest.php
@@ -58,7 +58,7 @@ protected function validateInputFields(): void
         $rules = $this->rules();
         if (false === empty(array_diff_key($input, $rules))) {
             $exception = new InvalidFieldException();
-            $exception->statusMessage = $exception->statusMessage.': '.implode(',', array_keys(array_diff_key($input, $rules)));
+            $exception->statusMessage = $exception->statusMessage . ': ' . implode(',', array_keys(array_diff_key($input, $rules)));
 
             throw $exception;
         }
@@ -114,7 +114,7 @@ protected function handleApiCallFailedValidation(Validator $validator)
     {
         $message = $validator->messages()->first();
         $exception = new ValidationException();
-        $exception->statusMessage = $exception->statusMessage.': '.$message;
+        $exception->statusMessage = $exception->statusMessage . ': ' . $message;
         $exception->validation = $this->transformValidationOutput($validator);
 
         throw $exception;
diff --git a/src/Router/Router.php b/src/Router/Router.php
@@ -2,8 +2,8 @@
 
 namespace Napp\Core\Api\Router;
 
-use Illuminate\Http\Request;
 use Illuminate\Foundation\Application;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Router as LaravelRouter;
 
 /**
diff --git a/src/Transformers/ApiTransformer.php b/src/Transformers/ApiTransformer.php
@@ -111,7 +111,7 @@ public function transformOutputKeys(array $data): array
     protected function transformAttributes(array $output, array $data): array
     {
         foreach ($data as $key => $value) {
-            if (true === $this->strict && !$this->isMapped($key)) {
+            if (true === $this->strict && ! $this->isMapped($key)) {
                 continue;
             }
 
@@ -132,7 +132,7 @@ protected function transformRelationships(array $output, Model $data): array
         /** @var Model $data */
         $relationships = $data->getRelations();
         foreach ($relationships as $relationshipName => $relationship) {
-            if (true === $this->strict && !$this->isMapped($relationshipName)) {
+            if (true === $this->strict && ! $this->isMapped($relationshipName)) {
                 continue;
             }
 
@@ -250,7 +250,7 @@ protected function convertValueType(string $key, $value)
             ? $this->apiMapping[$key]['dataType']
             : 'unknown';
 
-        foreach (static::normalizeType($type) as list($method, $parameters)) {
+        foreach (static::normalizeType($type) as [$method, $parameters]) {
             if (true === empty($method)) {
                 return $value;
             }
@@ -286,7 +286,7 @@ protected static function parseStringDataType($type): array
         // easy {data-type}:{parameters} formatting convention. For instance the
         // data-type "float:3" states that the value will be converted to a float with 3 decimals.
         if (mb_strpos($type, ':') !== false) {
-            list($dataType, $parameter) = explode(':', $type, 2);
+            [$dataType, $parameter] = explode(':', $type, 2);
 
             $parameters = static::parseParameters($parameter);
         }
diff --git a/src/Transformers/NoneTransformer.php b/src/Transformers/NoneTransformer.php
@@ -2,8 +2,8 @@
 
 namespace Napp\Core\Api\Transformers;
 
-use Illuminate\Support\Arr;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 /**
  * Class NoneTransformer.
diff --git a/src/Validation/ValidateTrait.php b/src/Validation/ValidateTrait.php
@@ -2,9 +2,9 @@
 
 namespace Napp\Core\Api\Validation;
 
+use Illuminate\Contracts\Validation\Factory as ValidatorFactory;
 use Illuminate\Contracts\Validation\Validator;
 use Napp\Core\Api\Exceptions\Exceptions\ValidationException;
-use Illuminate\Contracts\Validation\Factory as ValidatorFactory;
 
 /**
  * Trait ValidateTrait.

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function boot()`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`
`33`		`- * Get the config path`
	`33`	`+ * Get the config path.`
`34`	`34`	`*`
`35`	`35`	`* @return string`
`36`	`36`	`*/`