SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Core/Http/Controllers/BaseApiController.php

Braces +3 added lines, -6 removed lines

@@ -173,8 +173,7 @@ 
             if ($request->has('id')) 
             {
                 $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
+            } else
             {
                 $rule = str_replace(',{id}', '', $rule);
             }
@@ -252,10 +251,8 @@ 
             }
 
             if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
-            {}
-            elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
-            {}
-            else
+            {} elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
+            {} else
             {
 
                 \ErrorHandler::noPermissions();

Indentation +247 added lines, -247 removed lines

@@ -6,282 +6,282 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The config implementation.
-     * 
-     * @var array
-     */
-    protected $config;
+	/**
+	 * The config implementation.
+	 * 
+	 * @var array
+	 */
+	protected $config;
 
-    /**
-     * 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;
 
-    public function __construct()
-    {        
-        $this->config              = \CoreConfig::getConfig();
-        $this->model               = property_exists($this, 'model') ? $this->model : false;
-        $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];
+	public function __construct()
+	{        
+		$this->config              = \CoreConfig::getConfig();
+		$this->model               = property_exists($this, 'model') ? $this->model : false;
+		$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->middleware(function ($request, $next) {
+		$this->middleware(function ($request, $next) {
             
-            $this->repo = call_user_func_array("\Core::{$this->model}", []);            
-            return $next($request);
-        });
+			$this->repo = call_user_func_array("\Core::{$this->model}", []);            
+			return $next($request);
+		});
 
-        $this->checkPermission($route);
-        $this->setRelations($route);
-        $this->setSessions();
-    }
+		$this->checkPermission($route);
+		$this->setRelations($route);
+		$this->setSessions();
+	}
 
-    /**
-     * Fetch all records with relations from storage.
-     * 
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function index($sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->all($this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Fetch all records with relations from storage.
+	 * 
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index($sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->all($this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * 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 \Response::json($this->repo->find($id, $this->relations), 200);
-    }
+	/**
+	 * 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 \Response::json($this->repo->find($id, $this->relations), 200);
+	}
 
-    /**
-     * Paginate all records with relations from storage
-     * that matche the given query.
-     * 
-     * @param  string  $query   The search text.
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Paginate all records with relations from storage
+	 * that matche the given query.
+	 * 
+	 * @param  string  $query   The search text.
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $sortBy The name of the column to sort by.
-     * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $sortBy The name of the column to sort by.
+	 * @param  boolean $desc   Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function first(Request $request) 
-    {
-        return \Response::json($this->repo->first($request->all(), $this->relations), 200);
-    }
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function first(Request $request) 
+	{
+		return \Response::json($this->repo->first($request->all(), $this->relations), 200);
+	}
 
-    /**
-     * Paginate all records with relations from storage.
-     * 
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->paginate($perPage, $this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Paginate all records with relations from storage.
+	 * 
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->paginate($perPage, $this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
-    }
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Save the given model to storage.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function save(Request $request) 
-    {
-        foreach ($this->validationRules as &$rule) 
-        {
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
-            {
-                $rule .= ',deleted_at,NULL';
-            }
+	/**
+	 * Save the given model to storage.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function save(Request $request) 
+	{
+		foreach ($this->validationRules as &$rule) 
+		{
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
+			{
+				$rule .= ',deleted_at,NULL';
+			}
 
-            if ($request->has('id')) 
-            {
-                $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
-            {
-                $rule = str_replace(',{id}', '', $rule);
-            }
-        }
+			if ($request->has('id')) 
+			{
+				$rule = str_replace('{id}', $request->get('id'), $rule);
+			}
+			else
+			{
+				$rule = str_replace(',{id}', '', $rule);
+			}
+		}
         
-        $this->validate($request, $this->validationRules);
+		$this->validate($request, $this->validationRules);
 
-        return \Response::json($this->repo->save($request->all()), 200);
-    }
+		return \Response::json($this->repo->save($request->all()), 200);
+	}
 
-    /**
-     * Delete by the given id from storage.
-     * 
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id) 
-    {
-        return \Response::json($this->repo->delete($id), 200);
-    }
+	/**
+	 * Delete by the given id from storage.
+	 * 
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id) 
+	{
+		return \Response::json($this->repo->delete($id), 200);
+	}
 
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage Number of rows per page default 15.
-     * @param  string  $sortBy  The name of the column to sort by.
-     * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
-     * @return \Illuminate\Http\Response
-     */
-    public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json($this->repo->deleted($request->all(), $perPage, $sortBy, $desc), 200);
-    }
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage Number of rows per page default 15.
+	 * @param  string  $sortBy  The name of the column to sort by.
+	 * @param  boolean $desc    Sort ascending or descinding (1: desc, 0: asc).
+	 * @return \Illuminate\Http\Response
+	 */
+	public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json($this->repo->deleted($request->all(), $perPage, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Restore the deleted model.
-     * 
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id) 
-    {
-        return \Response::json($this->repo->restore($id), 200);
-    }
+	/**
+	 * Restore the deleted model.
+	 * 
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id) 
+	{
+		return \Response::json($this->repo->restore($id), 200);
+	}
 
-    /**
-     * 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]);
+	/**
+	 * 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 ($user = \Auth::user()) 
-        {
-            $permission       = $permission !== 'index' ? $permission : 'list';
-            $isPasswordClient = $user->token()->client->password_client;
+		if ($user = \Auth::user()) 
+		{
+			$permission       = $permission !== 'index' ? $permission : 'list';
+			$isPasswordClient = $user->token()->client->password_client;
 
-            if ($user->blocked)
-            {
-                \ErrorHandler::userIsBlocked();
-            }
+			if ($user->blocked)
+			{
+				\ErrorHandler::userIsBlocked();
+			}
 
-            if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
-            {}
-            elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
-            {}
-            else
-            {
+			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
+			{}
+			elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
+			{}
+			else
+			{
 
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
+				\ErrorHandler::noPermissions();
+			}
+		}
+	}
 
-    /**
-     * Set sessions based on the given headers in the request.
-     * 
-     * @return void
-     */
-    private function setSessions()
-    {
-        \Session::put('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
+	/**
+	 * Set sessions based on the given headers in the request.
+	 * 
+	 * @return void
+	 */
+	private function setSessions()
+	{
+		\Session::put('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
 
-        $locale = \Request::header('locale');
-        switch ($locale) 
-        {
-            case 'en':
-            \App::setLocale('en');
-            \Session::put('locale', 'en');
-            break;
+		$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 'ar':
+			\App::setLocale('ar');
+			\Session::put('locale', 'ar');
+			break;
 
-            case 'all':
-            \App::setLocale('en');
-            \Session::put('locale', 'all');
-            break;
+			case 'all':
+			\App::setLocale('en');
+			\Session::put('locale', 'all');
+			break;
 
-            default:
-            \App::setLocale('en');
-            \Session::put('locale', 'en');
-            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       = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
-        $this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
-    }
+	/**
+	 * Set relation based on the called api.
+	 * 
+	 * @param  string $route
+	 * @return void
+	 */
+	private function setRelations($route)
+	{
+		$route           = $route !== 'index' ? $route : 'list';
+		$relations       = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
+		$this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@ 
         $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];
+        $route                     = explode('@', \Route::currentRouteAction())[1];
 
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             
             $this->repo = call_user_func_array("\Core::{$this->model}", []);            
             return $next($request);
@@ -228,7 +228,7 @@ 
 
             if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
             {}
-            elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
+            elseif ( ! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) 
             {}
             else
             {

src/Modules/V1/Acl/Database/Seeds/OauthClientsTableSeeder.php

Indentation +78 added lines, -78 removed lines

@@ -6,82 +6,82 @@
 
 class OauthClientsTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-    	/**
-         * Insert the permissions related to oauthClients table.
-         */
-        \DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Users model permissions.
-        		 */
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'revoke',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'unRevoke',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'save',
-	        	'model'      => 'oauthClients',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	]
-        	]
-        );
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Insert the permissions related to oauthClients table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Users model permissions.
+				 */
+				[
+				'name'       => 'list',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'revoke',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'unRevoke',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'save',
+				'model'      => 'oauthClients',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

src/Modules/V1/Acl/Repositories/OauthClientRepository.php

Indentation +31 added lines, -31 removed lines

@@ -4,37 +4,37 @@
 
 class OauthClientRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Acl\OauthClient';
-    }
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Acl\OauthClient';
+	}
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function revoke($clientId)
-    {
-        $client = $this->find($clientId);
-        $client->tokens()->update(['revoked' => true]);
-        $this->save(['id'=> $clientId, 'revoked' => true]);
-    }
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function revoke($clientId)
+	{
+		$client = $this->find($clientId);
+		$client->tokens()->update(['revoked' => true]);
+		$this->save(['id'=> $clientId, 'revoked' => true]);
+	}
 
-    /**
-     * Un revoke the given client.
-     *
-     * @param  integer  $clientId
-     * @return void
-     */
-    public function unRevoke($clientId)
-    {
-        $this->save(['id'=> $clientId, 'revoked' => false]);
-    }
+	/**
+	 * Un revoke the given client.
+	 *
+	 * @param  integer  $clientId
+	 * @return void
+	 */
+	public function unRevoke($clientId)
+	{
+		$this->save(['id'=> $clientId, 'revoked' => false]);
+	}
 }

src/Modules/V1/Acl/Http/Controllers/OauthClientsController.php

Indentation +37 added lines, -37 removed lines

@@ -8,44 +8,44 @@
 
 class OauthClientsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model               = 'oauthClients';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'oauthClients';
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-        'name'     => 'required|max:255',
-        'redirect' => 'required|url',
-        'user_id'  => 'required|exists:users,id',
-        'revoked'  => 'boolean'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+		'name'     => 'required|max:255',
+		'redirect' => 'required|url',
+		'user_id'  => 'required|exists:users,id',
+		'revoked'  => 'boolean'
+	];
 
