@@ -5,7 +5,7 @@ |
||
5 | 5 | public function getConfig() |
6 | 6 | { |
7 | 7 | $customSettings = []; |
8 | - Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){ |
|
8 | + Settings::get(['key', 'value'])->each(function($setting) use (&$customSettings){ |
|
9 | 9 | $customSettings[$setting['key']] = $setting['value']; |
10 | 10 | }); |
11 | 11 |
@@ -3,7 +3,7 @@ |
||
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
5 | 5 | |
6 | -class Log extends Model{ |
|
6 | +class Log extends Model { |
|
7 | 7 | |
8 | 8 | use SoftDeletes; |
9 | 9 | protected $table = 'logs'; |
@@ -12,11 +12,11 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('settings', function (Blueprint $table) { |
|
15 | + Schema::create('settings', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('name',100); |
|
18 | - $table->string('key',100)->unique(); |
|
19 | - $table->string('value',100); |
|
17 | + $table->string('name', 100); |
|
18 | + $table->string('key', 100)->unique(); |
|
19 | + $table->string('value', 100); |
|
20 | 20 | $table->softDeletes(); |
21 | 21 | $table->timestamps(); |
22 | 22 | }); |
@@ -12,11 +12,11 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('logs', function (Blueprint $table) { |
|
15 | + Schema::create('logs', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('action',100); |
|
18 | - $table->string('item_name',100); |
|
19 | - $table->string('item_type',100); |
|
17 | + $table->string('action', 100); |
|
18 | + $table->string('item_name', 100); |
|
19 | + $table->string('item_type', 100); |
|
20 | 20 | $table->integer('item_id'); |
21 | 21 | $table->integer('user_id'); |
22 | 22 | $table->softDeletes(); |
@@ -3,14 +3,14 @@ |
||
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
5 | 5 | |
6 | -class Settings extends Model{ |
|
6 | +class Settings extends Model { |
|
7 | 7 | |
8 | 8 | use SoftDeletes; |
9 | 9 | protected $table = 'settings'; |
10 | 10 | protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
11 | 11 | protected $hidden = ['deleted_at']; |
12 | 12 | protected $guarded = ['id', 'key']; |
13 | - protected $fillable = ['name','value']; |
|
13 | + protected $fillable = ['name', 'value']; |
|
14 | 14 | |
15 | 15 | public function getCreatedAtAttribute($value) |
16 | 16 | { |
@@ -60,26 +60,26 @@ discard block |
||
60 | 60 | $conditionColumns = $this->model->getFillable(); |
61 | 61 | $sort = $desc ? 'desc' : 'asc'; |
62 | 62 | |
63 | - $model->where(function ($q) use ($query, $conditionColumns, $relations){ |
|
64 | - $q->where(\DB::raw('LOWER(CAST(' . array_shift($conditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%'); |
|
63 | + $model->where(function($q) use ($query, $conditionColumns, $relations){ |
|
64 | + $q->where(\DB::raw('LOWER(CAST('.array_shift($conditionColumns).' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%'); |
|
65 | 65 | foreach ($conditionColumns as $column) |
66 | 66 | { |
67 | - $q->orWhere(\DB::raw('LOWER(CAST(' . $column . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%'); |
|
67 | + $q->orWhere(\DB::raw('LOWER(CAST('.$column.' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%'); |
|
68 | 68 | } |
69 | 69 | foreach ($relations as $relation) |
70 | 70 | { |
71 | 71 | $relation = explode('.', $relation)[0]; |
72 | 72 | if (\Core::$relation()) |
73 | 73 | { |
74 | - $q->orWhereHas($relation, function ($subModel) use ($query, $relation){ |
|
74 | + $q->orWhereHas($relation, function($subModel) use ($query, $relation){ |
|
75 | 75 | |
76 | - $subModel->where(function ($q) use ($query, $relation){ |
|
76 | + $subModel->where(function($q) use ($query, $relation){ |
|
77 | 77 | |
78 | 78 | $subConditionColumns = \Core::$relation()->model->getFillable(); |
79 | - $q->where(\DB::raw('LOWER(CAST(' . array_shift($subConditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%'); |
|
79 | + $q->where(\DB::raw('LOWER(CAST('.array_shift($subConditionColumns).' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%'); |
|
80 | 80 | foreach ($subConditionColumns as $subConditionColumn) |
81 | 81 | { |
82 | - $q->orWhere(\DB::raw('LOWER(CAST(' . $subConditionColumn . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%'); |
|
82 | + $q->orWhere(\DB::raw('LOWER(CAST('.$subConditionColumn.' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%'); |
|
83 | 83 | } |
84 | 84 | }); |
85 | 85 | |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $relations = []; |
142 | 142 | $with = []; |
143 | 143 | |
144 | - \DB::transaction(function () use (&$model, &$relations, &$with, $data, $saveLog, $modelClass) { |
|
144 | + \DB::transaction(function() use (&$model, &$relations, &$with, $data, $saveLog, $modelClass) { |
|
145 | 145 | /** |
146 | 146 | * If the id is present in the data then select the model for updating, |
147 | 147 | * else create new model. |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass; |
151 | 151 | if ( ! $model) |
152 | 152 | { |
153 | - \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']); |
|
153 | + \ErrorHandler::notFound(class_basename($modelClass).' with id : '.$data['id']); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
@@ -181,12 +181,12 @@ discard block |
||
181 | 181 | $relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel; |
182 | 182 | if ( ! $relationModel) |
183 | 183 | { |
184 | - \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']); |
|
184 | + \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']); |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | foreach ($val as $attr => $val) |
188 | 188 | { |
189 | - if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false) |
|
189 | + if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false) |
|
190 | 190 | { |
191 | 191 | $relationModel->$attr = $val; |
192 | 192 | } |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | $relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel; |
201 | 201 | if ( ! $relationModel) |
202 | 202 | { |
203 | - \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']); |
|
203 | + \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | if (array_search($attr, $relationModel->getFillable(), true) !== false) |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | public function saveMany(array $data) |
288 | 288 | { |
289 | 289 | $result = []; |
290 | - \DB::transaction(function () use (&$result, $data) { |
|
290 | + \DB::transaction(function() use (&$result, $data) { |
|
291 | 291 | foreach ($data as $key => $value) |
292 | 292 | { |
293 | 293 | $result[] = $this->save($value); |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | $model ? $model->update($data) : 0; |
314 | 314 | $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false; |
315 | 315 | } |
316 | - call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){ |
|
316 | + call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($data, $saveLog){ |
|
317 | 317 | $model->update($data); |
318 | 318 | $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false; |
319 | 319 | }); |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | { |
332 | 332 | if ($attribute == 'id') |
333 | 333 | { |
334 | - \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) { |
|
334 | + \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) { |
|
335 | 335 | $model = $this->model->lockForUpdate()->find($value); |
336 | 336 | $model->delete(); |
337 | 337 | $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false; |
@@ -339,8 +339,8 @@ discard block |
||
339 | 339 | } |
340 | 340 | else |
341 | 341 | { |
342 | - \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) { |
|
343 | - call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){ |
|
342 | + \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) { |
|
343 | + call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) { |
|
344 | 344 | $model->delete(); |
345 | 345 | $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false; |
346 | 346 | }); |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | { |
378 | 378 | $conditions = $this->constructConditions($conditions); |
379 | 379 | $sort = $desc ? 'desc' : 'asc'; |
380 | - return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns); |
|
380 | + return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns); |
|
381 | 381 | } |
382 | 382 | |
383 | 383 | /** |
@@ -408,21 +408,21 @@ discard block |
||
408 | 408 | { |
409 | 409 | if ($key == 'and') |
410 | 410 | { |
411 | - $conditionString .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} '; |
|
411 | + $conditionString .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']).' {op} '; |
|
412 | 412 | $conditionValues = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']); |
413 | 413 | } |
414 | 414 | else if ($key == 'or') |
415 | 415 | { |
416 | - $conditionString .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} '; |
|
416 | + $conditionString .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']).' {op} '; |
|
417 | 417 | $conditionValues = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']); |
418 | 418 | } |
419 | 419 | else |
420 | 420 | { |
421 | - $conditionString .= $key . '=? {op} '; |
|
421 | + $conditionString .= $key.'=? {op} '; |
|
422 | 422 | $conditionValues[] = $value; |
423 | 423 | } |
424 | 424 | } |
425 | - $conditionString = '(' . rtrim($conditionString, '{op} ') . ')'; |
|
425 | + $conditionString = '('.rtrim($conditionString, '{op} ').')'; |
|
426 | 426 | return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues]; |
427 | 427 | } |
428 | 428 |
@@ -18,7 +18,7 @@ |
||
18 | 18 | { |
19 | 19 | foreach ($this->getRepoNameSpace() as $repoNameSpace) |
20 | 20 | { |
21 | - $class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository'; |
|
21 | + $class = rtrim($repoNameSpace, '\\').'\\'.ucfirst(str_singular($name)).'Repository'; |
|
22 | 22 | if (class_exists($class)) |
23 | 23 | { |
24 | 24 | return \App::make($class); |
@@ -12,5 +12,5 @@ |
||
12 | 12 | * to preform actions like (add, edit ... etc). |
13 | 13 | * @var string |
14 | 14 | */ |
15 | - protected $model = 'logs'; |
|
15 | + protected $model = 'logs'; |
|
16 | 16 | } |
@@ -13,14 +13,14 @@ |
||
13 | 13 | * to preform actions like (add, edit ... etc). |
14 | 14 | * @var string |
15 | 15 | */ |
16 | - protected $model = 'settings'; |
|
16 | + protected $model = 'settings'; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * The validations rules used by the base api controller |
20 | 20 | * to check before add. |
21 | 21 | * @var array |
22 | 22 | */ |
23 | - protected $validationRules = [ |
|
23 | + protected $validationRules = [ |
|
24 | 24 | 'name' => 'required|string|max:100', |
25 | 25 | 'value' => 'required|string|max:100' |
26 | 26 | ]; |