Completed
Push — master ( 45265e...d868f1 )
by Sherif
02:58
created
src/Modules/V1/Core/AbstractRepositories/AbstractRepository.php 3 patches
Indentation   +570 added lines, -570 removed lines patch added patch discarded remove patch
@@ -4,584 +4,584 @@
 block discarded – undo
4 4
 
5 5
 abstract class AbstractRepository implements RepositoryInterface
6 6
 {
7
-    /**
8
-     * The model implementation.
9
-     * 
10
-     * @var model
11
-     */
12
-    public $model;
7
+	/**
8
+	 * The model implementation.
9
+	 * 
10
+	 * @var model
11
+	 */
12
+	public $model;
13 13
     
14
-    /**
15
-     * The config implementation.
16
-     * 
17
-     * @var config
18
-     */
19
-    protected $config;
14
+	/**
15
+	 * The config implementation.
16
+	 * 
17
+	 * @var config
18
+	 */
19
+	protected $config;
20 20
     
21
-    /**
22
-     * Create new AbstractRepository instance.
23
-     */
24
-    public function __construct()
25
-    {   
26
-        $this->config = \CoreConfig::getConfig();
27
-        $this->model  = \App::make($this->getModel());
28
-    }
29
-
30
-    /**
31
-     * Fetch all records with relations from the storage.
32
-     *
33
-     * @param  array   $relations
34
-     * @param  string  $sortBy
35
-     * @param  boolean $desc
36
-     * @param  array   $columns
37
-     * @return collection
38
-     */
39
-    public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
40
-    {
41
-        $sort = $desc ? 'desc' : 'asc';
42
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->get($columns);
43
-    }
44
-
45
-    /**
46
-     * Fetch all records with relations from storage in pages 
47
-     * that matche the given query.
48
-     * 
49
-     * @param  string  $query
50
-     * @param  integer $perPage
51
-     * @param  array   $relations
52
-     * @param  string  $sortBy
53
-     * @param  boolean $desc
54
-     * @param  array   $columns
55
-     * @return collection
56
-     */
57
-    public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
58
-    {
59
-        $model            = call_user_func_array("{$this->getModel()}::with", array($relations));
60
-        $conditionColumns = $this->model->searchable;
61
-        $sort             = $desc ? 'desc' : 'asc';
62
-
63
-        /**
64
-         * Construct the select conditions for the model.
65
-         */
66
-        $model->where(function ($q) use ($query, $conditionColumns, $relations){
67
-
68
-            if (count($conditionColumns)) 
69
-            {
70
-                /**
71
-                 * Use the first element in the model columns to construct the first condition.
72
-                 */
73
-                $q->where(\DB::raw('LOWER(' . array_shift($conditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
74
-            }
75
-
76
-            /**
77
-             * Loop through the rest of the columns to construct or where conditions.
78
-             */
79
-            foreach ($conditionColumns as $column) 
80
-            {
81
-                $q->orWhere(\DB::raw('LOWER(' . $column . ')'), 'LIKE', '%' . strtolower($query) . '%');
82
-            }
83
-
84
-            /**
85
-             * Loop through the model relations.
86
-             */
87
-            foreach ($relations as $relation) 
88
-            {
89
-                /**
90
-                 * Remove the sub relation if exists.
91
-                 */
92
-                $relation = explode('.', $relation)[0];
93
-
94
-                /**
95
-                 * Try to fetch the relation repository from the core.
96
-                 */
97
-                if (\Core::$relation()) 
98
-                {
99
-                    /**
100
-                     * Construct the relation condition.
101
-                     */
102
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation){
103
-
104
-                        $subModel->where(function ($q) use ($query, $relation){
105
-
106
-                            /**
107
-                             * Get columns of the relation.
108
-                             */
109
-                            $subConditionColumns = \Core::$relation()->model->searchable;
110
-
111
-                            if (count($subConditionColumns)) 
112
-                            {
113
-                                /**
114
-                                * Use the first element in the relation model columns to construct the first condition.
115
-                                 */
116
-                                $q->where(\DB::raw('LOWER(' . array_shift($subConditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
117
-                            }
118
-
119
-                            /**
120
-                             * Loop through the rest of the columns to construct or where conditions.
121
-                             */
122
-                            foreach ($subConditionColumns as $subConditionColumn)
123
-                            {
124
-                                $q->orWhere(\DB::raw('LOWER(' . $subConditionColumn . ')'), 'LIKE', '%' . strtolower($query) . '%');
125
-                            } 
126
-                        });
127
-
128
-                    });
129
-                }
130
-            }
131
-        });
21
+	/**
22
+	 * Create new AbstractRepository instance.
23
+	 */
24
+	public function __construct()
25
+	{   
26
+		$this->config = \CoreConfig::getConfig();
27
+		$this->model  = \App::make($this->getModel());
28
+	}
29
+
30
+	/**
31
+	 * Fetch all records with relations from the storage.
32
+	 *
33
+	 * @param  array   $relations
34
+	 * @param  string  $sortBy
35
+	 * @param  boolean $desc
36
+	 * @param  array   $columns
37
+	 * @return collection
38
+	 */
39
+	public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
40
+	{
41
+		$sort = $desc ? 'desc' : 'asc';
42
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->get($columns);
43
+	}
44
+
45
+	/**
46
+	 * Fetch all records with relations from storage in pages 
47
+	 * that matche the given query.
48
+	 * 
49
+	 * @param  string  $query
50
+	 * @param  integer $perPage
51
+	 * @param  array   $relations
52
+	 * @param  string  $sortBy
53
+	 * @param  boolean $desc
54
+	 * @param  array   $columns
55
+	 * @return collection
56
+	 */
57
+	public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
58
+	{
59
+		$model            = call_user_func_array("{$this->getModel()}::with", array($relations));
60
+		$conditionColumns = $this->model->searchable;
61
+		$sort             = $desc ? 'desc' : 'asc';
62
+
63
+		/**
64
+		 * Construct the select conditions for the model.
65
+		 */
66
+		$model->where(function ($q) use ($query, $conditionColumns, $relations){
67
+
68
+			if (count($conditionColumns)) 
69
+			{
70
+				/**
71
+				 * Use the first element in the model columns to construct the first condition.
72
+				 */
73
+				$q->where(\DB::raw('LOWER(' . array_shift($conditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
74
+			}
75
+
76
+			/**
77
+			 * Loop through the rest of the columns to construct or where conditions.
78
+			 */
79
+			foreach ($conditionColumns as $column) 
80
+			{
81
+				$q->orWhere(\DB::raw('LOWER(' . $column . ')'), 'LIKE', '%' . strtolower($query) . '%');
82
+			}
83
+
84
+			/**
85
+			 * Loop through the model relations.
86
+			 */
87
+			foreach ($relations as $relation) 
88
+			{
89
+				/**
90
+				 * Remove the sub relation if exists.
91
+				 */
92
+				$relation = explode('.', $relation)[0];
93
+
94
+				/**
95
+				 * Try to fetch the relation repository from the core.
96
+				 */
97
+				if (\Core::$relation()) 
98
+				{
99
+					/**
100
+					 * Construct the relation condition.
101
+					 */
102
+					$q->orWhereHas($relation, function ($subModel) use ($query, $relation){
103
+
104
+						$subModel->where(function ($q) use ($query, $relation){
105
+
106
+							/**
107
+							 * Get columns of the relation.
108
+							 */
109
+							$subConditionColumns = \Core::$relation()->model->searchable;
110
+
111
+							if (count($subConditionColumns)) 
112
+							{
113
+								/**
114
+								 * Use the first element in the relation model columns to construct the first condition.
115
+								 */
116
+								$q->where(\DB::raw('LOWER(' . array_shift($subConditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
117
+							}
118
+
119
+							/**
120
+							 * Loop through the rest of the columns to construct or where conditions.
121
+							 */
122
+							foreach ($subConditionColumns as $subConditionColumn)
123
+							{
124
+								$q->orWhere(\DB::raw('LOWER(' . $subConditionColumn . ')'), 'LIKE', '%' . strtolower($query) . '%');
125
+							} 
126
+						});
127
+
128
+					});
129
+				}
130
+			}
131
+		});
132 132
         
133
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
134
-    }
133
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
134
+	}
135 135
     
136
-    /**
137
-     * Fetch all records with relations from storage in pages.
138
-     * 
139
-     * @param  integer $perPage
140
-     * @param  array   $relations
141
-     * @param  string  $sortBy
142
-     * @param  boolean $desc
143
-     * @param  array   $columns
144
-     * @return collection
145
-     */
146
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
147
-    {
148
-        $sort = $desc ? 'desc' : 'asc';
149
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->paginate($perPage, $columns);
150
-    }
151
-
152
-    /**
153
-     * Fetch all records with relations based on
154
-     * the given condition from storage in pages.
155
-     * 
156
-     * @param  array   $conditions array of conditions
157
-     * @param  integer $perPage
158
-     * @param  array   $relations
159
-     * @param  string  $sortBy
160
-     * @param  boolean $desc
161
-     * @param  array   $columns
162
-     * @return collection
163
-     */
164
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
165
-    {
166
-        unset($conditions['page']);
167
-        $conditions = $this->constructConditions($conditions);
168
-        $sort       = $desc ? 'desc' : 'asc';
169
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
170
-    }
136
+	/**
137
+	 * Fetch all records with relations from storage in pages.
138
+	 * 
139
+	 * @param  integer $perPage
140
+	 * @param  array   $relations
141
+	 * @param  string  $sortBy
142
+	 * @param  boolean $desc
143
+	 * @param  array   $columns
144
+	 * @return collection
145
+	 */
146
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
147
+	{
148
+		$sort = $desc ? 'desc' : 'asc';
149
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->paginate($perPage, $columns);
150
+	}
151
+
152
+	/**
153
+	 * Fetch all records with relations based on
154
+	 * the given condition from storage in pages.
155
+	 * 
156
+	 * @param  array   $conditions array of conditions
157
+	 * @param  integer $perPage
158
+	 * @param  array   $relations
159
+	 * @param  string  $sortBy
160
+	 * @param  boolean $desc
161
+	 * @param  array   $columns
162
+	 * @return collection
163
+	 */
164
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
165
+	{
166
+		unset($conditions['page']);
167
+		$conditions = $this->constructConditions($conditions);
168
+		$sort       = $desc ? 'desc' : 'asc';
169
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
170
+	}
171 171
     
172
-    /**
173
-     * Save the given model to the storage.
174
-     * 
175
-     * @param  array   $data
176
-     * @param  boolean $saveLog
177
-     * @return void
178
-     */
179
-    public function save(array $data, $saveLog = true)
180
-    {
181
-        $model      = false;
182
-        $modelClass = $this->model;
183
-        $relations  = [];
184
-
185
-        \DB::transaction(function () use (&$model, &$relations, $data, $saveLog, $modelClass) {
186
-            /**
187
-             * If the id is present in the data then select the model for updating,
188
-             * else create new model.
189
-             * @var array
190
-             */
191
-            $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
192
-            if ( ! $model) 
193
-            {
194
-                \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
195
-            }
196
-
197
-            /**
198
-             * Construct the model object with the given data,
199
-             * and if there is a relation add it to relations array,
200
-             * then save the model.
201
-             */
202
-            foreach ($data as $key => $value) 
203
-            {
204
-                /**
205
-                 * If the attribute is a relation.
206
-                 */
207
-                $relation = camel_case($key);
208
-                if (method_exists($model, $relation) && \Core::$relation())
209
-                {
210
-
211
-                    /**
212
-                     * Check if the relation is a collection.
213
-                     */
214
-                    if (class_basename($model->$relation) == 'Collection') 
215
-                    {   
216
-                        /**
217
-                         * If the relation has no value then marke the relation data 
218
-                         * related to the model to be deleted.
219
-                         */
220
-                        if ( ! $value || ! count($value)) 
221
-                        {
222
-                            $relations[$relation] = 'delete';
223
-                        }   
224
-                    }
225
-                    if (is_array($value)) 
226
-                    {
227
-                        /**
228
-                         * Loop through the relation data.
229
-                         */
230
-                        foreach ($value as $attr => $val) 
231
-                        {
232
-                            /**
233
-                             * Get the relation model.
234
-                             */
235
-                            $relationBaseModel = \Core::$relation()->model;
236
-
237
-                            /**
238
-                             * Check if the relation is a collection.
239
-                             */
240
-                            if (class_basename($model->$relation) == 'Collection')
241
-                            {
242
-                                /**
243
-                                 * If the id is present in the data then select the relation model for updating,
244
-                                 * else create new model.
245
-                                 */
246
-                                $relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
247
-
248
-                                /**
249
-                                 * If model doesn't exists.
250
-                                 */
251
-                                if ( ! $relationModel) 
252
-                                {
253
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
254
-                                }
255
-
256
-                                /**
257
-                                 * Loop through the relation attributes.
258
-                                 */
259
-                                foreach ($val as $attr => $val) 
260
-                                {
261
-                                    /**
262
-                                     * Prevent the sub relations or attributes not in the fillable.
263
-                                     */
264
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
265
-                                    {
266
-                                        $relationModel->$attr = $val;
267
-                                    }
268
-                                }
269
-                                $relations[$relation][] = $relationModel;
270
-                            }
271
-                            /**
272
-                             * If not collection.
273
-                             */
274
-                            else
275
-                            {
276
-                                /**
277
-                                 * Prevent the sub relations.
278
-                                 */
279
-                                if (gettype($val) !== 'object' && gettype($val) !== 'array') 
280
-                                {
281
-                                    /**
282
-                                     * If the id is present in the data then select the relation model for updating,
283
-                                     * else create new model.
284
-                                     */
285
-                                    $relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
286
-
287
-                                    /**
288
-                                     * If model doesn't exists.
289
-                                     */
290
-                                    if ( ! $relationModel) 
291
-                                    {
292
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
293
-                                    }
294
-
295
-                                    /**
296
-                                     * Prevent attributes not in the fillable.
297
-                                     */
298
-                                    if (array_search($attr, $relationModel->getFillable(), true) !== false) 
299
-                                    {
300
-                                        $relationModel->$attr = $val;
301
-                                        $relations[$relation] = $relationModel;
302
-                                    }
303
-                                }
304
-                            }
305
-                        }
306
-                    }
307
-                }
308
-                /**
309
-                 * If the attribute isn't a relation and prevent attributes not in the fillable.
310
-                 */
311
-                else if (array_search($key, $model->getFillable(), true) !== false)
312
-                {
313
-                    $model->$key = $value;   
314
-                }
315
-            }
316
-            /**
317
-             * Save the model.
318
-             */
319
-            $model->save();
320
-
321
-            /**
322
-             * Loop through the relations array.
323
-             */
324
-            foreach ($relations as $key => $value) 
325
-            {
326
-                /**
327
-                 * If the relation is marked for delete then delete it.
328
-                 */
329
-                if ($value == 'delete' && $model->$key()->count())
330
-                {
331
-                    $model->$key()->delete();
332
-                }
333
-                /**
334
-                 * If the relation is an array.
335
-                 */
336
-                else if (gettype($value) == 'array') 
337
-                {
338
-                    $ids = [];
339
-                    /**
340
-                     * Loop through the relations.
341
-                     */
342
-                    foreach ($value as $val) 
343
-                    {
344
-                        switch (class_basename($model->$key())) 
345
-                        {
346
-                            /**
347
-                             * If the relation is one to many then update it's foreign key with
348
-                             * the model id and save it then add its id to ids array to delete all 
349
-                             * relations who's id isn't in the ids array.
350
-                             */
351
-                            case 'HasMany':
352
-                                $foreignKeyName       = explode('.', $model->$key()->getForeignKey())[1];
353
-                                $val->$foreignKeyName = $model->id;
354
-                                $val->save();
355
-                                $ids[] = $val->id;
356
-                                break;
357
-
358
-                            /**
359
-                             * If the relation is many to many then add it's id to the ids array to
360
-                             * attache these ids to the model.
361
-                             */
362
-                            case 'BelongsToMany':
363
-                                $val->save();
364
-                                $ids[] = $val->id;
365
-                                break;
366
-                        }
367
-                    }
368
-                    switch (class_basename($model->$key())) 
369
-                    {
370
-                        /**
371
-                         * If the relation is one to many then delete all 
372
-                         * relations who's id isn't in the ids array.
373
-                         */
374
-                        case 'HasMany':
375
-                            $model->$key()->whereNotIn('id', $ids)->delete();
376
-                            break;
377
-
378
-                        /**
379
-                         * If the relation is many to many then 
380
-                         * detach the previous data and attach 
381
-                         * the ids array to the model.
382
-                         */
383
-                        case 'BelongsToMany':
384
-                            $model->$key()->detach();
385
-                            $model->$key()->attach($ids);
386
-                            break;
387
-                    }
388
-                }
389
-                /**
390
-                 * If the relation isn't array.
391
-                 */
392
-                else
393
-                {
394
-                    switch (class_basename($model->$key())) 
395
-                    {
396
-                        /**
397
-                         * If the relation is one to many or one to one.
398
-                         */
399
-                        case 'BelongsTo':
400
-                            $value->save();
401
-                            $model->$key()->associate($value);
402
-                            $model->save();
403
-                            break;
404
-                    }
405
-                }
406
-            }
407
-
408
-            $saveLog ? \Logging::saveLog(array_key_exists('id', $data) ? 'update' : 'create', class_basename($modelClass), $this->getModel(), $model->id, $model) : false;
409
-        });
410
-    }
172
+	/**
173
+	 * Save the given model to the storage.
174
+	 * 
175
+	 * @param  array   $data
176
+	 * @param  boolean $saveLog
177
+	 * @return void
178
+	 */
179
+	public function save(array $data, $saveLog = true)
180
+	{
181
+		$model      = false;
182
+		$modelClass = $this->model;
183
+		$relations  = [];
184
+
185
+		\DB::transaction(function () use (&$model, &$relations, $data, $saveLog, $modelClass) {
186
+			/**
187
+			 * If the id is present in the data then select the model for updating,
188
+			 * else create new model.
189
+			 * @var array
190
+			 */
191
+			$model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
192
+			if ( ! $model) 
193
+			{
194
+				\ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
195
+			}
196
+
197
+			/**
198
+			 * Construct the model object with the given data,
199
+			 * and if there is a relation add it to relations array,
200
+			 * then save the model.
201
+			 */
202
+			foreach ($data as $key => $value) 
203
+			{
204
+				/**
205
+				 * If the attribute is a relation.
206
+				 */
207
+				$relation = camel_case($key);
208
+				if (method_exists($model, $relation) && \Core::$relation())
209
+				{
210
+
211
+					/**
212
+					 * Check if the relation is a collection.
213
+					 */
214
+					if (class_basename($model->$relation) == 'Collection') 
215
+					{   
216
+						/**
217
+						 * If the relation has no value then marke the relation data 
218
+						 * related to the model to be deleted.
219
+						 */
220
+						if ( ! $value || ! count($value)) 
221
+						{
222
+							$relations[$relation] = 'delete';
223
+						}   
224
+					}
225
+					if (is_array($value)) 
226
+					{
227
+						/**
228
+						 * Loop through the relation data.
229
+						 */
230
+						foreach ($value as $attr => $val) 
231
+						{
232
+							/**
233
+							 * Get the relation model.
234
+							 */
235
+							$relationBaseModel = \Core::$relation()->model;
236
+
237
+							/**
238
+							 * Check if the relation is a collection.
239
+							 */
240
+							if (class_basename($model->$relation) == 'Collection')
241
+							{
242
+								/**
243
+								 * If the id is present in the data then select the relation model for updating,
244
+								 * else create new model.
245
+								 */
246
+								$relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
247
+
248
+								/**
249
+								 * If model doesn't exists.
250
+								 */
251
+								if ( ! $relationModel) 
252
+								{
253
+									\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
254
+								}
255
+
256
+								/**
257
+								 * Loop through the relation attributes.
258
+								 */
259
+								foreach ($val as $attr => $val) 
260
+								{
261
+									/**
262
+									 * Prevent the sub relations or attributes not in the fillable.
263
+									 */
264
+									if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
265
+									{
266
+										$relationModel->$attr = $val;
267
+									}
268
+								}
269
+								$relations[$relation][] = $relationModel;
270
+							}
271
+							/**
272
+							 * If not collection.
273
+							 */
274
+							else
275
+							{
276
+								/**
277
+								 * Prevent the sub relations.
278
+								 */
279
+								if (gettype($val) !== 'object' && gettype($val) !== 'array') 
280
+								{
281
+									/**
282
+									 * If the id is present in the data then select the relation model for updating,
283
+									 * else create new model.
284
+									 */
285
+									$relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
286
+
287
+									/**
288
+									 * If model doesn't exists.
289
+									 */
290
+									if ( ! $relationModel) 
291
+									{
292
+										\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
293
+									}
294
+
295
+									/**
296
+									 * Prevent attributes not in the fillable.
297
+									 */
298
+									if (array_search($attr, $relationModel->getFillable(), true) !== false) 
299
+									{
300
+										$relationModel->$attr = $val;
301
+										$relations[$relation] = $relationModel;
302
+									}
303
+								}
304
+							}
305
+						}
306
+					}
307
+				}
308
+				/**
309
+				 * If the attribute isn't a relation and prevent attributes not in the fillable.
310
+				 */
311
+				else if (array_search($key, $model->getFillable(), true) !== false)
312
+				{
313
+					$model->$key = $value;   
314
+				}
315
+			}
316
+			/**
317
+			 * Save the model.
318
+			 */
319
+			$model->save();
320
+
321
+			/**
322
+			 * Loop through the relations array.
323
+			 */
324
+			foreach ($relations as $key => $value) 
325
+			{
326
+				/**
327
+				 * If the relation is marked for delete then delete it.
328
+				 */
329
+				if ($value == 'delete' && $model->$key()->count())
330
+				{
331
+					$model->$key()->delete();
332
+				}
333
+				/**
334
+				 * If the relation is an array.
335
+				 */
336
+				else if (gettype($value) == 'array') 
337
+				{
338
+					$ids = [];
339
+					/**
340
+					 * Loop through the relations.
341
+					 */
342
+					foreach ($value as $val) 
343
+					{
344
+						switch (class_basename($model->$key())) 
345
+						{
346
+							/**
347
+							 * If the relation is one to many then update it's foreign key with
348
+							 * the model id and save it then add its id to ids array to delete all 
349
+							 * relations who's id isn't in the ids array.
350
+							 */
351
+							case 'HasMany':
352
+								$foreignKeyName       = explode('.', $model->$key()->getForeignKey())[1];
353
+								$val->$foreignKeyName = $model->id;
354
+								$val->save();
355
+								$ids[] = $val->id;
356
+								break;
357
+
358
+							/**
359
+							 * If the relation is many to many then add it's id to the ids array to
360
+							 * attache these ids to the model.
361
+							 */
362
+							case 'BelongsToMany':
363
+								$val->save();
364
+								$ids[] = $val->id;
365
+								break;
366
+						}
367
+					}
368
+					switch (class_basename($model->$key())) 
369
+					{
370
+						/**
371
+						 * If the relation is one to many then delete all 
372
+						 * relations who's id isn't in the ids array.
373
+						 */
374
+						case 'HasMany':
375
+							$model->$key()->whereNotIn('id', $ids)->delete();
376
+							break;
377
+
378
+						/**
379
+						 * If the relation is many to many then 
380
+						 * detach the previous data and attach 
381
+						 * the ids array to the model.
382
+						 */
383
+						case 'BelongsToMany':
384
+							$model->$key()->detach();
385
+							$model->$key()->attach($ids);
386
+							break;
387
+					}
388
+				}
389
+				/**
390
+				 * If the relation isn't array.
391
+				 */
392
+				else
393
+				{
394
+					switch (class_basename($model->$key())) 
395
+					{
396
+						/**
397
+						 * If the relation is one to many or one to one.
398
+						 */
399
+						case 'BelongsTo':
400
+							$value->save();
401
+							$model->$key()->associate($value);
402
+							$model->save();
403
+							break;
404
+					}
405
+				}
406
+			}
407
+
408
+			$saveLog ? \Logging::saveLog(array_key_exists('id', $data) ? 'update' : 'create', class_basename($modelClass), $this->getModel(), $model->id, $model) : false;
409
+		});
410
+	}
411 411
     
412
-    /**
413
-     * Update record in the storage based on the given
414
-     * condition.
415
-     * 
416
-     * @param  [type] $value condition value
417
-     * @param  array $data
418
-     * @param  string $attribute condition column name
419
-     * @return void
420
-     */
421
-    public function update($value, array $data, $attribute = 'id', $saveLog = true)
422
-    {
423
-        if ($attribute == 'id') 
424
-        {
425
-            $model = $this->model->lockForUpdate()->find($value);
426
-            $model ? $model->update($data) : 0;
427
-            $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
428
-        }
429
-        else
430
-        {
431
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
432
-                $model->update($data);
433
-                $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
434
-            });
435
-        }
436
-    }
437
-
438
-    /**
439
-     * Delete record from the storage based on the given
440
-     * condition.
441
-     * 
442
-     * @param  var $value condition value
443
-     * @param  string $attribute condition column name
444
-     * @return void
445
-     */
446
-    public function delete($value, $attribute = 'id', $saveLog = true)
447
-    {
448
-        if ($attribute == 'id') 
449
-        {
450
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
451
-                $model = $this->model->lockForUpdate()->find($value);
452
-                if ( ! $model) 
453
-                {
454
-                    \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
455
-                }
412
+	/**
413
+	 * Update record in the storage based on the given
414
+	 * condition.
415
+	 * 
416
+	 * @param  [type] $value condition value
417
+	 * @param  array $data
418
+	 * @param  string $attribute condition column name
419
+	 * @return void
420
+	 */
421
+	public function update($value, array $data, $attribute = 'id', $saveLog = true)
422
+	{
423
+		if ($attribute == 'id') 
424
+		{
425
+			$model = $this->model->lockForUpdate()->find($value);
426
+			$model ? $model->update($data) : 0;
427
+			$saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
428
+		}
429
+		else
430
+		{
431
+			call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
432
+				$model->update($data);
433
+				$saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
434
+			});
435
+		}
436
+	}
437
+
438
+	/**
439
+	 * Delete record from the storage based on the given
440
+	 * condition.
441
+	 * 
442
+	 * @param  var $value condition value
443
+	 * @param  string $attribute condition column name
444
+	 * @return void
445
+	 */
446
+	public function delete($value, $attribute = 'id', $saveLog = true)
447
+	{
448
+		if ($attribute == 'id') 
449
+		{
450
+			\DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
451
+				$model = $this->model->lockForUpdate()->find($value);
452
+				if ( ! $model) 
453
+				{
454
+					\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
455
+				}
456 456
                 
457
-                $model->delete();
458
-                $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
459
-            });
460
-        }
461
-        else
462
-        {
463
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
464
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
465
-                    $model->delete();
466
-                    $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
467
-                });
468
-            });   
469
-        }
470
-    }
457
+				$model->delete();
458
+				$saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
459
+			});
460
+		}
461
+		else
462
+		{
463
+			\DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
464
+				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
465
+					$model->delete();
466
+					$saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
467
+				});
468
+			});   
469
+		}
470
+	}
471 471
     
