SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Acl/Database/Migrations/2016_06_01_000001_create_oauth_auth_codes_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('oauth_auth_codes', function (Blueprint $table) {
+        Schema::create('oauth_auth_codes', function(Blueprint $table) {
             $table->string('id', 100)->primary();
             $table->integer('user_id');
             $table->integer('client_id');

src/Modules/V1/Core/AbstractRepositories/AbstractRepository.php

Spacing +36 added lines, -36 removed lines

@@ -63,11 +63,11 @@ 
         /**
          * 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) . ')';
+                $column = 'LOWER('.array_shift($conditionColumns).')';
                 if (str_contains($column, '->')) 
                 {
                     $column = $this->wrapJsonSelector($column);
@@ -76,7 +76,7 @@ 
                 /**
                  * Use the first element in the model columns to construct the first condition.
                  */
-                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+                $q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
             }
 
             /**
@@ -84,13 +84,13 @@ 
              */
             foreach ($conditionColumns as $column) 
             {
-                $column = 'LOWER(' . $column . ')';
+                $column = 'LOWER('.$column.')';
                 if (str_contains($column, '->')) 
                 {
                     $column = $this->wrapJsonSelector($column);
                 }
 
-                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+                $q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
             }
 
             /**
@@ -111,9 +111,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.
@@ -123,7 +123,7 @@ 
                             if (count($subConditionColumns)) 
                             {
 
-                                $column = 'LOWER(' . array_shift($subConditionColumns) . ')';
+                                $column = 'LOWER('.array_shift($subConditionColumns).')';
                                 if (str_contains($column, '->')) 
                                 {
                                     $column = $this->wrapJsonSelector($column);
@@ -132,7 +132,7 @@ 
                                 /**
                                 * Use the first element in the relation model columns to construct the first condition.
                                  */
-                                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+                                $q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
                             }
 
                             /**
@@ -140,13 +140,13 @@ 
                              */
                             foreach ($subConditionColumns as $subConditionColumn)
                             {
-                                $column = 'LOWER(' . $subConditionColumn . ')';
+                                $column = 'LOWER('.$subConditionColumn.')';
                                 if (str_contains($column, '->')) 
                                 {
                                     $column = $this->wrapJsonSelector($column);
                                 }
                                 
-                                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+                                $q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
                             } 
                         });
 
@@ -206,7 +206,7 @@ 
         $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.
@@ -215,7 +215,7 @@ 
             $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
             if ( ! $model) 
             {
-                \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
+                \ErrorHandler::notFound(class_basename($modelClass).' with id : '.$data['id']);
             }
 
             /**
@@ -273,7 +273,7 @@ 
                                  */
                                 if ( ! $relationModel) 
                                 {
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+                                    \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                                 }
 
                                 /**
@@ -284,7 +284,7 @@ 
                                     /**
                                      * Prevent the sub relations or attributes not in the fillable.
                                      */
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
+                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false)
                                     {
                                         $relationModel->$attr = $val;
                                     }
@@ -314,7 +314,7 @@ 
                                      */
                                     if ( ! $relationModel) 
                                     {
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+                                        \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
                                     }
 
                                     foreach ($value as $relationAttribute => $relationValue) 
@@ -456,7 +456,7 @@ 
         }
         else
         {
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
+            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($data){
                 $model->update($data);
             });
         }
