SherifElfadaly / Laravel-Api-Skeleton

files/Handler.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 

 namespace App\Exceptions;

 

-use Exception;

+use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

 

 class Handler extends ExceptionHandler

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
                 return \Response::json(['errors' => [$errors]], $exception->getStatusCode());

             } elseif ($exception instanceof \Illuminate\Validation\ValidationException) {

                 return \Response::json(['errors' => $exception->errors()], 422);

-            } elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {

+            } elseif ( ! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {

                 return parent::render($request, $exception);

             }

         }

Indentation +59 added lines, -59 removed lines

@@ -7,67 +7,67 @@
 

 class Handler extends ExceptionHandler

 {

-    /**

-     * A list of the exception types that are not reported.

-     *

-     * @var array

-     */

-    protected $dontReport = [

-        \League\OAuth2\Server\Exception\OAuthServerException::class,

-    ];

+	/**

+	 * A list of the exception types that are not reported.

+	 *

+	 * @var array

+	 */

+	protected $dontReport = [

+		\League\OAuth2\Server\Exception\OAuthServerException::class,

+	];

 

-    /**

-     * A list of the inputs that are never flashed for validation exceptions.

-     *

-     * @var array

-     */

-    protected $dontFlash = [

-        'password',

-        'password_confirmation',

-    ];

+	/**

+	 * A list of the inputs that are never flashed for validation exceptions.

+	 *

+	 * @var array

+	 */

+	protected $dontFlash = [

+		'password',

+		'password_confirmation',

+	];

 

-    /**

-     * Report or log an exception.

-     *

-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.

-     *

-     * @param  \Exception  $exception

-     * @return void

-     */

-    public function report(Exception $exception)

-    {

-        parent::report($exception);

-    }

+	/**

+	 * Report or log an exception.

+	 *

+	 * This is a great spot to send exceptions to Sentry, Bugsnag, etc.

+	 *

+	 * @param  \Exception  $exception

+	 * @return void

+	 */

+	public function report(Exception $exception)

+	{

+		parent::report($exception);

+	}

 

-    /**

-     * Render an exception into an HTTP response.

-     *

-     * @param  \Illuminate\Http\Request  $request

-     * @param  \Exception  $exception

-     * @return \Illuminate\Http\Response

-     */

-    public function render($request, Exception $exception)

-    {

-        if ($request->wantsJson()) {

-            if ($exception instanceof \Illuminate\Auth\AuthenticationException) {

-                \Errors::unAuthorized();

-            }

-            if ($exception instanceof \Illuminate\Database\QueryException) {

-                \Errors::dbQueryError();

-            } elseif ($exception instanceof \predis\connection\connectionexception) {

-                \Errors::redisNotRunning();

-            } elseif ($exception instanceof \GuzzleHttp\Exception\ClientException) {

-                \Errors::connectionError();

-            } elseif ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {

-                $errors = $exception->getStatusCode() === 404 ? 'not found' : $exception->getMessage();

-                return \Response::json(['errors' => [$errors]], $exception->getStatusCode());

-            } elseif ($exception instanceof \Illuminate\Validation\ValidationException) {

-                return \Response::json(['errors' => $exception->errors()], 422);

-            } elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {

-                return parent::render($request, $exception);

-            }

-        }

+	/**

+	 * Render an exception into an HTTP response.

+	 *

+	 * @param  \Illuminate\Http\Request  $request

+	 * @param  \Exception  $exception

+	 * @return \Illuminate\Http\Response

+	 */

+	public function render($request, Exception $exception)

+	{

+		if ($request->wantsJson()) {

+			if ($exception instanceof \Illuminate\Auth\AuthenticationException) {

+				\Errors::unAuthorized();

+			}

+			if ($exception instanceof \Illuminate\Database\QueryException) {

+				\Errors::dbQueryError();

+			} elseif ($exception instanceof \predis\connection\connectionexception) {

+				\Errors::redisNotRunning();

+			} elseif ($exception instanceof \GuzzleHttp\Exception\ClientException) {

+				\Errors::connectionError();

+			} elseif ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {

+				$errors = $exception->getStatusCode() === 404 ? 'not found' : $exception->getMessage();

+				return \Response::json(['errors' => [$errors]], $exception->getStatusCode());

+			} elseif ($exception instanceof \Illuminate\Validation\ValidationException) {

+				return \Response::json(['errors' => $exception->errors()], 422);

+			} elseif (! $exception instanceof \Symfony\Component\ErrorHandler\Error\FatalError) {

+				return parent::render($request, $exception);

+			}

+		}

         

-        return parent::render($request, $exception);

-    }

+		return parent::render($request, $exception);

+	}

 }

