SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Console/Commands/GenerateDoc.php

Doc Comments +2 added lines, -1 removed lines

@@ -207,7 +207,7 @@ 
     /**
      * Get the given method body code.
      *
-     * @param  object $reflectionMethod
+     * @param  \ReflectionMethod $reflectionMethod
      * @return string
      */
     protected function getMethodBody($reflectionMethod)
@@ -228,6 +228,7 @@ 
      *
      * @param  string $modelName
      * @param  array  $docData
+     * @param \ReflectionClass $reflectionClass
      * @return string
      */
     protected function getModels($modelName, &$docData, $reflectionClass)

Indentation +230 added lines, -230 removed lines

@@ -7,265 +7,265 @@
 
 class GenerateDoc extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'doc:generate';
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'doc:generate';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Generate api documentation';
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Generate api documentation';
 
-    /**
-     * Init new object.
-     *
-     * @return  void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @return  void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
 
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $docData           = [];
-        $docData['models'] = [];
-        $routes            = $this->getRoutes();
-        foreach ($routes as $route) {
-            if ($route) {
-                $actoinArray = explode('@', $route['action']);
-                if (Arr::get($actoinArray, 1, false)) {
-                    $controller       = $actoinArray[0];
-                    $method           = $actoinArray[1];
-                    $route['name']    = $method !== 'index' ? $method : 'list';
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$docData           = [];
+		$docData['models'] = [];
+		$routes            = $this->getRoutes();
+		foreach ($routes as $route) {
+			if ($route) {
+				$actoinArray = explode('@', $route['action']);
+				if (Arr::get($actoinArray, 1, false)) {
+					$controller       = $actoinArray[0];
+					$method           = $actoinArray[1];
+					$route['name']    = $method !== 'index' ? $method : 'list';
                     
-                    $reflectionClass  = new \ReflectionClass($controller);
-                    $reflectionMethod = $reflectionClass->getMethod($method);
-                    $classProperties  = $reflectionClass->getDefaultProperties();
-                    $skipLoginCheck   = Arr::get($classProperties, 'skipLoginCheck', false);
-                    $modelName        = explode('\\', $controller);
-                    $modelName        = lcfirst(str_replace('Controller', '', end($modelName)));
+					$reflectionClass  = new \ReflectionClass($controller);
+					$reflectionMethod = $reflectionClass->getMethod($method);
+					$classProperties  = $reflectionClass->getDefaultProperties();
+					$skipLoginCheck   = Arr::get($classProperties, 'skipLoginCheck', false);
+					$modelName        = explode('\\', $controller);
+					$modelName        = lcfirst(str_replace('Controller', '', end($modelName)));
 
-                    $this->processDocBlock($route, $reflectionMethod);
-                    $this->getHeaders($route, $method, $skipLoginCheck);
-                    $this->getPostData($route, $reflectionMethod);
+					$this->processDocBlock($route, $reflectionMethod);
+					$this->getHeaders($route, $method, $skipLoginCheck);
+					$this->getPostData($route, $reflectionMethod);
 
-                    $route['response'] = $this->getResponseObject($modelName, $route['name'], $route['returnDocBlock']);
+					$route['response'] = $this->getResponseObject($modelName, $route['name'], $route['returnDocBlock']);
 
-                    $module = $route['prefix'];
-                    $module = \Str::camel(str_replace('/', '_', str_replace('api', '', $module)));
-                    $docData['modules'][$module][] = $route;
+					$module = $route['prefix'];
+					$module = \Str::camel(str_replace('/', '_', str_replace('api', '', $module)));
+					$docData['modules'][$module][] = $route;
 
-                    $this->getModels($modelName, $docData, $reflectionClass);
-                }
-            }
-        }
+					$this->getModels($modelName, $docData, $reflectionClass);
+				}
+			}
+		}
         
-        $docData['errors']  = $this->getErrors();
-        $docData['reports'] = \Core::reports()->all();
-        \File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
-    }
+		$docData['errors']  = $this->getErrors();
+		$docData['reports'] = \Core::reports()->all();
+		\File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
+	}
 
-    /**
-     * Get list of all registered routes.
-     *
-     * @return collection
-     */
-    protected function getRoutes()
-    {
-        return collect(\Route::getRoutes())->map(function ($route) {
-            if (strpos($route->uri(), 'api/') !== false) {
-                return [
-                    'method' => $route->methods()[0],
-                    'uri'    => $route->uri(),
-                    'action' => $route->getActionName(),
-                    'prefix' => $route->getPrefix()
-                ];
-            }
-            return false;
-        })->all();
-    }
+	/**
+	 * Get list of all registered routes.
+	 *
+	 * @return collection
+	 */
+	protected function getRoutes()
+	{
+		return collect(\Route::getRoutes())->map(function ($route) {
+			if (strpos($route->uri(), 'api/') !== false) {
+				return [
+					'method' => $route->methods()[0],
+					'uri'    => $route->uri(),
+					'action' => $route->getActionName(),
+					'prefix' => $route->getPrefix()
+				];
+			}
+			return false;
+		})->all();
+	}
 