472
-    /**
473
-     * Fetch records from the storage based on the given
474
-     * id.
475
-     * 
476
-     * @param  integer $id
477
-     * @param  array   $relations
478
-     * @param  array   $columns
479
-     * @return object
480
-     */
481
-    public function find($id, $relations = [], $columns = array('*'))
482
-    {
483
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
484
-    }
472
+	/**
473
+	 * Fetch records from the storage based on the given
474
+	 * id.
475
+	 * 
476
+	 * @param  integer $id
477
+	 * @param  array   $relations
478
+	 * @param  array   $columns
479
+	 * @return object
480
+	 */
481
+	public function find($id, $relations = [], $columns = array('*'))
482
+	{
483
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
484
+	}
485 485
     
486
-    /**
487
-     * Fetch records from the storage based on the given
488
-     * condition.
489
-     * 
490
-     * @param  array   $conditions array of conditions
491
-     * @param  array   $relations
492
-     * @param  string  $sortBy
493
-     * @param  boolean $desc
494
-     * @param  array   $columns
495
-     * @return collection
496
-     */
497
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
498
-    {
499
-        $conditions = $this->constructConditions($conditions);
500
-        $sort       = $desc ? 'desc' : 'asc';
501
-        return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
502
-    }
503
-
504
-    /**
505
-     * Fetch the first record from the storage based on the given
506
-     * condition.
507
-     *
508
-     * @param  array   $conditions array of conditions
509
-     * @param  array   $relations
510
-     * @param  array   $columns
511
-     * @return object
512
-     */
513
-    public function first($conditions, $relations = [], $columns = array('*'))
514
-    {
515
-        $conditions = $this->constructConditions($conditions);
516
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);  
517
-    }
518
-
519
-    /**
520
-     * Build the conditions recursively for the retrieving methods.
521
-     * @param  array $conditions
522
-     * @return array
523
-     */
524
-    protected function constructConditions($conditions)
525
-    {   
526
-        $conditionString = '';
527
-        $conditionValues = [];
528
-        foreach ($conditions as $key => $value) 
529
-        {
530
-            if ($key == 'and') 
531
-            {
532
-                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
533
-                $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
534
-            }
535
-            else if ($key == 'or')
536
-            {
537
-                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
538
-                $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
539
-            }
540
-            else
541
-            {
542
-                if (is_array($value)) 
543
-                {
544
-                    $operator = $value['op'];
545
-                    if (strtolower($operator) == 'between') 
546
-                    {
547
-                        $value1 = $value['val1'];
548
-                        $value2 = $value['val2'];
549
-                    }
550
-                    else
551
-                    {
552
-                        $value = $value['val'];
553
-                    }
554
-                }
555
-                else
556
-                {
557
-                    $operator = '=';
558
-                }
486
+	/**
487
+	 * Fetch records from the storage based on the given
488
+	 * condition.
489
+	 * 
490
+	 * @param  array   $conditions array of conditions
491
+	 * @param  array   $relations
492
+	 * @param  string  $sortBy
493
+	 * @param  boolean $desc
494
+	 * @param  array   $columns
495
+	 * @return collection
496
+	 */
497
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
498
+	{
499
+		$conditions = $this->constructConditions($conditions);
500
+		$sort       = $desc ? 'desc' : 'asc';
501
+		return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
502
+	}
503
+
504
+	/**
505
+	 * Fetch the first record from the storage based on the given
506
+	 * condition.
507
+	 *
508
+	 * @param  array   $conditions array of conditions
509
+	 * @param  array   $relations
510
+	 * @param  array   $columns
511
+	 * @return object
512
+	 */
513
+	public function first($conditions, $relations = [], $columns = array('*'))
514
+	{
515
+		$conditions = $this->constructConditions($conditions);
516
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);  
517
+	}
518
+
519
+	/**
520
+	 * Build the conditions recursively for the retrieving methods.
521
+	 * @param  array $conditions
522
+	 * @return array
523
+	 */
524
+	protected function constructConditions($conditions)
525
+	{   
526
+		$conditionString = '';
527
+		$conditionValues = [];
528
+		foreach ($conditions as $key => $value) 
529
+		{
530
+			if ($key == 'and') 
531
+			{
532
+				$conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
533
+				$conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
534
+			}
535
+			else if ($key == 'or')
536
+			{
537
+				$conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
538
+				$conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
539
+			}
540
+			else
541
+			{
542
+				if (is_array($value)) 
543
+				{
544
+					$operator = $value['op'];
545
+					if (strtolower($operator) == 'between') 
546
+					{
547
+						$value1 = $value['val1'];
548
+						$value2 = $value['val2'];
549
+					}
550
+					else
551
+					{
552
+						$value = $value['val'];
553
+					}
554
+				}
555
+				else
556
+				{
557
+					$operator = '=';
558
+				}
559 559
                 
560
-                if (strtolower($operator) == 'between') 
561
-                {
562
-                    $conditionString  .= $key . '>=? and ';
563
-                    $conditionValues[] = $value1;
564
-
565
-                    $conditionString  .= $key . '<=? {op} ';
566
-                    $conditionValues[] = $value2;
567
-                }
568
-                else
569
-                {
570
-                    $conditionString  .= $key . $operator . '? {op} ';
571
-                    $conditionValues[] = $value;
572
-                }
573
-            }
574
-        }
575
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
576
-        return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
577
-    }
578
-
579
-    /**
580
-     * Abstract method that return the necessary 
581
-     * information (full model namespace)
582
-     * needed to preform the previous actions.
583
-     * 
584
-     * @return string
585
-     */
586
-    abstract protected function getModel();
560
+				if (strtolower($operator) == 'between') 
561
+				{
562
+					$conditionString  .= $key . '>=? and ';
563
+					$conditionValues[] = $value1;
564
+
565
+					$conditionString  .= $key . '<=? {op} ';
566
+					$conditionValues[] = $value2;
567
+				}
568
+				else
569
+				{
570
+					$conditionString  .= $key . $operator . '? {op} ';
571
+					$conditionValues[] = $value;
572
+				}
573
+			}
574
+		}
575
+		$conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
576
+		return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
577
+	}
578
+
579
+	/**
580
+	 * Abstract method that return the necessary 
581
+	 * information (full model namespace)
582
+	 * needed to preform the previous actions.
583
+	 * 
584
+	 * @return string
585
+	 */
586
+	abstract protected function getModel();
587 587
 }