src/Modules/Core/Console/Commands/Stubs/Module/Http/Controllers/DummyController.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use App\Modules\Core\BaseClasses\BaseApiController;
 use App\Modules\DummyModule\Services\DummyService;
-use App\Modules\Core\Utl\CoreConfig;
 use App\Modules\DummyModule\Http\Requests\InsertDummy;
 use App\Modules\DummyModule\Http\Requests\UpdateDummy;
 

Indentation +48 added lines, -48 removed lines

@@ -10,57 +10,57 @@
 
 class DummyController extends BaseApiController
 {
-    /**
-     * Path of the model resource
-     *
-     * @var string
-     */
-    protected $modelResource = 'App\Modules\DummyModule\Http\Resources\DummyModel';
+	/**
+	 * Path of the model resource
+	 *
+	 * @var string
+	 */
+	protected $modelResource = 'App\Modules\DummyModule\Http\Resources\DummyModel';
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = [];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = [];
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = [];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = [];
 
-    /**
-     * Init new object.
-     *
-     * @param   DummyService $service
-     * @return  void
-     */
-    public function __construct(DummyService $service)
-    {
-        parent::__construct($service);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   DummyService $service
+	 * @return  void
+	 */
+	public function __construct(DummyService $service)
+	{
+		parent::__construct($service);
+	}
 
-    /**
-     * Insert the given model to storage.
-     *
-     * @param InsertDummy $request
-     * @return \Illuminate\Http\Response
-     */
-    public function insert(InsertDummy $request)
-    {
-        return new $this->modelResource($this->service->save($request->all()));
-    }
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @param InsertDummy $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function insert(InsertDummy $request)
+	{
+		return new $this->modelResource($this->service->save($request->all()));
+	}
 
-    /**
-     * Update the given model to storage.
-     *
-     * @param UpdateDummy $request
-     * @return \Illuminate\Http\Response
-     */
-    public function update(UpdateDummy $request)
-    {
-        return new $this->modelResource($this->service->save($request->all()));
-    }
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param UpdateDummy $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update(UpdateDummy $request)
+	{
+		return new $this->modelResource($this->service->save($request->all()));
+	}
 }

files/Kernel.php

Indentation +31 added lines, -31 removed lines

@@ -10,38 +10,38 @@
 

 class Kernel extends ConsoleKernel

 {

-    /**

-     * The Artisan commands provided by your application.

-     *

-     * @var array

-     */

-    protected $commands = [

-        GenerateDoc::class,

-        MakeNotificationsCommand::class,

-        MakeModuleCommand::class

-    ];

+	/**

+	 * The Artisan commands provided by your application.

+	 *

+	 * @var array

+	 */

+	protected $commands = [

+		GenerateDoc::class,

+		MakeNotificationsCommand::class,

+		MakeModuleCommand::class

+	];

 

-    /**

-     * Define the application's command schedule.

-     *

-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule

-     * @return void

-     */

-    protected function schedule(Schedule $schedule)

-    {

-        // $schedule->command('inspire')

-        //          ->hourly();

-    }

+	/**

+	 * Define the application's command schedule.

+	 *

+	 * @param  \Illuminate\Console\Scheduling\Schedule  $schedule

+	 * @return void

+	 */

+	protected function schedule(Schedule $schedule)

+	{

+		// $schedule->command('inspire')

+		//          ->hourly();

+	}

 

-    /**

-     * Register the commands for the application.

-     *

-     * @return void

-     */

-    protected function commands()

-    {

-        $this->load(__DIR__.'/Commands');

+	/**

+	 * Register the commands for the application.

+	 *

+	 * @return void

+	 */

+	protected function commands()

+	{

+		$this->load(__DIR__.'/Commands');

 

-        require base_path('routes/console.php');

-    }

+		require base_path('routes/console.php');

+	}

 }

files/HttpKernel.php

Indentation +73 added lines, -73 removed lines

@@ -6,81 +6,81 @@
 

 class Kernel extends HttpKernel

 {

-    /**

-     * The application's global HTTP middleware stack.

-     *

-     * These middleware are run during every request to your application.

-     *

-     * @var array

-     */

-    protected $middleware = [

-        \App\Http\Middleware\TrustProxies::class,

-        \App\Http\Middleware\CheckForMaintenanceMode::class,

-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,

-        \App\Http\Middleware\TrimStrings::class,

-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,

-    ];

+	/**

+	 * The application's global HTTP middleware stack.

+	 *

+	 * These middleware are run during every request to your application.

+	 *

+	 * @var array

+	 */

+	protected $middleware = [

+		\App\Http\Middleware\TrustProxies::class,

+		\App\Http\Middleware\CheckForMaintenanceMode::class,

+		\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,

+		\App\Http\Middleware\TrimStrings::class,

+		\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,

+	];

 

-    /**

-     * The application's route middleware groups.

-     *

-     * @var array

-     */

-    protected $middlewareGroups = [

-        'web' => [

-            \App\Http\Middleware\EncryptCookies::class,

-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,

-            \Illuminate\Session\Middleware\StartSession::class,

-            // \Illuminate\Session\Middleware\AuthenticateSession::class,

-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-            \App\Http\Middleware\VerifyCsrfToken::class,

-            \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        ],

+	/**

+	 * The application's route middleware groups.

+	 *

+	 * @var array

+	 */

+	protected $middlewareGroups = [

+		'web' => [

+			\App\Http\Middleware\EncryptCookies::class,

+			\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,

+			\Illuminate\Session\Middleware\StartSession::class,

+			// \Illuminate\Session\Middleware\AuthenticateSession::class,

+			\Illuminate\View\Middleware\ShareErrorsFromSession::class,

+			\App\Http\Middleware\VerifyCsrfToken::class,

+			\Illuminate\Routing\Middleware\SubstituteBindings::class,

+		],

 

-        'api' => [

-            'throttle:60,1',

-            \Illuminate\Routing\Middleware\SubstituteBindings::class,

-            \App\Modules\Core\Http\Middleware\SetSessions::class,

-            \App\Modules\Core\Http\Middleware\CheckPermissions::class,

-            \App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,

-            \App\Modules\Core\Http\Middleware\SetRelations::class,

-        ],

-    ];

+		'api' => [

+			'throttle:60,1',

+			\Illuminate\Routing\Middleware\SubstituteBindings::class,

+			\App\Modules\Core\Http\Middleware\SetSessions::class,

+			\App\Modules\Core\Http\Middleware\CheckPermissions::class,

+			\App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,

+			\App\Modules\Core\Http\Middleware\SetRelations::class,

+		],

+	];

 

-    /**

-     * The application's route middleware.

-     *

-     * These middleware may be assigned to groups or used individually.

-     *

-     * @var array

-     */

-    protected $routeMiddleware = [

-        'auth' => \App\Http\Middleware\Authenticate::class,

-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,

-        'can' => \Illuminate\Auth\Middleware\Authorize::class,

-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

-        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,

-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

-    ];

+	/**

+	 * The application's route middleware.

+	 *

+	 * These middleware may be assigned to groups or used individually.

+	 *

+	 * @var array

+	 */

+	protected $routeMiddleware = [

+		'auth' => \App\Http\Middleware\Authenticate::class,

+		'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

+		'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

+		'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,

+		'can' => \Illuminate\Auth\Middleware\Authorize::class,

+		'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

+		'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

+		'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,

+		'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,

+		'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

+	];

 

-    /**

-     * The priority-sorted list of middleware.

-     *

-     * This forces non-global middleware to always be in the given order.

-     *

-     * @var array

-     */

-    protected $middlewarePriority = [

-        \Illuminate\Session\Middleware\StartSession::class,

-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-        \App\Http\Middleware\Authenticate::class,

-        \Illuminate\Routing\Middleware\ThrottleRequests::class,

-        \Illuminate\Session\Middleware\AuthenticateSession::class,

-        \Illuminate\Routing\Middleware\SubstituteBindings::class,

-        \Illuminate\Auth\Middleware\Authorize::class,

-    ];

+	/**

+	 * The priority-sorted list of middleware.

+	 *

+	 * This forces non-global middleware to always be in the given order.

+	 *

+	 * @var array

+	 */

+	protected $middlewarePriority = [

+		\Illuminate\Session\Middleware\StartSession::class,

+		\Illuminate\View\Middleware\ShareErrorsFromSession::class,

+		\App\Http\Middleware\Authenticate::class,

+		\Illuminate\Routing\Middleware\ThrottleRequests::class,

+		\Illuminate\Session\Middleware\AuthenticateSession::class,

+		\Illuminate\Routing\Middleware\SubstituteBindings::class,

+		\Illuminate\Auth\Middleware\Authorize::class,

+	];

 }

files/channels.php

Indentation +1 added lines, -1 removed lines

@@ -12,5 +12,5 @@
 */

 

 Broadcast::channel('users.{id}', function ($user, $id) {

-    return (int) $user->id === (int) $id;

+	return (int) $user->id === (int) $id;

 });

Spacing +1 added lines, -1 removed lines

@@ -11,6 +11,6 @@
 |

 */

 

-Broadcast::channel('users.{id}', function ($user, $id) {

+Broadcast::channel('users.{id}', function($user, $id) {

     return (int) $user->id === (int) $id;

 });

files/auth.php

Indentation +35 added lines, -35 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Authentication Defaults

     |--------------------------------------------------------------------------

@@ -13,12 +13,12 @@ 
     |

     */

 

-    'defaults' => [

-        'guard' => 'web',

-        'passwords' => 'users',

-    ],

+	'defaults' => [

+		'guard' => 'web',

+		'passwords' => 'users',

+	],

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Authentication Guards

     |--------------------------------------------------------------------------

@@ -35,19 +35,19 @@ 
     |

     */

 

-    'guards' => [

-        'web' => [

-            'driver' => 'session',

-            'provider' => 'users',

-        ],

+	'guards' => [

+		'web' => [

+			'driver' => 'session',

+			'provider' => 'users',

+		],

 

-        'api' => [

-            'driver' => 'passport',

-            'provider' => 'users',

-        ],

-    ],

+		'api' => [

+			'driver' => 'passport',

+			'provider' => 'users',

+		],

+	],

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | User Providers

     |--------------------------------------------------------------------------

@@ -64,19 +64,19 @@ 
     |

     */

 

-    'providers' => [

-        'users' => [

-            'driver' => 'eloquent',

-            'model' => App\Modules\Users\AclUser::class,

-        ],

+	'providers' => [

+		'users' => [

+			'driver' => 'eloquent',

+			'model' => App\Modules\Users\AclUser::class,

+		],

 

-        // 'users' => [

-        //     'driver' => 'database',

-        //     'table' => 'users',

-        // ],

-    ],

+		// 'users' => [

+		//     'driver' => 'database',

+		//     'table' => 'users',

+		// ],

+	],

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Resetting Passwords

     |--------------------------------------------------------------------------

@@ -91,12 +91,12 @@ 
     |

     */

 

-    'passwords' => [

-        'users' => [

-            'provider' => 'users',

-            'table' => 'password_resets',

-            'expire' => 60,

-        ],

-    ],

+	'passwords' => [

+		'users' => [

+			'provider' => 'users',

+			'table' => 'password_resets',

+			'expire' => 60,

+		],

+	],

 

 ];

files/AuthServiceProvider.php

Indentation +25 added lines, -25 removed lines

@@ -7,31 +7,31 @@
 

 class AuthServiceProvider extends ServiceProvider

 {

-    /**

-     * The policy mappings for the application.

-     *

-     * @var array

-     */

-    protected $policies = [

-        'App\Model' => 'App\Policies\ModelPolicy',

-    ];

+	/**

+	 * The policy mappings for the application.

+	 *

+	 * @var array

+	 */

+	protected $policies = [

+		'App\Model' => 'App\Policies\ModelPolicy',

+	];

 

-    /**

-     * Register any authentication / authorization services.

-     *

-     * @return void

-     */

-    public function boot()

-    {

-        $this->registerPolicies();

+	/**

+	 * Register any authentication / authorization services.

+	 *

+	 * @return void

+	 */

+	public function boot()

+	{

+		$this->registerPolicies();

 

-        Passport::routes(function ($router) {

-            $router->forAuthorization();

-            $router->forAccessTokens();

-            $router->forPersonalAccessTokens();

-            $router->forTransientTokens();

-        });

-        Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(10));

-        Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addDays(10));

-    }

+		Passport::routes(function ($router) {

+			$router->forAuthorization();

+			$router->forAccessTokens();

+			$router->forPersonalAccessTokens();

+			$router->forTransientTokens();

+		});

+		Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(10));

+		Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addDays(10));

