SherifElfadaly / Laravel-Api-Skeleton

src/Modules/OauthClients/Database/Migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php

Indentation +23 added lines, -23 removed lines

@@ -6,29 +6,29 @@
 
 class CreateOauthPersonalAccessClientsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('oauth_personal_access_clients', function (Blueprint $table) {
-            increments('id');
-            $table->unsignedInteger('client_id');
-            $table->timestamps();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('oauth_personal_access_clients', function (Blueprint $table) {
+			increments('id');
+			$table->unsignedInteger('client_id');
+			$table->timestamps();
             
-            $table->foreign('client_id')->references('id')->on('oauth_clients');
-        });
-    }
+			$table->foreign('client_id')->references('id')->on('oauth_clients');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('oauth_personal_access_clients');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('oauth_personal_access_clients');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('oauth_personal_access_clients', function (Blueprint $table) {
+        Schema::create('oauth_personal_access_clients', function(Blueprint $table) {
             increments('id');
             $table->unsignedInteger('client_id');
             $table->timestamps();

src/Modules/OauthClients/Database/Migrations/2016_06_01_000001_create_oauth_clients_table.php

Indentation +29 added lines, -29 removed lines

@@ -6,35 +6,35 @@
 
 class CreateOauthClientsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('oauth_clients', function (Blueprint $table) {
-            increments('id');
-            $table->unsignedInteger('user_id')->nullable();
-            $table->string('name');
-            $table->string('secret', 100);
-            $table->text('redirect');
-            $table->boolean('personal_access_client')->default(0);
-            $table->boolean('password_client')->default(0);
-            $table->boolean('revoked')->default(0);
-            $table->timestamps();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('oauth_clients', function (Blueprint $table) {
+			increments('id');
+			$table->unsignedInteger('user_id')->nullable();
+			$table->string('name');
+			$table->string('secret', 100);
+			$table->text('redirect');
+			$table->boolean('personal_access_client')->default(0);
+			$table->boolean('password_client')->default(0);
+			$table->boolean('revoked')->default(0);
+			$table->timestamps();
 
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-    }
+			$table->foreign('user_id')->references('id')->on('users');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('oauth_clients');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('oauth_clients');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('oauth_clients', function (Blueprint $table) {
+        Schema::create('oauth_clients', function(Blueprint $table) {
             increments('id');
             $table->unsignedInteger('user_id')->nullable();
             $table->string('name');

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

Indentation +32 added lines, -32 removed lines

@@ -8,40 +8,40 @@
 
 class SetSessions
 {
-    protected $app;
-    protected $session;
+	protected $app;
+	protected $session;
     
-    /**
-     * Init new object.
-     *
-     * @param   App      $app
-     * @param   Session  $session
-     *
-     * @return  void
-     */
-    public function __construct(App $app, Session $session)
-    {
-        $this->app = $app;
-        $this->session = $session;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   App      $app
+	 * @param   Session  $session
+	 *
+	 * @return  void
+	 */
+	public function __construct(App $app, Session $session)
+	{
+		$this->app = $app;
+		$this->session = $session;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $locale = $request->header('Accept-Language', 'en');
-        $locale = $locale == 'ar' || $locale == 'all' ? $locale : 'en';
-        $timeZone = $request->header('time-zone', 0);
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$locale = $request->header('Accept-Language', 'en');
+		$locale = $locale == 'ar' || $locale == 'all' ? $locale : 'en';
+		$timeZone = $request->header('time-zone', 0);
 
-        $this->session->put('time-zone', $timeZone);
-        $this->session->put('locale', $locale);
-        $this->app->setLocale($locale);
+		$this->session->put('time-zone', $timeZone);
+		$this->session->put('locale', $locale);
+		$this->app->setLocale($locale);
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

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

Indentation +32 added lines, -32 removed lines

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

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, $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, $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, $permission) {
+        if ( ! in_array($permission, $skipLoginCheck)) {
+            $this->authMiddleware->handle($request, function($request) use ($modelName, $skipPermissionCheck, $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();
                 }

src/Modules/Core/Resources/Lang/en/errors.php

Indentation +10 added lines, -10 removed lines

@@ -2,15 +2,15 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
-    'connectionError'         => 'Connection error',
-    'redisNotRunning'         => 'Your redis notification server is\'t running',
-    'dbQueryError'            => 'Please check the given inputes',
-    'cannotCreateSetting'     => 'Can\'t create setting',
-    'cannotUpdateSettingKey'  => 'Can\'t update setting key',
-    'notFound'                => 'The requested :replace not found',
-    'cannotUploadImage'       => 'Can\'t upload the given image'
+	/**
+	 * Here goes your error messages.
+	 */
+	'connectionError'         => 'Connection error',
+	'redisNotRunning'         => 'Your redis notification server is\'t running',
+	'dbQueryError'            => 'Please check the given inputes',
+	'cannotCreateSetting'     => 'Can\'t create setting',
+	'cannotUpdateSettingKey'  => 'Can\'t update setting key',
+	'notFound'                => 'The requested :replace not found',
+	'cannotUploadImage'       => 'Can\'t upload the given image'
 
 ];

src/Modules/Core/Resources/Lang/ar/errors.php

Indentation +10 added lines, -10 removed lines

@@ -2,15 +2,15 @@
 
 return [
     
-    /**
-     * Here goes your error messages.
-     */
-    'connectionError'         => 'خطأ في الاتصال',
-    'redisNotRunning'         => 'سيرفير الاشعارات لايعمل',
-    'dbQueryError'            => 'خطا في البيانات',
-    'cannotCreateSetting'     => 'لا يمكن اضافة اعدادات',
-    'cannotUpdateSettingKey'  => 'لا يمكن تعديل اعدادات',
-    'notFound'                => 'ال :replace المطلوب غير موجود',
-    'cannotUploadImage'       => 'لا يمكن رفع هذه الصورة'
+	/**
+	 * Here goes your error messages.
+	 */
+	'connectionError'         => 'خطأ في الاتصال',
+	'redisNotRunning'         => 'سيرفير الاشعارات لايعمل',
+	'dbQueryError'            => 'خطا في البيانات',
+	'cannotCreateSetting'     => 'لا يمكن اضافة اعدادات',
+	'cannotUpdateSettingKey'  => 'لا يمكن تعديل اعدادات',
+	'notFound'                => 'ال :replace المطلوب غير موجود',
+	'cannotUploadImage'       => 'لا يمكن رفع هذه الصورة'
 
 ];

src/Modules/Core/Setting.php

Indentation +15 added lines, -15 removed lines

@@ -9,21 +9,21 @@
 class Setting extends Model
 {
 
-    use SoftDeletes;
-    protected $table = 'settings';
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden = ['deleted_at'];
-    protected $guarded = ['id', 'key'];
-    public $fillable = ['name', 'value'];
+	use SoftDeletes;
+	protected $table = 'settings';
+	protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden = ['deleted_at'];
+	protected $guarded = ['id', 'key'];
+	public $fillable = ['name', 'value'];
     
-    public function newCollection(array $models = [])
-    {
-        return parent::newCollection($models)->keyBy('key');
-    }
+	public function newCollection(array $models = [])
+	{
+		return parent::newCollection($models)->keyBy('key');
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        Setting::observe(SettingsObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		Setting::observe(SettingsObserver::class);
+	}
 }

src/Modules/Core/BaseClasses/BaseApiController.php

Indentation +95 added lines, -95 removed lines

@@ -9,109 +9,109 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * Array of eager loaded relations.
-     *
-     * @var array
-     */
-    protected $relations;
+	/**
+	 * Array of eager loaded relations.
+	 *
+	 * @var array
+	 */
+	protected $relations;
 
-    /**
-     * @var object
-     */
-    protected $service;
+	/**
+	 * @var object
+	 */
+	protected $service;
 
-    /**
-     * Path of the model resource.
-     *
-     * @var string
-     */
-    protected $modelResource;
+	/**
+	 * Path of the model resource.
+	 *
+	 * @var string
+	 */
+	protected $modelResource;
 
-    /**
-     * Path of the sotre form request.
-     *
-     * @var string
-     */
-    protected $storeFormRequest;
+	/**
+	 * Path of the sotre form request.
+	 *
+	 * @var string
+	 */
+	protected $storeFormRequest;
 
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $service
-     * @return  void
-     */
-    public function __construct($service)
-    {
-        $this->service = new CachingDecorator($service, \App::make('Illuminate\Contracts\Cache\Repository'));
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $service
+	 * @return  void
+	 */
+	public function __construct($service)
+	{
+		$this->service = new CachingDecorator($service, \App::make('Illuminate\Contracts\Cache\Repository'));
+	}
 
-    /**
-     * Fetch all records with relations from storage.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        return $this->modelResource::collection($this->service->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc'), $request->query('trashed')));
-    }
+	/**
+	 * Fetch all records with relations from storage.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index(Request $request)
+	{
+		return $this->modelResource::collection($this->service->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc'), $request->query('trashed')));
+	}
 
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  Request $request
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(Request $request, $id)
-    {
-        return new $this->modelResource($this->service->find($id, $request->relations));
-    }
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  Request $request
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function show(Request $request, $id)
+	{
+		return new $this->modelResource($this->service->find($id, $request->relations));
+	}
 
-    /**
-     * Insert the given model to storage.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function store()
-    {
-        $data = \App::make($this->storeFormRequest)->validated();
-        return new $this->modelResource($this->service->save($data));
-    }
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function store()
+	{
+		$data = \App::make($this->storeFormRequest)->validated();
+		return new $this->modelResource($this->service->save($data));
+	}
 
-    /**
-     * Update the given model to storage.
-     *
-     * @param integer   $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update($id)
-    {
-        $data = \App::make($this->storeFormRequest)->validated();
-        $data['id'] = $id;
-        return new $this->modelResource($this->service->save($data));
-    }
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param integer   $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update($id)
+	{
+		$data = \App::make($this->storeFormRequest)->validated();
+		$data['id'] = $id;
+		return new $this->modelResource($this->service->save($data));
+	}
 
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        return new GeneralResource($this->service->delete($id));
-    }
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function destroy($id)
+	{
+		return new GeneralResource($this->service->delete($id));
+	}
 
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return new GeneralResource($this->service->restore($id));
-    }
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return new GeneralResource($this->service->restore($id));
+	}
 }