SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Notifications/Http/Controllers/NotificationController.php

Indentation +56 added lines, -56 removed lines

@@ -10,65 +10,65 @@
 
 class NotificationController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['markAsRead', 'markAllAsRead', 'index', 'unread'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['markAsRead', 'markAllAsRead', 'index', 'unread'];
 
-    /**
-     * Init new object.
-     *
-     * @param   NotificationRepository $repo
-     * @param   CoreConfig             $config
-     * @return  void
-     */
-    public function __construct(NotificationRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Notifications\Http\Resources\Notification');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   NotificationRepository $repo
+	 * @param   CoreConfig             $config
+	 * @return  void
+	 */
+	public function __construct(NotificationRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Notifications\Http\Resources\Notification');
+	}
 
-    /**
-     * Retrieve all notifications of the logged in user.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->my($request->query('perPage')));
-    }
+	/**
+	 * Retrieve all notifications of the logged in user.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->my($request->query('perPage')));
+	}
 
-    /**
-     * Retrieve unread notifications of the logged in user.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function unread(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->unread($request->query('perPage')));
-    }
+	/**
+	 * Retrieve unread notifications of the logged in user.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unread(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->unread($request->query('perPage')));
+	}
 
-    /**
-     * Mark the notification as read.
-     *
-     * @param  integer  $id Id of the notification.
-     * @return \Illuminate\Http\Response
-     */
-    public function markAsRead($id)
-    {
-        return new GeneralResource($this->repo->markAsRead($id));
-    }
+	/**
+	 * Mark the notification as read.
+	 *
+	 * @param  integer  $id Id of the notification.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function markAsRead($id)
+	{
+		return new GeneralResource($this->repo->markAsRead($id));
+	}
 
-    /**
-     * Mark all notifications as read.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function markAllAsRead()
-    {
-        return new GeneralResource($this->repo->markAllAsRead());
-    }
+	/**
+	 * Mark all notifications as read.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function markAllAsRead()
+	{
+		return new GeneralResource($this->repo->markAllAsRead());
+	}
 }

src/Modules/Core/Core.php

Indentation +21 added lines, -21 removed lines

@@ -4,26 +4,26 @@
 
 class Core implements BaseFactoryInterface
 {
-    /**
-     * Construct the repository class name based on
-     * the method name called, search in the
-     * given namespaces for the class and
-     * return an instance.
-     *
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'] ;
-            $model = ucfirst(\Str::singular($name));
-            $class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
+	/**
+	 * Construct the repository class name based on
+	 * the method name called, search in the
+	 * given namespaces for the class and
+	 * return an instance.
+	 *
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		foreach (\Module::all() as $module) {
+			$nameSpace = 'App\\Modules\\' . $module['basename'] ;
+			$model = ucfirst(\Str::singular($name));
+			$class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
 
-            if (class_exists($class)) {
-                return \App::make($class);
-            }
-        }
-    }
+			if (class_exists($class)) {
+				return \App::make($class);
+			}
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -17,9 +17,9 @@
     public function __call($name, $arguments)
     {
         foreach (\Module::all() as $module) {
-            $nameSpace = 'App\\Modules\\' . $module['basename'] ;
+            $nameSpace = 'App\\Modules\\'.$module['basename'];
             $model = ucfirst(\Str::singular($name));
-            $class = $nameSpace . '\\Repositories\\' . $model . 'Repository';
+            $class = $nameSpace.'\\Repositories\\'.$model.'Repository';
 
             if (class_exists($class)) {
                 return \App::make($class);

src/Modules/Core/Routes/api.php

Indentation +7 added lines, -7 removed lines

@@ -13,11 +13,11 @@
 
 Route::group(['prefix' => 'settings'], function () {
         
-    Route::get('/', 'SettingController@index');
-    Route::get('/{id}', 'SettingController@find');
-    Route::put('/', 'SettingController@update');
-    Route::delete('/{id}', 'SettingController@delete');
-    Route::get('list/deleted', 'SettingController@deleted');
-    Route::patch('restore/{id}', 'SettingController@restore');
-    Route::post('save/many', 'SettingController@saveMany');
+	Route::get('/', 'SettingController@index');
+	Route::get('/{id}', 'SettingController@find');
+	Route::put('/', 'SettingController@update');
+	Route::delete('/{id}', 'SettingController@delete');
+	Route::get('list/deleted', 'SettingController@deleted');
+	Route::patch('restore/{id}', 'SettingController@restore');
+	Route::post('save/many', 'SettingController@saveMany');
 });
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 |
 */
 
-Route::group(['prefix' => 'settings'], function () {
+Route::group(['prefix' => 'settings'], function() {
         
     Route::get('/', 'SettingController@index');
     Route::get('/{id}', 'SettingController@find');

src/Modules/Core/Providers/ModuleServiceProvider.php

Indentation +48 added lines, -48 removed lines

@@ -6,53 +6,53 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
-
-        $this->loadMigrationsFrom(module_path('core', 'Database/Migrations', 'app'));
-        $this->loadFactoriesFrom(module_path('core', 'Database/Factories', 'app'));
-    }
-
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //Bind Core Facade to the Service Container
-        $this->app->singleton('Core', function () {
-            return new \App\Modules\Core\Core;
-        });
-
-        //Bind ErrorHandler Facade to the Service Container
-        $this->app->singleton('ErrorHandler', function () {
-            return new \App\Modules\Core\Utl\ErrorHandler;
-        });
-
-        //Bind CoreConfig Facade to the Service Container
-        $this->app->singleton('CoreConfig', function () {
-            return new \App\Modules\Core\Utl\CoreConfig;
-        });
-
-        //Bind Media Facade to the Service Container
-        $this->app->singleton('Media', function () {
-            return new \App\Modules\Core\Utl\Media;
-        });
-
-        //Bind ApiConsumer Facade to the Service Container
-        $this->app->singleton('ApiConsumer', function () {
-            $app = app();
-            return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
-        });
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
+
+		$this->loadMigrationsFrom(module_path('core', 'Database/Migrations', 'app'));
+		$this->loadFactoriesFrom(module_path('core', 'Database/Factories', 'app'));
+	}
+
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//Bind Core Facade to the Service Container
+		$this->app->singleton('Core', function () {
+			return new \App\Modules\Core\Core;
+		});
+
+		//Bind ErrorHandler Facade to the Service Container
+		$this->app->singleton('ErrorHandler', function () {
+			return new \App\Modules\Core\Utl\ErrorHandler;
+		});
+
+		//Bind CoreConfig Facade to the Service Container
+		$this->app->singleton('CoreConfig', function () {
+			return new \App\Modules\Core\Utl\CoreConfig;
+		});
+
+		//Bind Media Facade to the Service Container
+		$this->app->singleton('Media', function () {
+			return new \App\Modules\Core\Utl\Media;
+		});
+
+		//Bind ApiConsumer Facade to the Service Container
+		$this->app->singleton('ApiConsumer', function () {
+			$app = app();
+			return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
+		});
         
-        $this->app->register(RouteServiceProvider::class);
-    }
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -28,27 +28,27 @@
     public function register()
     {
         //Bind Core Facade to the Service Container
-        $this->app->singleton('Core', function () {
+        $this->app->singleton('Core', function() {
             return new \App\Modules\Core\Core;
         });
 
         //Bind ErrorHandler Facade to the Service Container
-        $this->app->singleton('ErrorHandler', function () {
+        $this->app->singleton('ErrorHandler', function() {
             return new \App\Modules\Core\Utl\ErrorHandler;
         });
 
         //Bind CoreConfig Facade to the Service Container
-        $this->app->singleton('CoreConfig', function () {
+        $this->app->singleton('CoreConfig', function() {
             return new \App\Modules\Core\Utl\CoreConfig;
         });
 
         //Bind Media Facade to the Service Container
-        $this->app->singleton('Media', function () {
+        $this->app->singleton('Media', function() {
             return new \App\Modules\Core\Utl\Media;
         });
 
         //Bind ApiConsumer Facade to the Service Container
-        $this->app->singleton('ApiConsumer', function () {
+        $this->app->singleton('ApiConsumer', function() {
             $app = app();
             return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
         });

src/Modules/Core/Decorators/CachingDecorator.php

Indentation +100 added lines, -100 removed lines

@@ -5,116 +5,116 @@
 
 class CachingDecorator
 {
-    /**
-     * The repo implementation.
-     *
-     * @var string
-     */
-    public $repo;
+	/**
+	 * The repo implementation.
+	 *
+	 * @var string
+	 */
+	public $repo;
 
-    /**
-     * The cache implementation.
-     *
-     * @var object
-     */
-    protected $cache;
+	/**
+	 * The cache implementation.
+	 *
+	 * @var object
+	 */
+	protected $cache;
 
-    /**
-     * The modelKey implementation.
-     *
-     * @var string
-     */
-    public $modelKey;
+	/**
+	 * The modelKey implementation.
+	 *
+	 * @var string
+	 */
+	public $modelKey;
 
-    /**
-     * The model implementation.
-     *
-     * @var string
-     */
-    public $model;
+	/**
+	 * The model implementation.
+	 *
+	 * @var string
+	 */
+	public $model;
 
-    /**
-     * The modelClass implementation.
-     *
-     * @var string
-     */
-    public $modelClass;
+	/**
+	 * The modelClass implementation.
+	 *
+	 * @var string
+	 */
+	public $modelClass;
 
-    /**
-     * The cacheConfig implementation.
-     *
-     * @var mixed
-     */
-    public $cacheConfig;
+	/**
+	 * The cacheConfig implementation.
+	 *
+	 * @var mixed
+	 */
+	public $cacheConfig;
 
-    /**
-     * The cacheTag implementation.
-     *
-     * @var string
-     */
-    public $cacheTag;
+	/**
+	 * The cacheTag implementation.
+	 *
+	 * @var string
+	 */
+	public $cacheTag;
     
-    /**
-     * Init new object.
-     *
-     * @param  string $repo
-     * @param  Cache  $cache
-     *
-     * @return  void
-     */
-    public function __construct($repo, Cache $cache)
-    {
-        $this->repo       = $repo;
-        $this->cache      = $cache;
-        $this->model      = $this->repo->model;
-        $this->modelClass = get_class($this->model);
-        $repoClass        = explode('\\', get_class($this->repo));
-        $repoName         = end($repoClass);
-        $this->cacheTag   = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository')));
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param  string $repo
+	 * @param  Cache  $cache
+	 *
+	 * @return  void
+	 */
+	public function __construct($repo, Cache $cache)
+	{
+		$this->repo       = $repo;
+		$this->cache      = $cache;
+		$this->model      = $this->repo->model;
+		$this->modelClass = get_class($this->model);
+		$repoClass        = explode('\\', get_class($this->repo));
+		$repoName         = end($repoClass);
+		$this->cacheTag   = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository')));
+	}
 
-    /**
-     * Handle the cache mechanism for the called method
-     * based the configurations.
-     *
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        $this->setCacheConfig($name);
+	/**
+	 * Handle the cache mechanism for the called method
+	 * based the configurations.
+	 *
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		$this->setCacheConfig($name);
 
-        if ($this->cacheConfig && $this->cacheConfig == 'cache') {
-            $page     = \Request::get('page') !== null ? \Request::get('page') : '1';
-            $cacheKey = $name.$page.\Session::get('locale').serialize($arguments);
-            return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) {
-                return call_user_func_array([$this->repo, $name], $arguments);
-            });
-        } elseif ($this->cacheConfig) {
-            $this->cache->tags($this->cacheConfig)->flush();
-            return call_user_func_array([$this->repo, $name], $arguments);
-        }
+		if ($this->cacheConfig && $this->cacheConfig == 'cache') {
+			$page     = \Request::get('page') !== null ? \Request::get('page') : '1';
+			$cacheKey = $name.$page.\Session::get('locale').serialize($arguments);
+			return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) {
+				return call_user_func_array([$this->repo, $name], $arguments);
+			});
+		} elseif ($this->cacheConfig) {
+			$this->cache->tags($this->cacheConfig)->flush();
+			return call_user_func_array([$this->repo, $name], $arguments);
+		}
 
-        return call_user_func_array([$this->repo, $name], $arguments);
-    }
+		return call_user_func_array([$this->repo, $name], $arguments);
+	}
 
-    /**
-     * Set cache config based on the called method.
-     *
-     * @param  string $name
-     * @return void
-     */
-    private function setCacheConfig($name)
-    {
-        $config            = \CoreConfig::getConfig();
-        $cacheConfig       = Arr::get($config['cacheConfig'], $this->cacheTag, false);
-        $this->cacheConfig = false;
+	/**
+	 * Set cache config based on the called method.
+	 *
+	 * @param  string $name
+	 * @return void
+	 */
+	private function setCacheConfig($name)
+	{
+		$config            = \CoreConfig::getConfig();
+		$cacheConfig       = Arr::get($config['cacheConfig'], $this->cacheTag, false);
+		$this->cacheConfig = false;
 
-        if ($cacheConfig && in_array($name, $cacheConfig['cache'])) {
-            $this->cacheConfig = 'cache';
-        } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) {
-            $this->cacheConfig = $cacheConfig['clear'][$name];
-        }
-    }
+		if ($cacheConfig && in_array($name, $cacheConfig['cache'])) {
+			$this->cacheConfig = 'cache';
+		} elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) {
+			$this->cacheConfig = $cacheConfig['clear'][$name];
+		}
+	}
 }

src/Modules/Core/BaseClasses/BaseApiController.php

Indentation +199 added lines, -199 removed lines

@@ -10,204 +10,204 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The config implementation.
-     *
-     * @var array
-     */
-    protected $config;
-
-    /**
-     * The relations implementation.
-     *
-     * @var array
-     */
-    protected $relations;
-
-    /**
-     * The repo implementation.
-     *
-     * @var object
-     */
-    protected $repo;
-
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $repo
-     * @param   CoreConfig $config
-     * @param   string     $modelResource
-     * @return  void
-     */
-    public function __construct($repo, $config, $modelResource)
-    {
-        $this->repo = new CachingDecorator($repo, \App::make('Illuminate\Contracts\Cache\Repository'));
-        $this->modelResource = $modelResource;
-        $this->config = $config->getConfig();
-        $this->modelName = explode('\\', get_called_class());
-        $this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
-        $this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
-        $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
-        $this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
-        $route = explode('@', \Route::currentRouteAction())[1];
-
-        $this->setSessions();
-        $this->checkPermission($route);
-        $this->setRelations($route);
-    }
-
-    /**
-     * 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($this->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
-    }
-
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function find($id)
-    {
-        return new $this->modelResource($this->repo->find($id, $this->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));
-    }
-
-    /**
-     * 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));
-    }
-
-    /**
-     * Check if the logged in user can do the given permission.
-     *
-     * @param  string $permission
-     * @return void
-     */
-    private function checkPermission($permission)
-    {
-        \Auth::shouldUse('api');
-        $this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
+	/**
+	 * The config implementation.
+	 *
+	 * @var array
+	 */
+	protected $config;
+
+	/**
+	 * The relations implementation.
+	 *
+	 * @var array
+	 */
+	protected $relations;
+
+	/**
+	 * The repo implementation.
+	 *
+	 * @var object
+	 */
+	protected $repo;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $repo
+	 * @param   CoreConfig $config
+	 * @param   string     $modelResource
+	 * @return  void
+	 */
+	public function __construct($repo, $config, $modelResource)
+	{
+		$this->repo = new CachingDecorator($repo, \App::make('Illuminate\Contracts\Cache\Repository'));
+		$this->modelResource = $modelResource;
+		$this->config = $config->getConfig();
+		$this->modelName = explode('\\', get_called_class());
+		$this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
+		$this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
+		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
+		$this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
+		$route = explode('@', \Route::currentRouteAction())[1];
+
+		$this->setSessions();
+		$this->checkPermission($route);
+		$this->setRelations($route);
+	}
+
+	/**
+	 * 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($this->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
+	}
+
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function find($id)
+	{
+		return new $this->modelResource($this->repo->find($id, $this->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));
+	}
+
+	/**
+	 * 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));
+	}
+
+	/**
+	 * Check if the logged in user can do the given permission.
+	 *
+	 * @param  string $permission
+	 * @return void
+	 */
+	private function checkPermission($permission)
+	{
+		\Auth::shouldUse('api');
+		$this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
         
-        if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
-            $user             = \Auth::user();
-            $isPasswordClient = $user->token()->client->password_client;
-            $this->updateLocaleAndTimezone($user);
-
-            if ($user->blocked) {
-                \ErrorHandler::userIsBlocked();
-            }
-
-            if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
-            } else {
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
-
-    /**
-     * Set sessions based on the given headers in the request.
-     *
-     * @return void
-     */
-    private function setSessions()
-    {
-        \Session::put('time-zone', \Request::header('time-zone') ?: 0);
-
-        $locale = \Request::header('locale');
-        switch ($locale) {
-            case 'en':
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-
-            case 'ar':
-                \App::setLocale('ar');
-                \Session::put('locale', 'ar');
-                break;
-
-            case 'all':
-                \App::setLocale('en');
-                \Session::put('locale', 'all');
-                break;
-
-            default:
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-        }
-    }
-
-    /**
-     * Set relation based on the called api.
-     *
-     * @param  string $route
-     * @return void
-     */
-    private function setRelations($route)
-    {
-        $route           = $route !== 'index' ? $route : 'list';
-        $relations       = Arr::get($this->config['relations'], $this->modelName, false);
-        $this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
-    }
-
-    /**
-     * Update the logged in user locale and time zone.
-     *
-     * @param  object $user
-     * @return void
-     */
-    private function updateLocaleAndTimezone($user)
-    {
-        $update   = false;
-        $locale   = \Session::get('locale');
-        $timezone = \Session::get('time-zone');
-        if ($locale && $locale !== 'all' && $locale !== $user->locale) {
-            $user->locale = $locale;
-            $update       = true;
-        }
-
-        if ($timezone && $timezone !== $user->timezone) {
-            $user->timezone = $timezone;
-            $update       = true;
-        }
-
-        if ($update) {
-            $user->save();
-        }
-    }
+		if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
+			$user             = \Auth::user();
+			$isPasswordClient = $user->token()->client->password_client;
+			$this->updateLocaleAndTimezone($user);
+
+			if ($user->blocked) {
+				\ErrorHandler::userIsBlocked();
+			}
+
+			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
+			} elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
+			} else {
+				\ErrorHandler::noPermissions();
+			}
+		}
+	}
+
+	/**
+	 * Set sessions based on the given headers in the request.
+	 *
+	 * @return void
+	 */
+	private function setSessions()
+	{
+		\Session::put('time-zone', \Request::header('time-zone') ?: 0);
+
+		$locale = \Request::header('locale');
+		switch ($locale) {
+			case 'en':
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+
+			case 'ar':
+				\App::setLocale('ar');
+				\Session::put('locale', 'ar');
+				break;
+
+			case 'all':
+				\App::setLocale('en');
+				\Session::put('locale', 'all');
+				break;
+
+			default:
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+		}
+	}
+
+	/**
+	 * Set relation based on the called api.
+	 *
+	 * @param  string $route
+	 * @return void
+	 */
+	private function setRelations($route)
+	{
+		$route           = $route !== 'index' ? $route : 'list';
+		$relations       = Arr::get($this->config['relations'], $this->modelName, false);
+		$this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	}
+
+	/**
+	 * Update the logged in user locale and time zone.
+	 *
+	 * @param  object $user
+	 * @return void
+	 */
+	private function updateLocaleAndTimezone($user)
+	{
+		$update   = false;
+		$locale   = \Session::get('locale');
+		$timezone = \Session::get('time-zone');
+		if ($locale && $locale !== 'all' && $locale !== $user->locale) {
+			$user->locale = $locale;
+			$update       = true;
+		}
+
+		if ($timezone && $timezone !== $user->timezone) {
+			$user->timezone = $timezone;
+			$update       = true;
+		}
+
+		if ($update) {
+			$user->save();
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
         \Auth::shouldUse('api');
         $this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
         
-        if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
+        if ( ! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
             $user             = \Auth::user();
             $isPasswordClient = $user->token()->client->password_client;
             $this->updateLocaleAndTimezone($user);
@@ -132,7 +132,7 @@ 
             }
 
             if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
+            } elseif ( ! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
             } else {
                 \ErrorHandler::noPermissions();
             }
@@ -203,7 +203,7 @@ 
 
         if ($timezone && $timezone !== $user->timezone) {
             $user->timezone = $timezone;
-            $update       = true;
+            $update = true;
         }
 
         if ($update) {

src/Modules/Core/Http/Resources/Setting.php

Indentation +26 added lines, -26 removed lines

@@ -6,32 +6,32 @@
 
 class Setting extends JsonResource
 {
-    /**
-     * Indicates if the resource's collection keys should be preserved.
-     *
-     * @var bool
-     */
-    public $preserveKeys = true;
+	/**
+	 * Indicates if the resource's collection keys should be preserved.
+	 *
+	 * @var bool
+	 */
+	public $preserveKeys = true;
 
-    /**
-     * Transform the resource into an array.
-     *
-     * @param Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        if (! $this->resource) {
-            return [];
-        }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param Request $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		if (! $this->resource) {
+			return [];
+		}
 
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'value' => $this->value,
-            'key' => $this->key,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ];
-    }
+		return [
+			'id' => $this->id,
+			'name' => $this->name,
+			'value' => $this->value,
+			'key' => $this->key,
+			'created_at' => $this->created_at,
+			'updated_at' => $this->updated_at,
+		];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      */
     public function toArray($request)
     {
-        if (! $this->resource) {
+        if ( ! $this->resource) {
             return [];
         }
 

src/Modules/Reporting/Routes/api.php

Indentation +8 added lines, -8 removed lines

@@ -13,12 +13,12 @@
 
 Route::group(['prefix' => 'reports'], function () {
         
-    Route::get('/', 'ReportController@index');
-    Route::get('/{id}', 'ReportController@find');
-    Route::post('/', 'ReportController@insert');
-    Route::put('/', 'ReportController@update');
-    Route::delete('/{id}', 'ReportController@delete');
-    Route::get('list/deleted', 'ReportController@deleted');
-    Route::patch('restore/{id}', 'ReportController@restore');
-    Route::post('get/{reportName}', 'ReportController@getReport');
+	Route::get('/', 'ReportController@index');
+	Route::get('/{id}', 'ReportController@find');
+	Route::post('/', 'ReportController@insert');
+	Route::put('/', 'ReportController@update');
+	Route::delete('/{id}', 'ReportController@delete');
+	Route::get('list/deleted', 'ReportController@deleted');
+	Route::patch('restore/{id}', 'ReportController@restore');
+	Route::post('get/{reportName}', 'ReportController@getReport');
 });
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 |
 */
 
-Route::group(['prefix' => 'reports'], function () {
+Route::group(['prefix' => 'reports'], function() {
         
     Route::get('/', 'ReportController@index');
     Route::get('/{id}', 'ReportController@find');

src/Modules/Reporting/Providers/ModuleServiceProvider.php

Indentation +21 added lines, -21 removed lines

@@ -6,27 +6,27 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting');
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting');
 
-        $this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app'));
-        $this->loadFactoriesFrom(module_path('reporting', 'Database/Factories', 'app'));
-    }
+		$this->loadMigrationsFrom(module_path('reporting', 'Database/Migrations', 'app'));
+		$this->loadFactoriesFrom(module_path('reporting', 'Database/Factories', 'app'));
+	}
 
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->register(RouteServiceProvider::class);
-    }
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app->register(RouteServiceProvider::class);
+	}
 }