-    /**
-     * Revoke the given client.
-     *
-     * @param  integer  $clientId Id of the client
-     * @return \Illuminate\Http\Response
-     */
-    public function revoke($clientId)
-    {
-        return \Response::json($this->repo->revoke($clientId), 200);
-    }
+	/**
+	 * Revoke the given client.
+	 *
+	 * @param  integer  $clientId Id of the client
+	 * @return \Illuminate\Http\Response
+	 */
+	public function revoke($clientId)
+	{
+		return \Response::json($this->repo->revoke($clientId), 200);
+	}
 
-    /**
-     * Un revoke the given client.
-     *
-     * @param  integer  $clientId Id of the client
-     * @return \Illuminate\Http\Response
-     */
-    public function unRevoke($clientId)
-    {
-        return \Response::json($this->repo->unRevoke($clientId), 200);
-    }
+	/**
+	 * Un revoke the given client.
+	 *
+	 * @param  integer  $clientId Id of the client
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unRevoke($clientId)
+	{
+		return \Response::json($this->repo->unRevoke($clientId), 200);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -13,14 +13,14 @@
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model               = 'oauthClients';
+    protected $model = 'oauthClients';
 
     /**
      * The validations rules used by the base api controller
      * to check before add.
      * @var array
      */
-    protected $validationRules  = [
+    protected $validationRules = [
         'name'     => 'required|max:255',
         'redirect' => 'required|url',
         'user_id'  => 'required|exists:users,id',

src/Modules/V1/Acl/Proxy/LoginProxy.php

Indentation +101 added lines, -101 removed lines

@@ -5,105 +5,105 @@
 
 class LoginProxy
 {
-    private $apiConsumer;
-
-    private $auth;
-
-    private $db;
-
-    private $request;
-
-    private $userRepository;
-
-    public function __construct(Application $app) 
-    {
-
-        $this->userRepository = $app->make('App\Modules\V1\Acl\Repositories\UserRepository');
-        $this->apiConsumer    = $app->make('apiconsumer');
-        $this->auth           = $app->make('auth');
-        $this->db             = $app->make('db');
-        $this->request        = $app->make('request');
-    }
-
-    /**
-     * Attempt to create an access token using user credentials.
-     *
-     * @param  array   $credentials
-     * @param  boolean $adminLogin
-     * @return array
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        $this->userRepository->login($credentials, $adminLogin);
-
-        return $this->proxy('password', [
-            'username' => $credentials['email'],
-            'password' => $credentials['password']
-        ]);
-    }
-
-    /**
-     * Attempt to refresh the access token useing the given refresh token.
-     * 
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshtoken($refreshToken)
-    {
-        return $this->proxy('refresh_token', [
-            'refresh_token' => $refreshToken
-        ]);
-    }
-
-    /**
-     * Proxy a request to the OAuth server.
-     *
-     * @param string $grantType what type of grant type should be proxied
-     * @param array 
-     */
-    public function proxy($grantType, array $data = [])
-    {
-        $data = array_merge($data, [
-            'client_id'     => env('PASSWORD_CLIENT_ID'),
-            'client_secret' => env('PASSWORD_CLIENT_SECRET'),
-            'grant_type'    => $grantType
-        ]);
-
-        $response = $this->apiConsumer->post('/oauth/token', $data);
-
-        if ( ! $response->isSuccessful()) 
-        {
-            if ($grantType == 'refresh_token') 
-            {
-                \ErrorHandler::invalidRefreshToken();
-            }
-
-            \ErrorHandler::loginFailed();
-        }
-
-        $data = json_decode($response->getContent());
-
-        return [
-            'access_token'  => $data->access_token,
-            'refresh_token' => $data->refresh_token,
-            'expires_in'    => $data->expires_in
-        ];
-    }
-
-    /**
-     * Logs out the user. We revoke access token and refresh token.
-     */
-    public function logout()
-    {
-        $accessToken = $this->auth->user()->token();
-
-        $this->db
-            ->table('oauth_refresh_tokens')
-            ->where('access_token_id', $accessToken->id)
-            ->update([
-                'revoked' => true
-            ]);
-
-        $accessToken->revoke();
-    }
+	private $apiConsumer;
+
+	private $auth;
+
+	private $db;
+
+	private $request;
+
+	private $userRepository;
+
+	public function __construct(Application $app) 
+	{
+
+		$this->userRepository = $app->make('App\Modules\V1\Acl\Repositories\UserRepository');
+		$this->apiConsumer    = $app->make('apiconsumer');
+		$this->auth           = $app->make('auth');
+		$this->db             = $app->make('db');
+		$this->request        = $app->make('request');
+	}
+
+	/**
+	 * Attempt to create an access token using user credentials.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return array
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		$this->userRepository->login($credentials, $adminLogin);
+
+		return $this->proxy('password', [
+			'username' => $credentials['email'],
+			'password' => $credentials['password']
+		]);
+	}
+
+	/**
+	 * Attempt to refresh the access token useing the given refresh token.
+	 * 
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshtoken($refreshToken)
+	{
+		return $this->proxy('refresh_token', [
+			'refresh_token' => $refreshToken
+		]);
+	}
+
+	/**
+	 * Proxy a request to the OAuth server.
+	 *
+	 * @param string $grantType what type of grant type should be proxied
+	 * @param array 
+	 */
+	public function proxy($grantType, array $data = [])
+	{
+		$data = array_merge($data, [
+			'client_id'     => env('PASSWORD_CLIENT_ID'),
+			'client_secret' => env('PASSWORD_CLIENT_SECRET'),
+			'grant_type'    => $grantType
+		]);
+
+		$response = $this->apiConsumer->post('/oauth/token', $data);
+
+		if ( ! $response->isSuccessful()) 
+		{
+			if ($grantType == 'refresh_token') 
+			{
+				\ErrorHandler::invalidRefreshToken();
+			}
+
+			\ErrorHandler::loginFailed();
+		}
+
+		$data = json_decode($response->getContent());
+
+		return [
+			'access_token'  => $data->access_token,
+			'refresh_token' => $data->refresh_token,
+			'expires_in'    => $data->expires_in
+		];
+	}
+
+	/**
+	 * Logs out the user. We revoke access token and refresh token.
+	 */
+	public function logout()
+	{
+		$accessToken = $this->auth->user()->token();
+
+		$this->db
+			->table('oauth_refresh_tokens')
+			->where('access_token_id', $accessToken->id)
+			->update([
+				'revoked' => true
+			]);
+
+		$accessToken->revoke();
+	}
 }
\ No newline at end of file

src/Modules/V1/Reporting/Repositories/ReportRepository.php

Indentation +60 added lines, -60 removed lines

@@ -4,67 +4,67 @@
 
 class ReportRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Reporting\Report';
-    }
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Reporting\Report';
+	}
 