-    /**
-     * Generate headers for the given route.
-     *
-     * @param  array  &$route
-     * @param  string $method
-     * @param  array  $skipLoginCheck
-     * @return void
-     */
-    protected function getHeaders(&$route, $method, $skipLoginCheck)
-    {
-        $route['headers'] = [
-        'Accept'       => 'application/json',
-        'Content-Type' => 'application/json',
-        'locale'       => 'The language of the returned data: ar, en or all.',
-        'time-zone'    => 'Your locale time zone',
-        ];
+	/**
+	 * Generate headers for the given route.
+	 *
+	 * @param  array  &$route
+	 * @param  string $method
+	 * @param  array  $skipLoginCheck
+	 * @return void
+	 */
+	protected function getHeaders(&$route, $method, $skipLoginCheck)
+	{
+		$route['headers'] = [
+		'Accept'       => 'application/json',
+		'Content-Type' => 'application/json',
+		'locale'       => 'The language of the returned data: ar, en or all.',
+		'time-zone'    => 'Your locale time zone',
+		];
 
 
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
-            $route['headers']['Authorization'] = 'Bearer {token}';
-        }
-    }
+		if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
+			$route['headers']['Authorization'] = 'Bearer {token}';
+		}
+	}
 
-    /**
-     * Generate description and params for the given route
-     * based on the docblock.
-     *
-     * @param  array  &$route
-     * @param  \ReflectionMethod $reflectionMethod
-     * @return void
-     */
-    protected function processDocBlock(&$route, $reflectionMethod)
-    {
-        $factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
-        $docblock                = $factory->create($reflectionMethod->getDocComment());
-        $route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
-        $params                  = $docblock->getTagsByName('param');
-        $route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
+	/**
+	 * Generate description and params for the given route
+	 * based on the docblock.
+	 *
+	 * @param  array  &$route
+	 * @param  \ReflectionMethod $reflectionMethod
+	 * @return void
+	 */
+	protected function processDocBlock(&$route, $reflectionMethod)
+	{
+		$factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
+		$docblock                = $factory->create($reflectionMethod->getDocComment());
+		$route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
+		$params                  = $docblock->getTagsByName('param');
+		$route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
 
-        foreach ($params as $param) {
-            $name = $param->getVariableName();
-            if ($name !== 'request') {
-                $route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
-            }
-        }
+		foreach ($params as $param) {
+			$name = $param->getVariableName();
+			if ($name !== 'request') {
+				$route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
+			}
+		}
 
-        if ($route['name'] === 'list') {
-            $route['parametars']['perPage'] = 'perPage';
-            $route['parametars']['sortBy']  = 'sortBy';
-            $route['parametars']['desc']    = 'desc';
-        }
-    }
+		if ($route['name'] === 'list') {
+			$route['parametars']['perPage'] = 'perPage';
+			$route['parametars']['sortBy']  = 'sortBy';
+			$route['parametars']['desc']    = 'desc';
+		}
+	}
 
