Merge pull request laravel-admin-extensions#1 from laravel-admin-extensions/analysis-q1nJ23

Apply fixes from StyleCI

Author: z-song

src/ApiLogger.php

@@ -5,8 +5,7 @@
 use Illuminate\Support\Facades\File;
 
 /**
- * Class ApiLogger
- * @package Encore\Admin\ApiTester
+ * Class ApiLogger.
  *
  * @deprecated
  */
@@ -33,7 +32,7 @@ public static function load()
 
         $data = File::get($logPath);
 
-        $json = '['.trim($data, ','). ']';
+        $json = '['.trim($data, ',').']';
 
         $history = array_reverse(json_decode($json, true));
 
@@ -54,11 +53,11 @@ public static function formatParameters($parameters = [])
 
         foreach ($parameters as $name => $value) {
             $retval[] = [
-                'name' => $name,
+                'name'         => $name,
                 'defaultValue' => $value,
             ];
         }
 
         return json_encode($retval);
     }
-}
+}

src/ApiTester.php

@@ -36,6 +36,7 @@ class ApiTester extends Extension
 
     /**
      * ApiTester constructor.
+     *
      * @param \Illuminate\Foundation\Application|null $app
      */
     public function __construct(\Illuminate\Foundation\Application $app = null)
@@ -48,6 +49,7 @@ public function __construct(\Illuminate\Foundation\Application $app = null)
      * @param string $uri
      * @param array  $parameters
      * @param string $userId
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function call($method, $uri, $parameters = [], $user = null)
@@ -109,6 +111,7 @@ protected function loginUsing($userId)
 
     /**
      * @param Response $response
+     *
      * @return array
      */
     public function parseResponse(Response $response)
@@ -142,6 +145,7 @@ public function parseResponse(Response $response)
 
     /**
      * @param Response $response
+     *
      * @return string
      */
     protected function getStatusText(Response $response)
@@ -156,7 +160,8 @@ protected function getStatusText(Response $response)
     /**
      * Filter the given array of files, removing any empty values.
      *
-     * @param  array  $files
+     * @param array $files
+     *
      * @return mixed
      */
     protected function filterFiles($files)