-    /**
-     * Render the given report db view based on the given
-     * condition.
-     *
-     * @param  string  $reportName
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  boolean   $skipPermission
-     * @return object
-     */
-    public function getReport($reportName, $conditions = false, $perPage = 0, $relations = [], $skipPermission = false)
-    {
-        /**
-         * Fetch the report from db.
-         */
-        $reportConditions = $this->constructConditions(['report_name' => $reportName], $this->model);
-        $report           = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first();
+	/**
+	 * Render the given report db view based on the given
+	 * condition.
+	 *
+	 * @param  string  $reportName
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  boolean   $skipPermission
+	 * @return object
+	 */
+	public function getReport($reportName, $conditions = false, $perPage = 0, $relations = [], $skipPermission = false)
+	{
+		/**
+		 * Fetch the report from db.
+		 */
+		$reportConditions = $this->constructConditions(['report_name' => $reportName], $this->model);
+		$report           = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first();
         
-        /**
-         * Check report existance and permission.
-         */
-        if ( ! $report) 
-        {
-            \ErrorHandler::notFound('report');
-        }
-        else if (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
-        {
-            \ErrorHandler::noPermissions();
-        }
+		/**
+		 * Check report existance and permission.
+		 */
+		if ( ! $report) 
+		{
+			\ErrorHandler::notFound('report');
+		}
+		else if (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
+		{
+			\ErrorHandler::noPermissions();
+		}
 
-        /**
-         * Fetch data from the report based on the given conditions.
-         */
-        $report = \DB::table($report->view_name);
-        unset($conditions['page']);
-        if (count($conditions))
-        {
-            $conditions = $this->constructConditions($conditions, $this->model);
-            $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']);   
-        }
-        /**
-         * Paginate or all data.
-         */
-        if ($perPage) 
-        {
-            return $report->paginate($perPage);
-        }
-        else
-        {
-            return $report->get();  
-        }
-    }
+		/**
+		 * Fetch data from the report based on the given conditions.
+		 */
+		$report = \DB::table($report->view_name);
+		unset($conditions['page']);
+		if (count($conditions))
+		{
+			$conditions = $this->constructConditions($conditions, $this->model);
+			$report->whereRaw($conditions['conditionString'], $conditions['conditionValues']);   
+		}
+		/**
+		 * Paginate or all data.
+		 */
+		if ($perPage) 
+		{
+			return $report->paginate($perPage);
+		}
+		else
+		{
+			return $report->get();  
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         {
             \ErrorHandler::notFound('report');
         }
-        else if (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
+        else if ( ! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
         {
             \ErrorHandler::noPermissions();
         }

Braces +2 added lines, -4 removed lines

@@ -39,8 +39,7 @@ 
         if ( ! $report) 
         {
             \ErrorHandler::notFound('report');
-        }
-        else if (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
+        } else if (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
         {
             \ErrorHandler::noPermissions();
         }
@@ -61,8 +60,7 @@ 
         if ($perPage) 
         {
             return $report->paginate($perPage);
-        }
-        else
+        } else
         {
             return $report->get();  
         }

src/Modules/V1/Notifications/Notification.php

Indentation +16 added lines, -16 removed lines

@@ -5,23 +5,23 @@
 
 class Notification extends DatabaseNotification{
 
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getReadAtAttribute($value)
-    {
-        return ! $value ? false : \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getReadAtAttribute($value)
+	{
+		return ! $value ? false : \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Notifications\DatabaseNotification;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Notification extends DatabaseNotification{
+class Notification extends DatabaseNotification {
 
     public function getCreatedAtAttribute($value)
     {

src/Modules/V1/Acl/ModelObservers/AclUserObserver.php

Indentation +52 added lines, -52 removed lines

@@ -5,56 +5,56 @@
  */
 class AclUserObserver {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        //
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    public function deleting($model)
-    {
-        if ($model->getOriginal('id') == \Auth::id()) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
-
-    public function restoring($model)
-    {
-        //
-    }
-
-    public function restored($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	public function creating($model)
+	{
+		//
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	public function updating($model)
+	{
+		//
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	public function deleting($model)
+	{
+		if ($model->getOriginal('id') == \Auth::id()) 
+		{
+			\ErrorHandler::noPermissions();
+		}
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
+
+	public function restoring($model)
+	{
+		//
+	}
+
+	public function restored($model)
+	{
+		//
+	}
 }
\ No newline at end of file

src/Modules/V1/Notifications/Notifications/ResetPassword.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * Get the notification's delivery channels.
      *
      * @param  mixed  $notifiable
-     * @return array
+     * @return string[]
      */
     public function via($notifiable)
     {

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Messages\BroadcastMessage;
 
 class ResetPassword extends Notification implements ShouldQueue
 {

Spacing +1 added lines, -1 removed lines

@@ -47,6 +47,6 @@
             ->subject('Reset passowrd')
             ->line('Reset passowrd')
             ->line('To reset your password click on the button below')
-            ->action('Reset password', env('RESET_PASSWORD_URL') . '/' . $this->token);
+            ->action('Reset password', env('RESET_PASSWORD_URL').'/'.$this->token);
     }
 }
\ No newline at end of file

Indentation +35 added lines, -35 removed lines

@@ -10,43 +10,43 @@
 
 class ResetPassword extends Notification implements ShouldQueue
 {
-    use Queueable;
+	use Queueable;
 
-    protected $token;
+	protected $token;
 
-    /**
-     * Create a new notification instance.
-     *
-     * @return void
-     */
-    public function __construct($token)
-    {
-        $this->token = $token;
-    }
+	/**
+	 * Create a new notification instance.
+	 *
+	 * @return void
+	 */
+	public function __construct($token)
+	{
+		$this->token = $token;
+	}
 
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['mail'];
-    }
+	/**
+	 * Get the notification's delivery channels.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return array
+	 */
+	public function via($notifiable)
+	{
+		return ['mail'];
+	}
 
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-            ->subject('Reset passowrd')
-            ->line('Reset passowrd')
-            ->line('To reset your password click on the button below')
-            ->action('Reset password', env('RESET_PASSWORD_URL') . '/' . $this->token);
-    }
+	/**
+	 * Get the mail representation of the notification.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return \Illuminate\Notifications\Messages\MailMessage
+	 */
+	public function toMail($notifiable)
+	{
+		return (new MailMessage)
+			->subject('Reset passowrd')
+			->line('Reset passowrd')
+			->line('To reset your password click on the button below')
+			->action('Reset password', env('RESET_PASSWORD_URL') . '/' . $this->token);
+	}
 }
\ No newline at end of file