SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Core.php

Spacing +4 added lines, -4 removed lines

@@ -18,14 +18,14 @@
     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';
-            $decoratedClass = $class . '\\Decorated';
+            $class = $nameSpace.'\\Repositories\\'.$model.'Repository';
+            $decoratedClass = $class.'\\Decorated';
 
             if (class_exists($class)) {
                 $classObj = \App::make($class);
-                \App::singleton($class, function ($app) use ($classObj) {
+                \App::singleton($class, function($app) use ($classObj) {
                     return new CachingDecorator($classObj, $app['cache.store']);
                 });
 

src/Modules/Core/BaseClasses/BaseRepository.php

Spacing +16 added lines, -16 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function __construct($model)
     {
-        $this->model  = $model;
+        $this->model = $model;
     }
 
     /**
@@ -60,7 +60,7 @@ 
         /**
          * Construct the select conditions for the model.
          */
-        $model->where(function ($q) use ($query, $conditionColumns, $relations) {
+        $model->where(function($q) use ($query, $conditionColumns, $relations) {
 
             if (count($conditionColumns)) {
                 $column = 'LOWER('.array_shift($conditionColumns).')';
@@ -102,9 +102,9 @@ 
                     /**
                      * Construct the relation condition.
                      */
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation) {
+                    $q->orWhereHas($relation, function($subModel) use ($query, $relation) {
 
-                        $subModel->where(function ($q) use ($query, $relation) {
+                        $subModel->where(function($q) use ($query, $relation) {
 
                             /**
                              * Get columns of the relation.
@@ -192,14 +192,14 @@ 
         $modelClass = $this->model;
         $relations  = [];
 
-        \DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
+        \DB::transaction(function() use (&$model, &$relations, $data, $modelClass) {
             /**
              * If the id is present in the data then select the model for updating,
              * else create new model.
              * @var array
              */
             $model = Arr::has($data, 'id') ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
-            if (! $model) {
+            if ( ! $model) {
                 \ErrorHandler::notFound(class_basename($modelClass).' with id : '.$data['id']);
             }
 
@@ -222,7 +222,7 @@ 
                          * If the relation has no value then marke the relation data
                          * related to the model to be deleted.
                          */
-                        if (! $value || ! count($value)) {
+                        if ( ! $value || ! count($value)) {
                             $relations[$relation] = 'delete';
                         }
                     }
@@ -249,7 +249,7 @@ 
                                 /**
                                  * If model doesn't exists.
                                  */
-                                if (! $relationModel) {
+                                if ( ! $relationModel) {
                                     \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                                 }
 
@@ -280,7 +280,7 @@ 
                                     /**
                                      * If model doesn't exists.
                                      */
-                                    if (! $relationModel) {
+                                    if ( ! $relationModel) {
                                         \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
                                     }
 
@@ -417,7 +417,7 @@ 
             $model = $this->model->lockForUpdate()->find($value);
             $model ? $model->update($data) : 0;
         } else {
-            $this->model->where($attribute, '=', $value)->lockForUpdate()->get()->each(function ($model) use ($data) {
+            $this->model->where($attribute, '=', $value)->lockForUpdate()->get()->each(function($model) use ($data) {
                 $model->update($data);
             });
         }
@@ -434,17 +434,17 @@ 
     public function delete($value, $attribute = 'id')
     {
         if ($attribute == 'id') {
-            \DB::transaction(function () use ($value) {
+            \DB::transaction(function() use ($value) {
                 $model = $this->model->lockForUpdate()->find($value);
-                if (! $model) {
+                if ( ! $model) {
                     \ErrorHandler::notFound(class_basename($this->model).' with id : '.$value);
                 }
                 
                 $model->delete();
             });
         } else {
-            \DB::transaction(function () use ($value, $attribute) {
-                $this->model->where($attribute, '=', $value)->lockForUpdate()->get()->each(function ($model) {
+            \DB::transaction(function() use ($value, $attribute) {
+                $this->model->where($attribute, '=', $value)->lockForUpdate()->get()->each(function($model) {
                     $model->delete();
                 });
             });
@@ -532,7 +532,7 @@ 
     {
         $model = $this->model->onlyTrashed()->find($id);
 
-        if (! $model) {
+        if ( ! $model) {
             \ErrorHandler::notFound(class_basename($this->model).' with id : '.$id);
         }
 
@@ -615,7 +615,7 @@ 
         $value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
         $path       = explode('->', $value);
         $field      = array_shift($path);
-        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
+        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function($part) {
             return '"'.$part.'"';
         })->implode('.'));
         

src/Modules/Acl/Repositories/UserRepository.php

Spacing +16 added lines, -16 removed lines

@@ -28,7 +28,7 @@ 
         $permissions = [];
         $user        = $this->find(\Auth::id(), $relations);
         foreach ($user->groups()->get() as $group) {
-            $group->permissions->each(function ($permission) use (&$permissions) {
+            $group->permissions->each(function($permission) use (&$permissions) {
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }
@@ -51,7 +51,7 @@ 
         $user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
         $permissions = [];
 
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model) {
+        $user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model) {
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray());
         });
         
@@ -80,7 +80,7 @@ 
      */
     public function assignGroups($userId, $groupIds)
     {
-        \DB::transaction(function () use ($userId, $groupIds) {
+        \DB::transaction(function() use ($userId, $groupIds) {
             $user = $this->find($userId);
             $user->groups()->detach();
             $user->groups()->attach($groupIds);
@@ -99,15 +99,15 @@ 
      */
     public function login($credentials, $adminLogin = false)
     {
-        if (! $user = $this->first(['email' => $credentials['email']])) {
+        if ( ! $user = $this->first(['email' => $credentials['email']])) {
             \ErrorHandler::loginFailed();
         } elseif ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
-        } elseif (! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) {
+        } elseif ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) {
             \ErrorHandler::loginFailed();
         } elseif ($user->blocked) {
             \ErrorHandler::userIsBlocked();
-        } elseif (! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
+        } elseif ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed) {
             \ErrorHandler::emailNotConfirmed();
         }
 
@@ -127,7 +127,7 @@ 
         $access_token = $authCode ? Arr::get(\Socialite::driver($type)->getAccessTokenResponse($authCode), 'access_token') : $accessToken;
         $user         = \Socialite::driver($type)->userFromToken($access_token);
 
-        if (! $user->email) {
+        if ( ! $user->email) {
             \ErrorHandler::noSocialEmail();
         }
 
@@ -153,7 +153,7 @@ 
         if ($skipConfirmEmail) {
             $user->confirmed = 1;
             $user->save();
-        } elseif (! config('skeleton.disable_confirm_email')) {
+        } elseif ( ! config('skeleton.disable_confirm_email')) {
             $this->sendConfirmationEmail($user->email);
         }
 
@@ -168,10 +168,10 @@ 
      */
     public function block($userId)
     {
-        if (! $user = $this->find($userId)) {
+        if ( ! $user = $this->find($userId)) {
             \ErrorHandler::notFound('user');
         }
-        if (! $this->hasGroup(['Admin'])) {
+        if ( ! $this->hasGroup(['Admin'])) {
             \ErrorHandler::noPermissions();
         } elseif (\Auth::id() == $userId) {
             \ErrorHandler::noPermissions();
@@ -193,7 +193,7 @@ 
      */
     public function unblock($userId)
     {
-        if (! $this->hasGroup(['Admin'])) {
+        if ( ! $this->hasGroup(['Admin'])) {
             \ErrorHandler::noPermissions();
         }
 
@@ -212,7 +212,7 @@ 
      */
     public function sendReset($email)
     {
-        if (! $user = $this->model->where('email', $email)->first()) {
+        if ( ! $user = $this->model->where('email', $email)->first()) {
             \ErrorHandler::notFound('email');
         }
 
@@ -228,7 +228,7 @@ 
      */
     public function resetPassword($credentials)
     {
-        $response = \Password::reset($credentials, function ($user, $password) {
+        $response = \Password::reset($credentials, function($user, $password) {
             $user->password = $password;
             $user->save();
         });
@@ -263,7 +263,7 @@ 
     public function changePassword($credentials)
     {
         $user = \Auth::user();
-        if (! \Hash::check($credentials['old_password'], $user->password)) {
+        if ( ! \Hash::check($credentials['old_password'], $user->password)) {
             \ErrorHandler::invalidOldPassword();
         }
 
@@ -279,7 +279,7 @@ 
      */
     public function confirmEmail($confirmationCode)
     {
-        if (! $user = $this->first(['confirmation_code' => $confirmationCode])) {
+        if ( ! $user = $this->first(['confirmation_code' => $confirmationCode])) {
             \ErrorHandler::invalidConfirmationCode();
         }
 
@@ -324,7 +324,7 @@ 
         $sort       = $desc ? 'desc' : 'asc';
         $model      = $this->model->with($relations);
 
-        $model->whereHas('groups', function ($q) use ($groupName) {
+        $model->whereHas('groups', function($q) use ($groupName) {
             $q->where('name', $groupName);
         });