@@ -167,7 +172,7 @@ protected function filterFiles($files)
             }
 
             if (is_array($file)) {
-                if (! isset($file['name'])) {
+                if (!isset($file['name'])) {
                     $files[$key] = $this->filterFiles($files[$key]);
                 } elseif (isset($files[$key]['error']) && $files[$key]['error'] !== 0) {
                     unset($files[$key]);
@@ -185,7 +190,8 @@ protected function filterFiles($files)
     /**
      * Turn the given URI into a fully qualified URL.
      *
-     * @param  string  $uri
+     * @param string $uri
+     *
      * @return string
      */
     protected function prepareUrlForRequest($uri)
@@ -194,7 +200,7 @@ protected function prepareUrlForRequest($uri)
             $uri = substr($uri, 1);
         }
 
-        if (! Str::startsWith($uri, 'http')) {
+        if (!Str::startsWith($uri, 'http')) {
             $uri = config('app.url').'/'.$uri;
         }
 
@@ -213,9 +219,7 @@ public function getRoutes()
         $prefix = static::config('prefix');
 
         $routes = collect($routes)->filter(function ($route) use ($prefix) {
-
             return Str::startsWith($route->uri, static::config('prefix'));
-
         })->map(function ($route) {
             return $this->getRouteInformation($route);
         })->all();
@@ -239,6 +243,7 @@ public function getRoutes()
      * Get parameters info of route.
      *
      * @param $action
+     *
      * @return array
      */
     protected function getRouteParameters($action)
@@ -247,12 +252,12 @@ protected function getRouteParameters($action)
             return [];
         }
 
-        if (is_string($action) && ! Str::contains($action, '@')) {
+        if (is_string($action) && !Str::contains($action, '@')) {
             list($class, $method) = static::makeInvokable($action);
         } else {
             list($class, $method) = explode('@', $action);
         }
-        
+
         $classReflector = new \ReflectionClass($class);
 
         $comment = $classReflector->getMethod($method)->getDocComment();
@@ -263,7 +268,6 @@ protected function getRouteParameters($action)
             foreach (array_get($matches, 1, []) as $item) {
                 preg_match_all('/(\w+)=[\'"]?([^\r\n"]+)[\'"]?,?\n/s', $item, $match);
                 if (count($match) == 3) {
-
                     $match[2] = array_map(function ($val) {
                         return trim($val, ',');
                     }, $match[2]);
@@ -280,11 +284,12 @@ protected function getRouteParameters($action)
 
     /**
      * @param $action
+     *
      * @return array
      */
     protected static function makeInvokable($action)
     {
-        if (! method_exists($action, '__invoke')) {
+        if (!method_exists($action, '__invoke')) {
             throw new \UnexpectedValueException("Invalid route action: [{$action}].");
         }
 
@@ -294,7 +299,8 @@ protected static function makeInvokable($action)
     /**
      * Get the route information for a given route.
      *
-     * @param  \Illuminate\Routing\Route  $route
+     * @param \Illuminate\Routing\Route $route
+     *
      * @return array
      */
     protected function getRouteInformation(Route $route)
@@ -312,8 +318,9 @@ protected function getRouteInformation(Route $route)
     /**
      * Sort the routes by a given element.
      *
-     * @param  string  $sort
-     * @param  array  $routes
+     * @param string $sort
+     * @param array  $routes
+     *
      * @return array
      */
     protected function sortRoutes($sort, $routes)
@@ -326,7 +333,8 @@ protected function sortRoutes($sort, $routes)
     /**
      * Get before filters.
      *
-     * @param  \Illuminate\Routing\Route  $route
+     * @param \Illuminate\Routing\Route $route
+     *
      * @return string
      */
     protected function getRouteMiddleware($route)
@@ -335,4 +343,4 @@ protected function getRouteMiddleware($route)
             return $middleware instanceof \Closure ? 'Closure' : $middleware;
         });
     }
-}
+}

src/ApiTesterController.php

@@ -12,12 +12,11 @@ class ApiTesterController extends Controller
     public function index()
     {
         return Admin::content(function (Content $content) {
-
             $content->header('Api tester');
 
             $tester = new ApiTester();
 
-            $content->body(view('api-tester::index',  [
+            $content->body(view('api-tester::index', [
                 'routes' => $tester->getRoutes(),
 //                'logs'   => ApiLogger::load(),
             ]));
@@ -27,14 +26,15 @@ public function index()
     public function handle(Request $request)
     {
         $method = $request->get('method');
-        $uri    = $request->get('uri');
-        $user   = $request->get('user');
+        $uri = $request->get('uri');
+        $user = $request->get('user');
         $all = $request->all();
 
-        $keys   = array_get($all, 'key', []);
-        $vals   = array_get($all, 'val', []);
+        $keys = array_get($all, 'key', []);
+        $vals = array_get($all, 'val', []);
 
-        ksort($keys);ksort($vals);
+        ksort($keys);
+        ksort($vals);
 
         $parameters = [];
 
@@ -53,7 +53,7 @@ public function handle(Request $request)
         return [
             'status'    => true,
             'message'   => 'success',
-            'data'      => $tester->parseResponse($response)
+            'data'      => $tester->parseResponse($response),
         ];
     }
-}
+}

src/ApiTesterServiceProvider.php

@@ -19,4 +19,4 @@ public function boot()
 
         ApiTester::boot();
     }
-}
+}

src/BootExtension.php

@@ -50,4 +50,4 @@ public static function importAssets()
         Admin::js('/vendor/api-tester/prism.js');
         Admin::css('/vendor/api-tester/prism.css');
     }
-}
+}