+	}

 }

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {

         $this->registerPolicies();

 

-        Passport::routes(function ($router) {

+        Passport::routes(function($router) {

             $router->forAuthorization();

             $router->forAccessTokens();

             $router->forPersonalAccessTokens();

config/skeleton.php

Indentation +136 added lines, -136 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Disable Confirm Email

     |--------------------------------------------------------------------------

@@ -11,9 +11,9 @@ 
     |

     */

 

-    'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', false),

+	'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', false),

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Confirm Email URL

     |--------------------------------------------------------------------------

@@ -22,9 +22,9 @@ 
     |

     */

    

-    'confrim_email_url' => env('CONFIRM_EMAIL_URL'),

+	'confrim_email_url' => env('CONFIRM_EMAIL_URL'),

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Reset Password URL

     |--------------------------------------------------------------------------

@@ -33,9 +33,9 @@ 
     |

     */

    

-    'reset_password_url' => env('RESET_PASSWORD_URL'),

+	'reset_password_url' => env('RESET_PASSWORD_URL'),

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Passport Client Id

     |--------------------------------------------------------------------------

@@ -44,9 +44,9 @@ 
     |

     */

    

-    'passport_client_id' => env('PASSWORD_CLIENT_ID'),

+	'passport_client_id' => env('PASSWORD_CLIENT_ID'),

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Passport Client Secret

     |--------------------------------------------------------------------------

@@ -55,9 +55,9 @@ 
     |

     */

    

-    'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'),

+	'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'),

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Social Pass

     |--------------------------------------------------------------------------

@@ -66,9 +66,9 @@ 
     |

     */

 

-    'social_pass' => env('SOCIAL_PASS', false),

+	'social_pass' => env('SOCIAL_PASS', false),

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Relations Between Models

     |--------------------------------------------------------------------------

@@ -77,88 +77,88 @@ 
     |

     */

     

-    'relations' => [

-        'user' => [

-            'list'       => [],

-            'find'       => [],

-            'findby'     => [],

-            'paginate'   => [],

-            'paginateby' => [],

-            'first'      => [],

-            'search'     => [],

-            'account'    => [],

-            'group'      => [],

-            'deleted'    => [],

-        ],

-        'permission' => [

-            'list'       => [],

-            'find'       => [],

-            'findby'     => [],

-            'paginate'   => [],

-            'paginateby' => [],

-            'first'      => [],

-            'search'     => [],

-            'deleted'    => [],

-        ],

-        'group' => [

-            'list'       => [],

-            'find'       => [],

-            'findby'     => [],

-            'paginate'   => [],

-            'paginateby' => [],

-            'first'      => [],

-            'search'     => [],

-            'deleted'    => [],

-        ],

-        'oauthClient' => [

-            'list'       => [],

-            'find'       => [],

-            'findby'     => [],

-            'paginate'   => [],

-            'paginateby' => [],

-            'first'      => [],

-            'search'     => [],

-            'account'    => [],

-            'group'      => [],

-            'deleted'    => [],

-        ],

-        'notification' => [

-            'list'   => [],

-            'unread' => [],

-        ],

-        'pushNotificationDevice' => [

-            'list'       => [],

-            'find'       => [],

-            'findby'     => [],

-            'paginate'   => [],

-            'paginateby' => [],

-            'first'      => [],

-            'search'     => [],

-            'deleted'    => [],

-        ],

-        'report' => [

-            'list'       => [],

-            'find'       => [],

-            'findby'     => [],

-            'paginate'   => [],

-            'paginateby' => [],

-            'first'      => [],

-            'search'     => [],

-            'deleted'    => [],

-        ],

-        'setting' => [

-            'list'       => [],

-            'find'       => [],

-            'findby'     => [],

-            'paginate'   => [],

-            'paginateby' => [],

-            'first'      => [],

-            'search'     => [],

-            'deleted'    => [],

-        ]

-    ],

+	'relations' => [

+		'user' => [

+			'list'       => [],

+			'find'       => [],

+			'findby'     => [],

+			'paginate'   => [],

+			'paginateby' => [],

+			'first'      => [],

+			'search'     => [],

+			'account'    => [],

+			'group'      => [],

+			'deleted'    => [],

+		],

+		'permission' => [

+			'list'       => [],

+			'find'       => [],

+			'findby'     => [],

+			'paginate'   => [],

+			'paginateby' => [],

+			'first'      => [],

+			'search'     => [],

+			'deleted'    => [],

+		],

+		'group' => [

+			'list'       => [],

+			'find'       => [],

+			'findby'     => [],

+			'paginate'   => [],

+			'paginateby' => [],

+			'first'      => [],

+			'search'     => [],

+			'deleted'    => [],

+		],

+		'oauthClient' => [

+			'list'       => [],

+			'find'       => [],

+			'findby'     => [],

+			'paginate'   => [],

+			'paginateby' => [],

+			'first'      => [],

+			'search'     => [],

+			'account'    => [],

+			'group'      => [],

+			'deleted'    => [],

+		],

+		'notification' => [

+			'list'   => [],

+			'unread' => [],

+		],

+		'pushNotificationDevice' => [

+			'list'       => [],

+			'find'       => [],

+			'findby'     => [],

+			'paginate'   => [],

+			'paginateby' => [],

+			'first'      => [],

+			'search'     => [],

+			'deleted'    => [],

+		],

+		'report' => [

+			'list'       => [],

+			'find'       => [],

+			'findby'     => [],

+			'paginate'   => [],

+			'paginateby' => [],

+			'first'      => [],

+			'search'     => [],

+			'deleted'    => [],

+		],

+		'setting' => [

+			'list'       => [],

+			'find'       => [],

+			'findby'     => [],

+			'paginate'   => [],

+			'paginateby' => [],

+			'first'      => [],

+			'search'     => [],

+			'deleted'    => [],

+		]

+	],

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Cache Configurations

     |--------------------------------------------------------------------------

@@ -167,46 +167,46 @@ 
     |

     */

 

-    'cache_config' => [

-        'oauthClient' => [

-            'cache' => [

-                'all',

-                'find',

-                'findBy',

-                'paginate',

-                'paginateBy',

-                'first',

-                'search',

-                'deleted'

-            ],

-            'clear' => [

-                'update'           => ['oauthClients', 'users', 'groups'],

-                'save'             => ['oauthClients', 'users', 'groups'],

-                'delete'           => ['oauthClients', 'users', 'groups'],

-                'restore'          => ['oauthClients', 'users', 'groups'],

-                'revoke'           => ['oauthClients', 'users', 'groups'],

-                'ubRevoke'         => ['oauthClients', 'users', 'groups'],

-                'regenerateSecret' => ['oauthClients', 'users', 'groups'],

-            ],

-        ],

-        'setting' => [

-            'cache' => [

-                'all',

-                'find',

-                'findBy',

-                'paginate',

-                'paginateBy',

-                'first',

-                'search',

-                'deleted'

-            ],

-            'clear' => [

-                'update'   => ['settings'],

-                'save'     => ['settings'],

-                'delete'   => ['settings'],

-                'restore'  => ['settings'],

-                'saveMany' => ['settings'],

-            ]

-        ]

-    ]

+	'cache_config' => [

+		'oauthClient' => [

+			'cache' => [

+				'all',

+				'find',

+				'findBy',

+				'paginate',

+				'paginateBy',

+				'first',

+				'search',

+				'deleted'

+			],

+			'clear' => [

+				'update'           => ['oauthClients', 'users', 'groups'],

+				'save'             => ['oauthClients', 'users', 'groups'],

+				'delete'           => ['oauthClients', 'users', 'groups'],

+				'restore'          => ['oauthClients', 'users', 'groups'],

+				'revoke'           => ['oauthClients', 'users', 'groups'],

+				'ubRevoke'         => ['oauthClients', 'users', 'groups'],

+				'regenerateSecret' => ['oauthClients', 'users', 'groups'],

+			],

+		],

+		'setting' => [

+			'cache' => [

+				'all',

+				'find',

+				'findBy',

+				'paginate',

+				'paginateBy',

+				'first',

+				'search',

+				'deleted'

+			],

+			'clear' => [

+				'update'   => ['settings'],

+				'save'     => ['settings'],

+				'delete'   => ['settings'],

+				'restore'  => ['settings'],

+				'saveMany' => ['settings'],

+			]

+		]

+	]

 ];

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