588 588
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -63,14 +63,14 @@  discard block
 block discarded – undo
63 63
         /**
64 64
          * Construct the select conditions for the model.
65 65
          */
66
-        $model->where(function ($q) use ($query, $conditionColumns, $relations){
66
+        $model->where(function($q) use ($query, $conditionColumns, $relations){
67 67
 
68 68
             if (count($conditionColumns)) 
69 69
             {
70 70
                 /**
71 71
                  * Use the first element in the model columns to construct the first condition.
72 72
                  */
73
-                $q->where(\DB::raw('LOWER(' . array_shift($conditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
73
+                $q->where(\DB::raw('LOWER('.array_shift($conditionColumns).')'), 'LIKE', '%'.strtolower($query).'%');
74 74
             }
75 75
 
76 76
             /**
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
              */
79 79
             foreach ($conditionColumns as $column) 
80 80
             {
81
-                $q->orWhere(\DB::raw('LOWER(' . $column . ')'), 'LIKE', '%' . strtolower($query) . '%');
81
+                $q->orWhere(\DB::raw('LOWER('.$column.')'), 'LIKE', '%'.strtolower($query).'%');
82 82
             }
83 83
 
84 84
             /**
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
                     /**
100 100
                      * Construct the relation condition.
101 101
                      */
102
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation){
102
+                    $q->orWhereHas($relation, function($subModel) use ($query, $relation){
103 103
 
104
-                        $subModel->where(function ($q) use ($query, $relation){
104
+                        $subModel->where(function($q) use ($query, $relation){
105 105
 
106 106
                             /**
107 107
                              * Get columns of the relation.
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
                                 /**
114 114
                                 * Use the first element in the relation model columns to construct the first condition.
115 115
                                  */
116
-                                $q->where(\DB::raw('LOWER(' . array_shift($subConditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
116
+                                $q->where(\DB::raw('LOWER('.array_shift($subConditionColumns).')'), 'LIKE', '%'.strtolower($query).'%');
117 117
                             }
118 118
 
119 119
                             /**
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                              */
122 122
                             foreach ($subConditionColumns as $subConditionColumn)
123 123
                             {
124
-                                $q->orWhere(\DB::raw('LOWER(' . $subConditionColumn . ')'), 'LIKE', '%' . strtolower($query) . '%');
124
+                                $q->orWhere(\DB::raw('LOWER('.$subConditionColumn.')'), 'LIKE', '%'.strtolower($query).'%');
125 125
                             } 
126 126
                         });
127 127
 
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
         $modelClass = $this->model;
183 183
         $relations  = [];
184 184
 
185
-        \DB::transaction(function () use (&$model, &$relations, $data, $saveLog, $modelClass) {
185
+        \DB::transaction(function() use (&$model, &$relations, $data, $saveLog, $modelClass) {
186 186
             /**
187 187
              * If the id is present in the data then select the model for updating,
188 188
              * else create new model.
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
             $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
192 192
             if ( ! $model) 
193 193
             {
194
-                \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
194
+                \ErrorHandler::notFound(class_basename($modelClass).' with id : '.$data['id']);
195 195
             }
196 196
 
197 197
             /**
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
                                  */
251 251
                                 if ( ! $relationModel) 
252 252
                                 {
253
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
253
+                                    \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
254 254
                                 }
255 255
 
256 256
                                 /**
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
                                     /**
262 262
                                      * Prevent the sub relations or attributes not in the fillable.
263 263
                                      */
264
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
264
+                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false)
265 265
                                     {
266 266
                                         $relationModel->$attr = $val;
267 267
                                     }
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
                                      */
290 290
                                     if ( ! $relationModel) 
291 291
                                     {
292
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
292
+                                        \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
293 293
                                     }
294 294
 
295 295
                                     /**
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
         }
429 429
         else
430 430
         {
431
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
431
+            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($data, $saveLog){
432 432
                 $model->update($data);
433 433
                 $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
434 434
             });
@@ -447,11 +447,11 @@  discard block
 block discarded – undo
447 447
     {
448 448
         if ($attribute == 'id') 
449 449
         {
450
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
450
+            \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) {
451 451
                 $model = $this->model->lockForUpdate()->find($value);
452 452
                 if ( ! $model) 
453 453
                 {
454
-                    \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
454
+                    \ErrorHandler::notFound(class_basename($this->model).' with id : '.$value);
455 455
                 }
456 456
                 
457 457
                 $model->delete();
@@ -460,8 +460,8 @@  discard block
 block discarded – undo
460 460
         }
461 461
         else
462 462
         {
463
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
464
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
463
+            \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) {
464
+                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) {
465 465
                     $model->delete();
466 466
                     $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
467 467
                 });
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
     {
499 499
         $conditions = $this->constructConditions($conditions);
500 500
         $sort       = $desc ? 'desc' : 'asc';
501
-        return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
501
+        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
502 502
     }
503 503
 
504 504
     /**
@@ -529,12 +529,12 @@  discard block
 block discarded – undo
529 529
         {
530 530
             if ($key == 'and') 
531 531
             {
532
-                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
532
+                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']).' {op} ';
533 533
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
534 534
             }
535 535
             else if ($key == 'or')
536 536
             {
537
-                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
537
+                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']).' {op} ';
538 538
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
539 539
             }
540 540
             else
@@ -559,20 +559,20 @@  discard block
 block discarded – undo
559 559
                 
560 560
                 if (strtolower($operator) == 'between') 
561 561
                 {
562
-                    $conditionString  .= $key . '>=? and ';
562
+                    $conditionString  .= $key.'>=? and ';
563 563
                     $conditionValues[] = $value1;
564 564
 
565
-                    $conditionString  .= $key . '<=? {op} ';
565
+                    $conditionString  .= $key.'<=? {op} ';
566 566
                     $conditionValues[] = $value2;
567 567
                 }
568 568
                 else
569 569
                 {
570
-                    $conditionString  .= $key . $operator . '? {op} ';
570
+                    $conditionString  .= $key.$operator.'? {op} ';
571 571
                     $conditionValues[] = $value;
572 572
                 }
573 573
             }
574 574
         }
575
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
575
+        $conditionString = '('.rtrim($conditionString, '{op} ').')';
576 576
         return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
577 577
     }
578 578
 
Please login to merge, or discard this patch.
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -425,8 +425,7 @@  discard block
 block discarded – undo
425 425
             $model = $this->model->lockForUpdate()->find($value);
426 426
             $model ? $model->update($data) : 0;
427 427
             $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
428
-        }
429
-        else
428
+        } else
430 429
         {
431 430
             call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
432 431
                 $model->update($data);
@@ -457,8 +456,7 @@  discard block
 block discarded – undo
457 456
                 $model->delete();
458 457
                 $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
459 458
             });
460
-        }
461
-        else
459
+        } else
462 460
         {
463 461
             \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
464 462
                 call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
@@ -531,13 +529,11 @@  discard block
 block discarded – undo
531 529
             {
532 530
                 $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
533 531
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
534
-            }
535
-            else if ($key == 'or')
532
+            } else if ($key == 'or')
536 533
             {
537 534
                 $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
538 535
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
539
-            }
540
-            else
536
+            } else
541 537
             {
542 538
                 if (is_array($value)) 
543 539
                 {
@@ -546,13 +542,11 @@  discard block
 block discarded – undo
546 542
                     {
547 543
                         $value1 = $value['val1'];
548 544
                         $value2 = $value['val2'];
549
-                    }
550
-                    else
545
+                    } else
551 546
                     {
552 547
                         $value = $value['val'];
553 548
                     }
554
-                }
555
-                else
549
+                } else
556 550
                 {
557 551
                     $operator = '=';
558 552
                 }
@@ -564,8 +558,7 @@  discard block
 block discarded – undo
564 558
 
565 559
                     $conditionString  .= $key . '<=? {op} ';
566 560
                     $conditionValues[] = $value2;
567
-                }
568
-                else
561
+                } else
569 562
                 {
570 563
                     $conditionString  .= $key . $operator . '? {op} ';
571 564
                     $conditionValues[] = $value;
Please login to merge, or discard this patch.