-    /**
-     * Generate post body for the given route.
-     *
-     * @param  array  &$route
-     * @param  \ReflectionMethod $reflectionMethod
-     * @return void
-     */
-    protected function getPostData(&$route, $reflectionMethod)
-    {
-        $parameters = $reflectionMethod->getParameters();
-        if (count($parameters)) {
-            $className = optional($reflectionMethod->getParameters()[0]->getType())->getName();
-            if ($className) {
-                $reflectionClass  = new \ReflectionClass($className);
+	/**
+	 * Generate post body for the given route.
+	 *
+	 * @param  array  &$route
+	 * @param  \ReflectionMethod $reflectionMethod
+	 * @return void
+	 */
+	protected function getPostData(&$route, $reflectionMethod)
+	{
+		$parameters = $reflectionMethod->getParameters();
+		if (count($parameters)) {
+			$className = optional($reflectionMethod->getParameters()[0]->getType())->getName();
+			if ($className) {
+				$reflectionClass  = new \ReflectionClass($className);
     
-                if ($reflectionClass->hasMethod('rules')) {
-                    $reflectionMethod = $reflectionClass->getMethod('rules');
-                    $route['body'] = $reflectionMethod->invoke(new $className);
+				if ($reflectionClass->hasMethod('rules')) {
+					$reflectionMethod = $reflectionClass->getMethod('rules');
+					$route['body'] = $reflectionMethod->invoke(new $className);
         
-                    foreach ($route['body'] as &$rule) {
-                        if (strpos($rule, 'unique')) {
-                            $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
-                        } elseif (strpos($rule, 'exists')) {
-                            $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
-                        }
-                    }
-                }
-            }
-        }
-    }
+					foreach ($route['body'] as &$rule) {
+						if (strpos($rule, 'unique')) {
+							$rule = substr($rule, 0, strpos($rule, 'unique') + 6);
+						} elseif (strpos($rule, 'exists')) {
+							$rule = substr($rule, 0, strpos($rule, 'exists') - 1);
+						}
+					}
+				}
+			}
+		}
+	}
 