Indentation +58 added lines, -58 removed lines

@@ -11,68 +11,68 @@
 
 class CheckPermissions
 {
-    protected $route;
-    protected $auth;
-    protected $authMiddleware;
-    protected $userService;
-    protected $arr;
+	protected $route;
+	protected $auth;
+	protected $authMiddleware;
+	protected $userService;
+	protected $arr;
     
-    /**
-     * Init new object.
-     *
-     * @param   Route          $route
-     * @param   Auth           $auth
-     * @param   AuthMiddleware $authMiddleware
-     * @param   UserService    $userService
-     * @param   Arr            $arr
-     *
-     * @return  void
-     */
-    public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr)
-    {
-        $this->route = $route;
-        $this->auth = $auth;
-        $this->authMiddleware = $authMiddleware;
-        $this->userService = $userService;
-        $this->arr = $arr;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Route          $route
+	 * @param   Auth           $auth
+	 * @param   AuthMiddleware $authMiddleware
+	 * @param   UserService    $userService
+	 * @param   Arr            $arr
+	 *
+	 * @return  void
+	 */
+	public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr)
+	{
+		$this->route = $route;
+		$this->auth = $auth;
+		$this->authMiddleware = $authMiddleware;
+		$this->userService = $userService;
+		$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) {
-                    \Errors::userIsBlocked();
-                }
+				if ($user->blocked) {
+					\Errors::userIsBlocked();
+				}
     
-                if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
-                } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
-                } else {
-                    \Errors::noPermissions();
-                }
-            });
-        }
+				if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
+				} elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
+				} else {
+					\Errors::noPermissions();
+				}
+			});
+		}
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -56,8 +56,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;
     
@@ -66,7 +66,7 @@ 
                 }
     
                 if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
-                } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
+                } elseif ( ! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
                 } else {
                     \Errors::noPermissions();
                 }