@@ -474,11 +474,11 @@ 
     {
         if ($attribute == 'id') 
         {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
+            \DB::transaction(function() use ($value, $attribute, &$result) {
                 $model = $this->model->lockForUpdate()->find($value);
                 if ( ! $model) 
                 {
-                    \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
+                    \ErrorHandler::notFound(class_basename($this->model).' with id : '.$value);
                 }
                 
                 $model->delete();
@@ -486,8 +486,8 @@ 
         }
         else
         {
-            \DB::transaction(function () use ($value, $attribute, &$result) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+            \DB::transaction(function() use ($value, $attribute, &$result) {
+                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) {
                     $model->delete();
                 });
             });   
@@ -523,7 +523,7 @@ 
     {
         $conditions = $this->constructConditions($conditions, $this->model);
         $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
+        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
     }
 
     /**
@@ -563,7 +563,7 @@ 
             $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
         }
 
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
+        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns); ;
     }
 
     /**
@@ -578,7 +578,7 @@ 
 
         if ( ! $model) 
         {
-            \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
+            \ErrorHandler::notFound(class_basename($this->model).' with id : '.$id);
         }
 
         $model->restore();
@@ -603,13 +603,13 @@ 
             if ($key == 'and') 
             {
                 $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
+                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']).' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
             }
             else if ($key == 'or')
             {
                 $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
+                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']).' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
             }
             else
@@ -634,41 +634,41 @@ 
                 
                 if (strtolower($operator) == 'between') 
                 {
-                    $conditionString  .= $key . ' >= ? and ';
+                    $conditionString  .= $key.' >= ? and ';
                     $conditionValues[] = $value1;
 
-                    $conditionString  .= $key . ' <= ? {op} ';
+                    $conditionString  .= $key.' <= ? {op} ';
                     $conditionValues[] = $value2;
                 }
                 elseif (strtolower($operator) == 'in') 
                 {
                     $conditionValues  = array_merge($conditionValues, $value);
                     $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
-                    $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
+                    $conditionString .= $key.' in ('.rtrim($inBindingsString, ',').') {op} ';
                 }
                 elseif (strtolower($operator) == 'null') 
                 {
-                    $conditionString .= $key . ' is null {op} ';
+                    $conditionString .= $key.' is null {op} ';
                 }
                 elseif (strtolower($operator) == 'not null') 
                 {
-                    $conditionString .= $key . ' is not null {op} ';
+                    $conditionString .= $key.' is not null {op} ';
                 }
                 elseif (strtolower($operator) == 'has') 
                 {
                     $sql              = $model->withTrashed()->has($key)->toSql();
                     $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
-                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
+                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')').' and '.$conditions['conditionString'].') {op} ';
                     $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
                 }
                 else
                 {
-                    $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
+                    $conditionString  .= $key.' '.$operator.' ? {op} ';
                     $conditionValues[] = $value;
                 }
             }
         }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+        $conditionString = '('.rtrim($conditionString, '{op} ').')';
         return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
     }
 
@@ -684,11 +684,11 @@ 
         $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('.'));
         
-        return $removeLast === false ? $result : $result . ')';
+        return $removeLast === false ? $result : $result.')';
     }
 
     /**

src/Modules/V1/Core/Database/Seeds/AssignRelationsSeeder.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         /**
          * Assign the permissions to the admin group.
          */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings'])->each(function ($permission) use ($adminGroupId) {
+        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings'])->each(function($permission) use ($adminGroupId) {
         	\DB::table('groups_permissions')->insert(
 				[
 				'permission_id' => $permission->id,

src/Modules/V1/Notifications/Http/Controllers/PushNotificationsDevicesController.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model            = 'pushNotificationDevices';
+    protected $model = 'pushNotificationDevices';
 
     /**
      * List of all route actions that the base api controller
@@ -26,7 +26,7 @@ 
      * to check before add.
      * @var array
      */
-    protected $validationRules  = [
+    protected $validationRules = [
     'device_token' => 'required|string|max:255',
     'user_id'      => 'required|exists:users,id'
     ];

src/Modules/V1/Notifications/Http/Controllers/NotificationsController.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model            = 'notifications';
+    protected $model = 'notifications';
 
     /**
      * List of all route actions that the base api controller

src/Modules/V1/Notifications/Repositories/NotificationRepository.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
      */
     public function notify($users, $notification, $notificationData = false)
     {
-        $notification = 'App\Modules\V1\Notifications\Notifications\\' . $notification;
+        $notification = 'App\Modules\V1\Notifications\Notifications\\'.$notification;
         \Notification::send($users, new $notification($notificationData));
     }
 }

src/Modules/V1/Notifications/Repositories/PushNotificationDeviceRepository.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         $notificationBuilder = new PayloadNotificationBuilder($title);
         $dataBuilder         = new PayloadDataBuilder();
 
-        $optionBuilder->setTimeToLive(60*20);
+        $optionBuilder->setTimeToLive(60 * 20);
         $notificationBuilder->setBody($message);
         $dataBuilder->addData($data);
 

src/Modules/V1/Notifications/Database/Factories/NotificationFactory.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\V1\Notifications\Notification::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\V1\Notifications\Notification::class, function(Faker\Generator $faker) {
     return [
 		'type'            => '',
 		'notifiable_type' => '',

src/Modules/V1/Notifications/Database/Migrations/2016_01_24_111941_notifications.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('notifications', function (Blueprint $table) {
+        Schema::create('notifications', function(Blueprint $table) {
             $table->uuid('id')->primary();
             $table->string('type');
             $table->morphs('notifiable');