SherifElfadaly / Laravel-Api-Skeleton

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

Spacing +30 added lines, -30 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']);
             }
 
             /**
@@ -249,7 +249,7 @@ 
                                  */
                                 if ( ! $relationModel) 
                                 {
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+                                    \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                                 }
 
                                 /**
@@ -260,7 +260,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;
                                     }
@@ -290,7 +290,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) 
@@ -435,7 +435,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;
             });
@@ -454,11 +454,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();
@@ -467,8 +467,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) use ($saveLog){
+            \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) {
+                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($saveLog){
                     $model->delete();
                     $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
                 });
@@ -505,7 +505,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);
     }
 
     /**
@@ -545,7 +545,7 @@ 
             $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
         }
 
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
+        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns); ;
     }
 
     /**
@@ -560,7 +560,7 @@ 
 
         if ( ! $model) 
         {
-            \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
+            \ErrorHandler::notFound(class_basename($this->model).' with id : '.$id);
         }
 
         $model->restore();
@@ -580,13 +580,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
@@ -611,41 +611,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];
     }
 

Braces +11 added lines, -22 removed lines

@@ -432,8 +432,7 @@ 
             $model = $this->model->lockForUpdate()->find($value);
             $model ? $model->update($data) : 0;
             $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
-        }
-        else
+        } else
         {
             call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
                 $model->update($data);
@@ -464,8 +463,7 @@ 
                 $model->delete();
                 $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
             });
-        }
-        else
+        } else
         {
             \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
                 call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($saveLog){
@@ -582,14 +580,12 @@ 
                 $conditions       = $this->constructConditions($value, $model);
                 $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else if ($key == 'or')
+            } else if ($key == 'or')
             {
                 $conditions       = $this->constructConditions($value, $model);
                 $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else
+            } else
             {
                 if (is_array($value)) 
                 {
@@ -598,13 +594,11 @@ 
                     {
                         $value1 = $value['val1'];
                         $value2 = $value['val2'];
-                    }
-                    else
+                    } else
                     {
                         $value = array_key_exists('val', $value) ? $value['val'] : '';
                     }
-                }
-                else
+                } else
                 {
                     $operator = '=';
                 }
@@ -616,29 +610,24 @@ 
 
                     $conditionString  .= $key . ' <= ? {op} ';
                     $conditionValues[] = $value2;
-                }
-                elseif (strtolower($operator) == 'in') 
+                } elseif (strtolower($operator) == 'in') 
                 {
                     $conditionValues  = array_merge($conditionValues, $value);
                     $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
                     $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
-                }
-                elseif (strtolower($operator) == 'null') 
+                } elseif (strtolower($operator) == 'null') 
                 {
                     $conditionString .= $key . ' is null {op} ';
-                }
-                elseif (strtolower($operator) == 'not null') 
+                } elseif (strtolower($operator) == 'not null') 
                 {
                     $conditionString .= $key . ' is not null {op} ';
-                }
-                elseif (strtolower($operator) == 'has') 
+                } 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} ';
                     $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-                }
-                else
+                } else
                 {
                     $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
                     $conditionValues[] = $value;