-    /**
-     * Generate application errors.
-     *
-     * @return array
-     */
-    protected function getErrors()
-    {
-        $errors          = [];
-        $reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler');
-        foreach ($reflectionClass->getMethods() as $method) {
-            $methodName       = $method->name;
-            $reflectionMethod = $reflectionClass->getMethod($methodName);
-            $body             = $this->getMethodBody($reflectionMethod);
+	/**
+	 * Generate application errors.
+	 *
+	 * @return array
+	 */
+	protected function getErrors()
+	{
+		$errors          = [];
+		$reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler');
+		foreach ($reflectionClass->getMethods() as $method) {
+			$methodName       = $method->name;
+			$reflectionMethod = $reflectionClass->getMethod($methodName);
+			$body             = $this->getMethodBody($reflectionMethod);
 
-            preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
+			preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
 
-            if (count($match)) {
-                $errors[$match[1]][] = $methodName;
-            }
-        }
+			if (count($match)) {
+				$errors[$match[1]][] = $methodName;
+			}
+		}
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    /**
-     * Get the given method body code.
-     *
-     * @param  object $reflectionMethod
-     * @return string
-     */
-    protected function getMethodBody($reflectionMethod)
-    {
-        $filename   = $reflectionMethod->getFileName();
-        $start_line = $reflectionMethod->getStartLine() - 1;
-        $end_line   = $reflectionMethod->getEndLine();
-        $length     = $end_line - $start_line;
-        $source     = file($filename);
-        $body       = implode("", array_slice($source, $start_line, $length));
-        $body       = trim(preg_replace('/\s+/', '', $body));
+	/**
+	 * Get the given method body code.
+	 *
+	 * @param  object $reflectionMethod
+	 * @return string
+	 */
+	protected function getMethodBody($reflectionMethod)
+	{
+		$filename   = $reflectionMethod->getFileName();
+		$start_line = $reflectionMethod->getStartLine() - 1;
+		$end_line   = $reflectionMethod->getEndLine();
+		$length     = $end_line - $start_line;
+		$source     = file($filename);
+		$body       = implode("", array_slice($source, $start_line, $length));
+		$body       = trim(preg_replace('/\s+/', '', $body));
 
-        return $body;
-    }
+		return $body;
+	}
 
-    /**
-     * Get example object of all availble models.
-     *
-     * @param  string $modelName
-     * @param  array  $docData
-     * @return string
-     */
-    protected function getModels($modelName, &$docData, $reflectionClass)
-    {
-        if ($modelName && ! Arr::has($docData['models'], $modelName)) {
-            $modelClass = get_class(call_user_func_array("\Core::{$modelName}", [])->model);
-            $model      = factory($modelClass)->make();
+	/**
+	 * Get example object of all availble models.
+	 *
+	 * @param  string $modelName
+	 * @param  array  $docData
+	 * @return string
+	 */
+	protected function getModels($modelName, &$docData, $reflectionClass)
+	{
+		if ($modelName && ! Arr::has($docData['models'], $modelName)) {
+			$modelClass = get_class(call_user_func_array("\Core::{$modelName}", [])->model);
+			$model      = factory($modelClass)->make();
 
-            $property = $reflectionClass->getProperty('modelResource');
-            $property->setAccessible(true);
-            $modelResource = $property->getValue(\App::make($reflectionClass->getName()));
-            $modelResource = new $modelResource($model);
-            $modelArr      = $modelResource->toArray([]);
+			$property = $reflectionClass->getProperty('modelResource');
+			$property->setAccessible(true);
+			$modelResource = $property->getValue(\App::make($reflectionClass->getName()));
+			$modelResource = new $modelResource($model);
+			$modelArr      = $modelResource->toArray([]);
 
-            foreach ($modelArr as $key => $attr) {
-                if (is_object($attr) && $attr->resource instanceof \Illuminate\Http\Resources\MissingValue) {
-                    unset($modelArr[$key]);
-                }
-            }
+			foreach ($modelArr as $key => $attr) {
+				if (is_object($attr) && $attr->resource instanceof \Illuminate\Http\Resources\MissingValue) {
+					unset($modelArr[$key]);
+				}
+			}
 
-            $docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
-        }
-    }
+			$docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
+		}
+	}
 
-    /**
-     * Get the route response object type.
-     *
-     * @param  string $modelName
-     * @param  string $method
-     * @param  string $returnDocBlock
-     * @return array
-     */
-    protected function getResponseObject($modelName, $method, $returnDocBlock)
-    {
-        $config    = \CoreConfig::getConfig();
-        $relations = Arr::has($config['relations'], $modelName) ? Arr::has($config['relations'][$modelName], $method) ? $config['relations'][$modelName] : false : false;
-        $modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
+	/**
+	 * Get the route response object type.
+	 *
+	 * @param  string $modelName
+	 * @param  string $method
+	 * @param  string $returnDocBlock
+	 * @return array
+	 */
+	protected function getResponseObject($modelName, $method, $returnDocBlock)
+	{
+		$config    = \CoreConfig::getConfig();
+		$relations = Arr::has($config['relations'], $modelName) ? Arr::has($config['relations'][$modelName], $method) ? $config['relations'][$modelName] : false : false;
+		$modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
 
-        return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
-    }
+		return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
      */
     protected function getRoutes()
     {
-        return collect(\Route::getRoutes())->map(function ($route) {
+        return collect(\Route::getRoutes())->map(function($route) {
             if (strpos($route->uri(), 'api/') !== false) {
                 return [
                     'method' => $route->methods()[0],
@@ -114,7 +114,7 @@ 
         ];
 
 
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
+        if ( ! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) {
             $route['headers']['Authorization'] = 'Bearer {token}';
         }
     }
@@ -162,7 +162,7 @@ 
         if (count($parameters)) {
             $className = optional($reflectionMethod->getParameters()[0]->getType())->getName();
             if ($className) {
-                $reflectionClass  = new \ReflectionClass($className);
+                $reflectionClass = new \ReflectionClass($className);
     
                 if ($reflectionClass->hasMethod('rules')) {
                     $reflectionMethod = $reflectionClass->getMethod('rules');

src/Modules/Core/Database/Factories/SettingFactory.php

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@
 <?php
 
 $factory->define(App\Modules\Core\Setting::class, function (Faker\Generator $faker) {
-    return [
-        'name'       => $faker->randomElement(['Company Name', 'Title', 'Header Image']),
-        'value'      => $faker->word(),
-        'key'        => $faker->word(),
-        'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
-        'updated_at' => $faker->dateTimeBetween('-1 years', 'now')
-    ];
+	return [
+		'name'       => $faker->randomElement(['Company Name', 'Title', 'Header Image']),
+		'value'      => $faker->word(),
+		'key'        => $faker->word(),
+		'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
+		'updated_at' => $faker->dateTimeBetween('-1 years', 'now')
+	];
 });

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\Core\Setting::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\Core\Setting::class, function(Faker\Generator $faker) {
     return [
         'name'       => $faker->randomElement(['Company Name', 'Title', 'Header Image']),
         'value'      => $faker->word(),

src/Modules/Core/Http/Middleware/CheckPermissions.php

Indentation +62 added lines, -62 removed lines

@@ -12,73 +12,73 @@
 
 class CheckPermissions
 {
-    protected $route;
-    protected $auth;
-    protected $errorHandler;
-    protected $authMiddleware;
-    protected $core;
-    protected $arr;
+	protected $route;
+	protected $auth;
+	protected $errorHandler;
+	protected $authMiddleware;
+	protected $core;
+	protected $arr;
     
-    /**
-     * Init new object.
-     *
-     * @param   Route          $route
-     * @param   Auth           $auth
-     * @param   ErrorHandler   $errorHandler
-     * @param   AuthMiddleware $authMiddleware
-     * @param   Core           $core
-     * @param   Arr            $arr
-     *
-     * @return  void
-     */
-    public function __construct(Route $route, Auth $auth, ErrorHandler $errorHandler, AuthMiddleware $authMiddleware, Core $core, Arr $arr)
-    {
-        $this->route = $route;
-        $this->auth = $auth;
-        $this->errorHandler = $errorHandler;
-        $this->authMiddleware = $authMiddleware;
-        $this->core = $core;
-        $this->arr = $arr;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Route          $route
+	 * @param   Auth           $auth
+	 * @param   ErrorHandler   $errorHandler
+	 * @param   AuthMiddleware $authMiddleware
+	 * @param   Core           $core
+	 * @param   Arr            $arr
+	 *
+	 * @return  void
+	 */
+	public function __construct(Route $route, Auth $auth, ErrorHandler $errorHandler, AuthMiddleware $authMiddleware, Core $core, Arr $arr)
+	{
+		$this->route = $route;
+		$this->auth = $auth;
+		$this->errorHandler = $errorHandler;
+		$this->authMiddleware = $authMiddleware;
+		$this->core = $core;
+		$this->arr = $arr;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $routeActions        = explode('@', $this->route->currentRouteAction());
-        $reflectionClass     = new \ReflectionClass($routeActions[0]);
-        $classProperties     = $reflectionClass->getDefaultProperties();
-        $skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []);
-        $skipLoginCheck      = $this->arr->get($classProperties, 'skipLoginCheck', []);
-        $modelName           = explode('\\', $routeActions[0]);
-        $modelName           = lcfirst(str_replace('Controller', '', end($modelName)));
-        $permission          = $routeActions[1];
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$routeActions        = explode('@', $this->route->currentRouteAction());
+		$reflectionClass     = new \ReflectionClass($routeActions[0]);
+		$classProperties     = $reflectionClass->getDefaultProperties();
+		$skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []);
+		$skipLoginCheck      = $this->arr->get($classProperties, 'skipLoginCheck', []);
+		$modelName           = explode('\\', $routeActions[0]);
+		$modelName           = lcfirst(str_replace('Controller', '', end($modelName)));
+		$permission          = $routeActions[1];
 
-        $this->auth->shouldUse('api');
-        if (! in_array($permission, $skipLoginCheck)) {
-            $this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $skipLoginCheck, $permission) {
-                $user             = $this->auth->user();
-                $isPasswordClient = $user->token()->client->password_client;
+		$this->auth->shouldUse('api');
+		if (! in_array($permission, $skipLoginCheck)) {
+			$this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $skipLoginCheck, $permission) {
+				$user             = $this->auth->user();
+				$isPasswordClient = $user->token()->client->password_client;
     
-                if ($user->blocked) {
-                    $this->errorHandler->userIsBlocked();
-                }
+				if ($user->blocked) {
+					$this->errorHandler->userIsBlocked();
+				}
     
-                if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->core->users()->can($permission, $modelName))) {
-                } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
-                } else {
-                    $this->errorHandler->noPermissions();
-                }
-            });
-        }
+				if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->core->users()->can($permission, $modelName))) {
+				} elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
+				} else {
+					$this->errorHandler->noPermissions();
+				}
+			});
+		}
 
-        return $next($request);
+		return $next($request);
 
-        //$this->middleware('auth:api', ['except' => $skipLoginCheck]);
-    }
+		//$this->middleware('auth:api', ['except' => $skipLoginCheck]);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -60,8 +60,8 @@ 
         $permission          = $routeActions[1];
 
         $this->auth->shouldUse('api');
-        if (! in_array($permission, $skipLoginCheck)) {
-            $this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $skipLoginCheck, $permission) {
+        if ( ! in_array($permission, $skipLoginCheck)) {
+            $this->authMiddleware->handle($request, function($request) use ($modelName, $skipPermissionCheck, $skipLoginCheck, $permission) {
                 $user             = $this->auth->user();
                 $isPasswordClient = $user->token()->client->password_client;
     
@@ -70,7 +70,7 @@ 
                 }
     
                 if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->core->users()->can($permission, $modelName))) {
-                } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
+                } elseif ( ! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
                 } else {
                     $this->errorHandler->noPermissions();
                 }

src/Modules/Core/Http/Middleware/SetRelations.php

Indentation +36 added lines, -36 removed lines

@@ -9,43 +9,43 @@
 
 class SetRelations
 {
-    protected $arr;
-    protected $route;
-    protected $config;
+	protected $arr;
+	protected $route;
+	protected $config;
     
-    /**
-     * Init new object.
-     *
-     * @param   Route  $route
-     * @param   Arr    $arr
-     * @param   Config $config
-     *
-     * @return  void
-     */
-    public function __construct(Route $route, Arr $arr, Config $config)
-    {
-        $this->arr = $arr;
-        $this->route = $route;
-        $this->config = $config->getConfig();
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Route  $route
+	 * @param   Arr    $arr
+	 * @param   Config $config
+	 *
+	 * @return  void
+	 */
+	public function __construct(Route $route, Arr $arr, Config $config)
+	{
+		$this->arr = $arr;
+		$this->route = $route;
+		$this->config = $config->getConfig();
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $routeActions       = explode('@', $this->route->currentRouteAction());
-        $modelName          = explode('\\', $routeActions[0]);
-        $modelName          = lcfirst(str_replace('Controller', '', end($modelName)));
-        $route              = explode('@', $this->route->currentRouteAction())[1];
-        $route              = $route !== 'index' ? $route : 'list';
-        $relations          = $this->arr->get($this->config['relations'], $modelName, false);
-        $request->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$routeActions       = explode('@', $this->route->currentRouteAction());
+		$modelName          = explode('\\', $routeActions[0]);
+		$modelName          = lcfirst(str_replace('Controller', '', end($modelName)));
+		$route              = explode('@', $this->route->currentRouteAction())[1];
+		$route              = $route !== 'index' ? $route : 'list';
+		$relations          = $this->arr->get($this->config['relations'], $modelName, false);
+		$request->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

src/Modules/Core/Http/Controllers/ApiDocumentController.php

Indentation +73 added lines, -73 removed lines

@@ -5,81 +5,81 @@
 
 class ApiDocumentController extends Controller
 {
-    public function index()
-    {
-        $jsonDoc    = json_decode(file_get_contents(app_path('Modules/Core/Resources/api.json')), true);
-        $modules    = $jsonDoc['modules'];
-        $reports    = $jsonDoc['reports'];
-        $errors     = $jsonDoc['errors'];
-        $models     = $jsonDoc['models'];
-        $conditions = [
-            [
-                'title'   => 'email equal John@Doe.com:',
-                'content' => ['email' => 'John@Doe.com']
-            ],
-            [
-                'title'   => 'email equal John@Doe.com and user is blocked:',
-                'content' => ['and' => ['email' => 'John@Doe.com', 'blocked' => 1]]
-            ],
-            [
-                'title'   => 'email equal John@Doe.com or user is blocked:',
-                'content' => ['or' => ['email' => 'John@Doe.com', 'blocked' => 1]]
-            ],
-            [
-                'title'   => 'email contain John:',
-                'content' => ['email' => ['op' => 'like', 'val' => '%John%']]
-            ],
-            [
-                'title'   => 'user created after 2016-10-25:',
-                'content' => ['created_at' => ['op' => '>', 'val' => '2016-10-25']]
-            ],
-            [
-                'title'   => 'user created between 2016-10-20 and 2016-10-25:',
-                'content' => ['created_at' => ['op' => 'between', 'val1' => '2016-10-20', 'val2' => '2016-10-25']]
-            ],
-            [
-                'title'   => 'user id in 1,2,3:',
-                'content' => ['id' => ['op' => 'in', 'val' => [1, 2, 3]]]
-            ],
-            [
-                'title'   => 'user name is null:',
-                'content' => ['name' => ['op' => 'null']]
-            ],
-            [
-                'title'   => 'user name is not null:',
-                'content' => ['name' => ['op' => 'not null']]
-            ],
-            [
-                'title'   => 'user has group admin:',
-                'content' => ['groups' => ['op' => 'has', 'val' => ['name' => 'Admin']]]
-            ]
-        ];
+	public function index()
+	{
+		$jsonDoc    = json_decode(file_get_contents(app_path('Modules/Core/Resources/api.json')), true);
+		$modules    = $jsonDoc['modules'];
+		$reports    = $jsonDoc['reports'];
+		$errors     = $jsonDoc['errors'];
+		$models     = $jsonDoc['models'];
+		$conditions = [
+			[
+				'title'   => 'email equal John@Doe.com:',
+				'content' => ['email' => 'John@Doe.com']
+			],
+			[
+				'title'   => 'email equal John@Doe.com and user is blocked:',
+				'content' => ['and' => ['email' => 'John@Doe.com', 'blocked' => 1]]
+			],
+			[
+				'title'   => 'email equal John@Doe.com or user is blocked:',
+				'content' => ['or' => ['email' => 'John@Doe.com', 'blocked' => 1]]
+			],
+			[
+				'title'   => 'email contain John:',
+				'content' => ['email' => ['op' => 'like', 'val' => '%John%']]
+			],
+			[
+				'title'   => 'user created after 2016-10-25:',
+				'content' => ['created_at' => ['op' => '>', 'val' => '2016-10-25']]
+			],
+			[
+				'title'   => 'user created between 2016-10-20 and 2016-10-25:',
+				'content' => ['created_at' => ['op' => 'between', 'val1' => '2016-10-20', 'val2' => '2016-10-25']]
+			],
+			[
+				'title'   => 'user id in 1,2,3:',
+				'content' => ['id' => ['op' => 'in', 'val' => [1, 2, 3]]]
+			],
+			[
+				'title'   => 'user name is null:',
+				'content' => ['name' => ['op' => 'null']]
+			],
+			[
+				'title'   => 'user name is not null:',
+				'content' => ['name' => ['op' => 'not null']]
+			],
+			[
+				'title'   => 'user has group admin:',
+				'content' => ['groups' => ['op' => 'has', 'val' => ['name' => 'Admin']]]
+			]
+		];
 
-        $paginateObject = [
-            'data' => ['Array of model objects'],
-            "links" => [
-                "first" => "apiUrl?page=1",
-                "last" => "apiUrl?page=3",
-                "prev" => "apiUrl?page=2",
-                "next" => "apiUrl?page=3"
-            ],
-            "meta" => [
-                "current_page" => 2,
-                "from" => 6,
-                "last_page" => 3,
-                "path" => "apiUrl",
-                "per_page" => 5,
-                "to" => 10,
-                "total" => 15
-            ]
-        ];
+		$paginateObject = [
+			'data' => ['Array of model objects'],
+			"links" => [
+				"first" => "apiUrl?page=1",
+				"last" => "apiUrl?page=3",
+				"prev" => "apiUrl?page=2",
+				"next" => "apiUrl?page=3"
+			],
+			"meta" => [
+				"current_page" => 2,
+				"from" => 6,
+				"last_page" => 3,
+				"path" => "apiUrl",
+				"per_page" => 5,
+				"to" => 10,
+				"total" => 15
+			]
+		];
         
-        $responseObject = [
-            'data' => ['The model object']
-        ];
+		$responseObject = [
+			'data' => ['The model object']
+		];
 
-        $avaialableReports = \Core::reports()->all();
+		$avaialableReports = \Core::reports()->all();
 
-        return view('core::doc', ['modules' => $modules, 'reports' => $reports, 'errors' => $errors, 'conditions' => $conditions, 'models' => $models, 'paginateObject' => json_encode($paginateObject, JSON_PRETTY_PRINT), 'responseObject' => json_encode($responseObject, JSON_PRETTY_PRINT), 'avaialableReports' => $avaialableReports]);
-    }
+		return view('core::doc', ['modules' => $modules, 'reports' => $reports, 'errors' => $errors, 'conditions' => $conditions, 'models' => $models, 'paginateObject' => json_encode($paginateObject, JSON_PRETTY_PRINT), 'responseObject' => json_encode($responseObject, JSON_PRETTY_PRINT), 'avaialableReports' => $avaialableReports]);
+	}
 }

src/Modules/Core/BaseClasses/BaseApiController.php

Indentation +81 added lines, -81 removed lines

@@ -9,93 +9,93 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The relations implementation.
-     *
-     * @var array
-     */
-    protected $relations;
+	/**
+	 * The relations implementation.
+	 *
+	 * @var array
+	 */
+	protected $relations;
 
-    /**
-     * The repo implementation.
-     *
-     * @var object
-     */
-    protected $repo;
+	/**
+	 * The repo implementation.
+	 *
+	 * @var object
+	 */
+	protected $repo;
 
-    /**
-     * The modelResource implementation.
-     *
-     * @var object
-     */
-    protected $modelResource;
+	/**
+	 * The modelResource implementation.
+	 *
+	 * @var object
+	 */
+	protected $modelResource;
 
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $repo
-     * @param   string     $modelResource
-     * @return  void
-     */
-    public function __construct($repo, $modelResource)
-    {
-        $this->repo = new CachingDecorator($repo, \App::make('Illuminate\Contracts\Cache\Repository'));
-        $this->modelResource = $modelResource;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $repo
+	 * @param   string     $modelResource
+	 * @return  void
+	 */
+	public function __construct($repo, $modelResource)
+	{
+		$this->repo = new CachingDecorator($repo, \App::make('Illuminate\Contracts\Cache\Repository'));
+		$this->modelResource = $modelResource;
+	}
 
-    /**
-     * Fetch all records with relations from storage.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
-    }
+	/**
+	 * Fetch all records with relations from storage.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
+	}
 
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  Request $request
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function find(Request $request, $id)
-    {
-        return new $this->modelResource($this->repo->find($id, $request->relations));
-    }
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  Request $request
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function find(Request $request, $id)
+	{
+		return new $this->modelResource($this->repo->find($id, $request->relations));
+	}
 
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id)
-    {
-        return new GeneralResource($this->repo->delete($id));
-    }
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id)
+	{
+		return new GeneralResource($this->repo->delete($id));
+	}
 
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function deleted(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->deleted($request->all(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
-    }
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function deleted(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->deleted($request->all(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
+	}
 
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return new GeneralResource($this->repo->restore($id));
-    }
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return new GeneralResource($this->repo->restore($id));
+	}
 }

src/Modules/Reporting/Routes/api.php

Indentation +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@
 
 Route::group(['prefix' => 'reports'], function () {
         
-    Route::get('/', 'ReportController@index');
-    Route::get('/{id}', 'ReportController@find');
-    Route::post('get/{reportName}', 'ReportController@getReport');
+	Route::get('/', 'ReportController@index');
+	Route::get('/{id}', 'ReportController@find');
+	Route::post('get/{reportName}', 'ReportController@getReport');
 });