SherifElfadaly / Laravel-Api-Skeleton

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 	 */
 	public function up()
 	{
-		Schema::create('push_notifications_devices', function (Blueprint $table) {
+		Schema::create('push_notifications_devices', function(Blueprint $table) {
 			$table->increments('id');
-			$table->string('device_token',255);
+			$table->string('device_token', 255);
 			$table->enum('device_type', ['android', 'ios']);
 			$table->integer('user_id');
 			$table->boolean('active')->default(1);

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

Spacing +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
 	 */
 	public function down()
 	{
-		$permissions  = DB::table('permissions')->whereIn('model', ['notifications', 'pushNotificationDevices']);
+		$permissions = DB::table('permissions')->whereIn('model', ['notifications', 'pushNotificationDevices']);
 		DB::table('groups_permissions')->whereIn('permission_id', $permissions->lists('id'))->delete();
 		$permissions->delete();
 	}

src/Modules/V1/Notifications/PushNotificationDevice.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class PushNotificationDevice extends Model{
+class PushNotificationDevice extends Model {
 
     use SoftDeletes;
     protected $table    = 'push_notifications_devices';

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

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         
         if (array_key_exists('ios', $devicesArray)) 
         {
-            $message = $this->constructMessage($messageText, [ 'badge' => 15, 'sound' => 'default', 'content-available' => 1 ]);
+            $message = $this->constructMessage($messageText, ['badge' => 15, 'sound' => 'default', 'content-available' => 1]);
             $iosDevices = \PushNotification::DeviceCollection($devicesArray['ios']);
             $this->push('ios', $iosDevices, $message);
         }

src/Modules/V1/Reporting/Report.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Report extends Model{
+class Report extends Model {
 
     use SoftDeletes;
 	protected $table    = 'reports';
@@ -11,7 +11,7 @@ 
 	protected $hidden   = ['deleted_at'];
 	protected $guarded  = ['id'];
 	protected $fillable = ['report_name', 'view_name'];
-    public $searchable  = ['report_name', 'view_name'];
+    public $searchable = ['report_name', 'view_name'];
 
 	public function getCreatedAtAttribute($value)
     {

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

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model               = 'users';
+    protected $model = 'users';
 
     /**
      * List of all route actions that the base api controller
@@ -26,14 +26,14 @@ 
      * will skip login check for them.
      * @var array
      */
-    protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
+    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
 
     /**
      * The validations rules used by the base api controller
      * to check before add.
      * @var array
      */
-    protected $validationRules     = [
+    protected $validationRules = [
     'email'    => 'required|email|unique:users,email,{id}',
     'password' => 'min:6'
     ];

src/Modules/V1/Reporting/Http/Controllers/ReportsController.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +24 added lines, -24 removed lines

@@ -63,14 +63,14 @@ 
         /**
          * 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)) 
             {
                 /**
                  * Use the first element in the model columns to construct the first condition.
                  */
-                $q->where(\DB::raw('LOWER(' . array_shift($conditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
+                $q->where(\DB::raw('LOWER('.array_shift($conditionColumns).')'), 'LIKE', '%'.strtolower($query).'%');
             }
 
             /**
@@ -78,7 +78,7 @@ 
              */
             foreach ($conditionColumns as $column) 
             {
-                $q->orWhere(\DB::raw('LOWER(' . $column . ')'), 'LIKE', '%' . strtolower($query) . '%');
+                $q->orWhere(\DB::raw('LOWER('.$column.')'), 'LIKE', '%'.strtolower($query).'%');
             }
 
             /**
@@ -99,9 +99,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.
@@ -113,7 +113,7 @@ 
                                 /**
                                 * Use the first element in the relation model columns to construct the first condition.
                                  */
-                                $q->where(\DB::raw('LOWER(' . array_shift($subConditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
+                                $q->where(\DB::raw('LOWER('.array_shift($subConditionColumns).')'), 'LIKE', '%'.strtolower($query).'%');
                             }
 
                             /**
@@ -121,7 +121,7 @@ 
                              */
                             foreach ($subConditionColumns as $subConditionColumn)
                             {
-                                $q->orWhere(\DB::raw('LOWER(' . $subConditionColumn . ')'), 'LIKE', '%' . strtolower($query) . '%');
+                                $q->orWhere(\DB::raw('LOWER('.$subConditionColumn.')'), 'LIKE', '%'.strtolower($query).'%');
                             } 
                         });
 
@@ -182,7 +182,7 @@ 
         $modelClass = $this->model;
         $relations  = [];
 
-        \DB::transaction(function () use (&$model, &$relations, $data, $saveLog, $modelClass) {
+        \DB::transaction(function() use (&$model, &$relations, $data, $saveLog, $modelClass) {
             /**
              * If the id is present in the data then select the model for updating,
              * else create new model.
@@ -191,7 +191,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']);
             }
 
             /**
@@ -250,7 +250,7 @@ 
                                  */
                                 if ( ! $relationModel) 
                                 {
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+                                    \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                                 }
 
                                 /**
@@ -261,7 +261,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;
                                     }
@@ -289,7 +289,7 @@ 
                                      */
                                     if ( ! $relationModel) 
                                     {
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+                                        \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
                                     }
 
                                     /**
@@ -428,7 +428,7 @@ 
         }
         else
         {
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
+            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($data, $saveLog){
                 $model->update($data);
                 $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
             });
@@ -447,11 +447,11 @@ 
     {
         if ($attribute == 'id') 
         {
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
+            \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) {
                 $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();
@@ -460,8 +460,8 @@ 
         }
         else
         {
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+            \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) {
+                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) {
                     $model->delete();
                     $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
                 });
@@ -498,7 +498,7 @@ 
     {
         $conditions = $this->constructConditions($conditions);
         $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);
     }
 
     /**
@@ -529,12 +529,12 @@ 
         {
             if ($key == 'and') 
             {
-                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
+                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']).' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
             }
             else if ($key == 'or')
             {
-                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
+                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']).' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
             }
             else
@@ -559,20 +559,20 @@ 
                 
                 if (strtolower($operator) == 'between') 
                 {
-                    $conditionString  .= $key . ' >= ? and ';
+                    $conditionString  .= $key.' >= ? and ';
                     $conditionValues[] = $value1;
 
-                    $conditionString  .= $key . ' <= ? {op} ';
+                    $conditionString  .= $key.' <= ? {op} ';
                     $conditionValues[] = $value2;
                 }
                 else
                 {
-                    $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
+                    $conditionString  .= $key.' '.$operator.' ? {op} ';
                     $conditionValues[] = $value;
                 }
             }
         }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+        $conditionString = '('.rtrim($conditionString, '{op} ').')';
         return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
     }