Completed
Push — master ( a23113...3f274c )
by Sherif
02:17
created
src/Modules/Core/AbstractRepositories/AbstractRepository.php 4 patches
Doc Comments   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
      *
33 33
      * @param  array   $relations
34 34
      * @param  string  $sortBy
35
-     * @param  boolean $desc
35
+     * @param  integer $desc
36 36
      * @param  array   $columns
37 37
      * @return collection
38 38
      */
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
      * @param  integer $perPage
51 51
      * @param  array   $relations
52 52
      * @param  string  $sortBy
53
-     * @param  boolean $desc
53
+     * @param  integer $desc
54 54
      * @param  array   $columns
55 55
      * @return collection
56 56
      */
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
      * @param  integer $perPage
165 165
      * @param  array   $relations
166 166
      * @param  string  $sortBy
167
-     * @param  boolean $desc
167
+     * @param  integer $desc
168 168
      * @param  array   $columns
169 169
      * @return collection
170 170
      */
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
      * @param  integer $perPage
183 183
      * @param  array   $relations
184 184
      * @param  string  $sortBy
185
-     * @param  boolean $desc
185
+     * @param  integer $desc
186 186
      * @param  array   $columns
187 187
      * @return collection
188 188
      */
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
      * Save the given model to the storage.
199 199
      * 
200 200
      * @param  array   $data
201
-     * @return object
201
+     * @return boolean
202 202
      */
203 203
     public function save(array $data)
204 204
     {
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
      * id.
517 517
      * 
518 518
      * @param  integer $id
519
-     * @param  array   $relations
519
+     * @param  string[]   $relations
520 520
      * @param  array   $columns
521 521
      * @return object
522 522
      */
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
      * @param  array   $conditions array of conditions
533 533
      * @param  array   $relations
534 534
      * @param  string  $sortBy
535
-     * @param  boolean $desc
535
+     * @param  integer $desc
536 536
      * @param  array   $columns
537 537
      * @return collection
538 538
      */
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
      * @param  array   $conditions array of conditions
565 565
      * @param  integer $perPage
566 566
      * @param  string  $sortBy
567
-     * @param  boolean $desc
567
+     * @param  integer $desc
568 568
      * @param  array   $columns
569 569
      * @return collection
570 570
      */
Please login to merge, or discard this patch.
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -63,11 +63,11 @@  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
-                $column = 'LOWER(' . array_shift($conditionColumns) . ')';
70
+                $column = 'LOWER('.array_shift($conditionColumns).')';
71 71
                 if (str_contains($column, '->')) 
72 72
                 {
73 73
                     $column = $this->wrapJsonSelector($column);
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
                 /**
77 77
                  * Use the first element in the model columns to construct the first condition.
78 78
                  */
79
-                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
79
+                $q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
80 80
             }
81 81
 
82 82
             /**
@@ -84,13 +84,13 @@  discard block
 block discarded – undo
84 84
              */
85 85
             foreach ($conditionColumns as $column) 
86 86
             {
87
-                $column = 'LOWER(' . $column . ')';
87
+                $column = 'LOWER('.$column.')';
88 88
                 if (str_contains($column, '->')) 
89 89
                 {
90 90
                     $column = $this->wrapJsonSelector($column);
91 91
                 }
92 92
 
93
-                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
93
+                $q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
94 94
             }
95 95
 
96 96
             /**
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
111 111
                     /**
112 112
                      * Construct the relation condition.
113 113
                      */
114
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation){
114
+                    $q->orWhereHas($relation, function($subModel) use ($query, $relation){
115 115
 
116
-                        $subModel->where(function ($q) use ($query, $relation){
116
+                        $subModel->where(function($q) use ($query, $relation){
117 117
 
118 118
                             /**
119 119
                              * Get columns of the relation.
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
                             if (count($subConditionColumns)) 
124 124
                             {
125 125
 
126
-                                $column = 'LOWER(' . array_shift($subConditionColumns) . ')';
126
+                                $column = 'LOWER('.array_shift($subConditionColumns).')';
127 127
                                 if (str_contains($column, '->')) 
128 128
                                 {
129 129
                                     $column = $this->wrapJsonSelector($column);
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
                                 /**
133 133
                                 * Use the first element in the relation model columns to construct the first condition.
134 134
                                  */
135
-                                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
135
+                                $q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
136 136
                             }
137 137
 
138 138
                             /**
@@ -140,13 +140,13 @@  discard block
 block discarded – undo
140 140
                              */
141 141
                             foreach ($subConditionColumns as $subConditionColumn)
142 142
                             {
143
-                                $column = 'LOWER(' . $subConditionColumn . ')';
143
+                                $column = 'LOWER('.$subConditionColumn.')';
144 144
                                 if (str_contains($column, '->')) 
145 145
                                 {
146 146
                                     $column = $this->wrapJsonSelector($column);
147 147
                                 }
148 148
                                 
149
-                                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
149
+                                $q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
150 150
                             } 
151 151
                         });
152 152
 
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
         $modelClass = $this->model;
207 207
         $relations  = [];
208 208
 
209
-        \DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
209
+        \DB::transaction(function() use (&$model, &$relations, $data, $modelClass) {
210 210
             /**
211 211
              * If the id is present in the data then select the model for updating,
212 212
              * else create new model.
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
             $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
216 216
             if ( ! $model) 
217 217
             {
218
-                \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
218
+                \ErrorHandler::notFound(class_basename($modelClass).' with id : '.$data['id']);
219 219
             }
220 220
 
221 221
             /**
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
                                  */
274 274
                                 if ( ! $relationModel) 
275 275
                                 {
276
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
276
+                                    \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
277 277
                                 }
278 278
 
279 279
                                 /**
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
                                     /**
285 285
                                      * Prevent the sub relations or attributes not in the fillable.
286 286
                                      */
287
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
287
+                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false)
288 288
                                     {
289 289
                                         $relationModel->$attr = $val;
290 290
                                     }
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
                                      */
315 315
                                     if ( ! $relationModel) 
316 316
                                     {
317
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
317
+                                        \ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
318 318
                                     }
319 319
 
320 320
                                     foreach ($value as $relationAttribute => $relationValue) 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
         }
457 457
         else
458 458
         {
459
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
459
+            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($data){
460 460
                 $model->update($data);
461 461
             });
462 462
         }
@@ -474,11 +474,11 @@  discard block
 block discarded – undo
474 474
     {
475 475
         if ($attribute == 'id') 
476 476
         {
477
-            \DB::transaction(function () use ($value, $attribute, &$result) {
477
+            \DB::transaction(function() use ($value, $attribute, &$result) {
478 478
                 $model = $this->model->lockForUpdate()->find($value);
479 479
                 if ( ! $model) 
480 480
                 {
481
-                    \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
481
+                    \ErrorHandler::notFound(class_basename($this->model).' with id : '.$value);
482 482
                 }
483 483
                 
484 484
                 $model->delete();
@@ -486,8 +486,8 @@  discard block
 block discarded – undo
486 486
         }
487 487
         else
488 488
         {
489
-            \DB::transaction(function () use ($value, $attribute, &$result) {
490
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
489
+            \DB::transaction(function() use ($value, $attribute, &$result) {
490
+                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) {
491 491
                     $model->delete();
492 492
                 });
493 493
             });   
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
     {
524 524
         $conditions = $this->constructConditions($conditions, $this->model);
525 525
         $sort       = $desc ? 'desc' : 'asc';
526
-        return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
526
+        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
527 527
     }
528 528
 
529 529
     /**
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
             $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
564 564
         }
565 565
 
566
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
566
+        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns); ;
567 567
     }
568 568
 
569 569
     /**
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 
579 579
         if ( ! $model) 
580 580
         {
581
-            \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
581
+            \ErrorHandler::notFound(class_basename($this->model).' with id : '.$id);
582 582
         }
583 583
 
584 584
         $model->restore();
@@ -603,13 +603,13 @@  discard block
 block discarded – undo
603 603
             if ($key == 'and') 
604 604
             {
605 605
                 $conditions       = $this->constructConditions($value, $model);
606
-                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
606
+                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']).' {op} ';
607 607
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
608 608
             }
609 609
             else if ($key == 'or')
610 610
             {
611 611
                 $conditions       = $this->constructConditions($value, $model);
612
-                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
612
+                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']).' {op} ';
613 613
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
614 614
             }
615 615
             else
@@ -634,41 +634,41 @@  discard block
 block discarded – undo
634 634
                 
635 635
                 if (strtolower($operator) == 'between') 
636 636
                 {
637
-                    $conditionString  .= $key . ' >= ? and ';
637
+                    $conditionString  .= $key.' >= ? and ';
638 638
                     $conditionValues[] = $value1;
639 639
 
640
-                    $conditionString  .= $key . ' <= ? {op} ';
640
+                    $conditionString  .= $key.' <= ? {op} ';
641 641
                     $conditionValues[] = $value2;
642 642
                 }
643 643
                 elseif (strtolower($operator) == 'in') 
644 644
                 {
645 645
                     $conditionValues  = array_merge($conditionValues, $value);
646 646
                     $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
647
-                    $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
647
+                    $conditionString .= $key.' in ('.rtrim($inBindingsString, ',').') {op} ';
648 648
                 }
649 649
                 elseif (strtolower($operator) == 'null') 
650 650
                 {
651
-                    $conditionString .= $key . ' is null {op} ';
651
+                    $conditionString .= $key.' is null {op} ';
652 652
                 }
653 653
                 elseif (strtolower($operator) == 'not null') 
654 654
                 {
655
-                    $conditionString .= $key . ' is not null {op} ';
655
+                    $conditionString .= $key.' is not null {op} ';
656 656
                 }
657 657
                 elseif (strtolower($operator) == 'has') 
658 658
                 {
659 659
                     $sql              = $model->withTrashed()->has($key)->toSql();
660 660
                     $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
661
-                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
661
+                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')').' and '.$conditions['conditionString'].') {op} ';
662 662
                     $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
663 663
                 }
664 664
                 else
665 665
                 {
666
-                    $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
666
+                    $conditionString  .= $key.' '.$operator.' ? {op} ';
667 667
                     $conditionValues[] = $value;
668 668
                 }
669 669
             }
670 670
         }
671
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
671
+        $conditionString = '('.rtrim($conditionString, '{op} ').')';
672 672
         return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
673 673
     }
674 674
 
@@ -684,11 +684,11 @@  discard block
 block discarded – undo
684 684
         $value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
685 685
         $path       = explode('->', $value);
686 686
         $field      = array_shift($path);
687
-        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
687
+        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function($part) {
688 688
             return '"'.$part.'"';
689 689
         })->implode('.'));
690 690
         
691
-        return $removeLast === false ? $result : $result . ')';
691
+        return $removeLast === false ? $result : $result.')';
692 692
     }
693 693
 
694 694
     /**
Please login to merge, or discard this patch.
Braces   +11 added lines, -22 removed lines patch added patch discarded remove patch
@@ -453,8 +453,7 @@  discard block
 block discarded – undo
453 453
         {
454 454
             $model = $this->model->lockForUpdate()->find($value);
455 455
             $model ? $model->update($data) : 0;
456
-        }
457
-        else
456
+        } else
458 457
         {
459 458
             call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
460 459
                 $model->update($data);
@@ -483,8 +482,7 @@  discard block
 block discarded – undo
483 482
                 
484 483
                 $model->delete();
485 484
             });
486
-        }
487
-        else
485
+        } else
488 486
         {
489 487
             \DB::transaction(function () use ($value, $attribute, &$result) {
490 488
                 call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
@@ -605,14 +603,12 @@  discard block
 block discarded – undo
605 603
                 $conditions       = $this->constructConditions($value, $model);
606 604
                 $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
607 605
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
608
-            }
609
-            else if ($key == 'or')
606
+            } else if ($key == 'or')
610 607
             {
611 608
                 $conditions       = $this->constructConditions($value, $model);
612 609
                 $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
613 610
                 $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
614
-            }
615
-            else
611
+            } else
616 612
             {
617 613
                 if (is_array($value)) 
618 614
                 {
@@ -621,13 +617,11 @@  discard block
 block discarded – undo
621 617
                     {
622 618
                         $value1 = $value['val1'];
623 619
                         $value2 = $value['val2'];
624
-                    }
625
-                    else
620
+                    } else
626 621
                     {
627 622
                         $value = array_key_exists('val', $value) ? $value['val'] : '';
628 623
                     }
629
-                }
630
-                else
624
+                } else
631 625
                 {
632 626
                     $operator = '=';
633 627
                 }
@@ -639,29 +633,24 @@  discard block
 block discarded – undo
639 633
 
640 634
                     $conditionString  .= $key . ' <= ? {op} ';
641 635
                     $conditionValues[] = $value2;
642
-                }
643
-                elseif (strtolower($operator) == 'in') 
636
+                } elseif (strtolower($operator) == 'in') 
644 637
                 {
645 638
                     $conditionValues  = array_merge($conditionValues, $value);
646 639
                     $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
647 640
                     $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
648
-                }
649
-                elseif (strtolower($operator) == 'null') 
641
+                } elseif (strtolower($operator) == 'null') 
650 642
                 {
651 643
                     $conditionString .= $key . ' is null {op} ';
652
-                }
653
-                elseif (strtolower($operator) == 'not null') 
644
+                } elseif (strtolower($operator) == 'not null') 
654 645
                 {
655 646
                     $conditionString .= $key . ' is not null {op} ';
656
-                }
657
-                elseif (strtolower($operator) == 'has') 
647
+                } elseif (strtolower($operator) == 'has') 
658 648
                 {
659 649
                     $sql              = $model->withTrashed()->has($key)->toSql();
660 650
                     $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
661 651
                     $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
662 652
                     $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
663
-                }
664
-                else
653
+                } else
665 654
                 {
666 655
                     $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
667 656
                     $conditionValues[] = $value;
Please login to merge, or discard this patch.
Indentation   +700 added lines, -700 removed lines patch added patch discarded remove patch
@@ -4,717 +4,717 @@
 block discarded – undo
4 4
 
5 5
 abstract class AbstractRepository implements RepositoryInterface
6 6
 {
7
-    /**
8
-     * The model implementation.
9
-     * 
10
-     * @var object
11
-     */
12
-    public $model;
7
+	/**
8
+	 * The model implementation.
9
+	 * 
10
+	 * @var object
11
+	 */
12
+	public $model;
13 13
     
14
-    /**
15
-     * The config implementation.
16
-     * 
17
-     * @var array
18
-     */
19
-    protected $config;
14
+	/**
15
+	 * The config implementation.
16
+	 * 
17
+	 * @var array
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
-                $column = 'LOWER(' . array_shift($conditionColumns) . ')';
71
-                if (str_contains($column, '->')) 
72
-                {
73
-                    $column = $this->wrapJsonSelector($column);
74
-                }
75
-
76
-                /**
77
-                 * Use the first element in the model columns to construct the first condition.
78
-                 */
79
-                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
80
-            }
81
-
82
-            /**
83
-             * Loop through the rest of the columns to construct or where conditions.
84
-             */
85
-            foreach ($conditionColumns as $column) 
86
-            {
87
-                $column = 'LOWER(' . $column . ')';
88
-                if (str_contains($column, '->')) 
89
-                {
90
-                    $column = $this->wrapJsonSelector($column);
91
-                }
92
-
93
-                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
94
-            }
95
-
96
-            /**
97
-             * Loop through the model relations.
98
-             */
99
-            foreach ($relations as $relation) 
100
-            {
101
-                /**
102
-                 * Remove the sub relation if exists.
103
-                 */
104
-                $relation = explode('.', $relation)[0];
105
-
106
-                /**
107
-                 * Try to fetch the relation repository from the core.
108
-                 */
109
-                if (\Core::$relation()) 
110
-                {
111
-                    /**
112
-                     * Construct the relation condition.
113
-                     */
114
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation){
115
-
116
-                        $subModel->where(function ($q) use ($query, $relation){
117
-
118
-                            /**
119
-                             * Get columns of the relation.
120
-                             */
121
-                            $subConditionColumns = \Core::$relation()->model->searchable;
122
-
123
-                            if (count($subConditionColumns)) 
124
-                            {
125
-
126
-                                $column = 'LOWER(' . array_shift($subConditionColumns) . ')';
127
-                                if (str_contains($column, '->')) 
128
-                                {
129
-                                    $column = $this->wrapJsonSelector($column);
130
-                                }
131
-
132
-                                /**
133
-                                * Use the first element in the relation model columns to construct the first condition.
134
-                                 */
135
-                                $q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
136
-                            }
137
-
138
-                            /**
139
-                             * Loop through the rest of the columns to construct or where conditions.
140
-                             */
141
-                            foreach ($subConditionColumns as $subConditionColumn)
142
-                            {
143
-                                $column = 'LOWER(' . $subConditionColumn . ')';
144
-                                if (str_contains($column, '->')) 
145
-                                {
146
-                                    $column = $this->wrapJsonSelector($column);
147
-                                }
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
+				$column = 'LOWER(' . array_shift($conditionColumns) . ')';
71
+				if (str_contains($column, '->')) 
72
+				{
73
+					$column = $this->wrapJsonSelector($column);
74
+				}
75
+
76
+				/**
77
+				 * Use the first element in the model columns to construct the first condition.
78
+				 */
79
+				$q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
80
+			}
81
+
82
+			/**
83
+			 * Loop through the rest of the columns to construct or where conditions.
84
+			 */
85
+			foreach ($conditionColumns as $column) 
86
+			{
87
+				$column = 'LOWER(' . $column . ')';
88
+				if (str_contains($column, '->')) 
89
+				{
90
+					$column = $this->wrapJsonSelector($column);
91
+				}
92
+
93
+				$q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
94
+			}
95
+
96
+			/**
97
+			 * Loop through the model relations.
98
+			 */
99
+			foreach ($relations as $relation) 
100
+			{
101
+				/**
102
+				 * Remove the sub relation if exists.
103
+				 */
104
+				$relation = explode('.', $relation)[0];
105
+
106
+				/**
107
+				 * Try to fetch the relation repository from the core.
108
+				 */
109
+				if (\Core::$relation()) 
110
+				{
111
+					/**
112
+					 * Construct the relation condition.
113
+					 */
114
+					$q->orWhereHas($relation, function ($subModel) use ($query, $relation){
115
+
116
+						$subModel->where(function ($q) use ($query, $relation){
117
+
118
+							/**
119
+							 * Get columns of the relation.
120
+							 */
121
+							$subConditionColumns = \Core::$relation()->model->searchable;
122
+
123
+							if (count($subConditionColumns)) 
124
+							{
125
+
126
+								$column = 'LOWER(' . array_shift($subConditionColumns) . ')';
127
+								if (str_contains($column, '->')) 
128
+								{
129
+									$column = $this->wrapJsonSelector($column);
130
+								}
131
+
132
+								/**
133
+								 * Use the first element in the relation model columns to construct the first condition.
134
+								 */
135
+								$q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
136
+							}
137
+
138
+							/**
139
+							 * Loop through the rest of the columns to construct or where conditions.
140
+							 */
141
+							foreach ($subConditionColumns as $subConditionColumn)
142
+							{
143
+								$column = 'LOWER(' . $subConditionColumn . ')';
144
+								if (str_contains($column, '->')) 
145
+								{
146
+									$column = $this->wrapJsonSelector($column);
147
+								}
148 148
                                 
149
-                                $q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
150
-                            } 
151
-                        });
152
-
153
-                    });
154
-                }
155
-            }
156
-        });
149
+								$q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
150
+							} 
151
+						});
152
+
153
+					});
154
+				}
155
+			}
156
+		});
157 157
         
158
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
159
-    }
158
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
159
+	}
160 160
     
161
-    /**
162
-     * Fetch all records with relations from storage in pages.
163
-     * 
164
-     * @param  integer $perPage
165
-     * @param  array   $relations
166
-     * @param  string  $sortBy
167
-     * @param  boolean $desc
168
-     * @param  array   $columns
169
-     * @return collection
170
-     */
171
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
172
-    {
173
-        $sort = $desc ? 'desc' : 'asc';
174
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->paginate($perPage, $columns);
175
-    }
176
-
177
-    /**
178
-     * Fetch all records with relations based on
179
-     * the given condition from storage in pages.
180
-     * 
181
-     * @param  array   $conditions array of conditions
182
-     * @param  integer $perPage
183
-     * @param  array   $relations
184
-     * @param  string  $sortBy
185
-     * @param  boolean $desc
186
-     * @param  array   $columns
187
-     * @return collection
188
-     */
189
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
190
-    {
191
-        unset($conditions['page']);
192
-        $conditions = $this->constructConditions($conditions, $this->model);
193
-        $sort       = $desc ? 'desc' : 'asc';
194
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
195
-    }
161
+	/**
162
+	 * Fetch all records with relations from storage in pages.
163
+	 * 
164
+	 * @param  integer $perPage
165
+	 * @param  array   $relations
166
+	 * @param  string  $sortBy
167
+	 * @param  boolean $desc
168
+	 * @param  array   $columns
169
+	 * @return collection
170
+	 */
171
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
172
+	{
173
+		$sort = $desc ? 'desc' : 'asc';
174
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->paginate($perPage, $columns);
175
+	}
176
+
177
+	/**
178
+	 * Fetch all records with relations based on
179
+	 * the given condition from storage in pages.
180
+	 * 
181
+	 * @param  array   $conditions array of conditions
182
+	 * @param  integer $perPage
183
+	 * @param  array   $relations
184
+	 * @param  string  $sortBy
185
+	 * @param  boolean $desc
186
+	 * @param  array   $columns
187
+	 * @return collection
188
+	 */
189
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
190
+	{
191
+		unset($conditions['page']);
192
+		$conditions = $this->constructConditions($conditions, $this->model);
193
+		$sort       = $desc ? 'desc' : 'asc';
194
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
195
+	}
196 196
     
197
-    /**
198
-     * Save the given model to the storage.
199
-     * 
200
-     * @param  array   $data
201
-     * @return object
202
-     */
203
-    public function save(array $data)
204
-    {
205
-        \Session::put('locale', 'all');
206
-        $model      = false;
207
-        $modelClass = $this->model;
208
-        $relations  = [];
209
-
210
-        \DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
211
-            /**
212
-             * If the id is present in the data then select the model for updating,
213
-             * else create new model.
214
-             * @var array
215
-             */
216
-            $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
217
-            if ( ! $model) 
218
-            {
219
-                \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
220
-            }
221
-
222
-            /**
223
-             * Construct the model object with the given data,
224
-             * and if there is a relation add it to relations array,
225
-             * then save the model.
226
-             */
227
-            foreach ($data as $key => $value) 
228
-            {
229
-                /**
230
-                 * If the attribute is a relation.
231
-                 */
232
-                $relation = camel_case($key);
233
-                if (method_exists($model, $relation) && \Core::$relation())
234
-                {
235
-                    /**
236
-                     * Check if the relation is a collection.
237
-                     */
238
-                    if (class_basename($model->$relation) == 'Collection') 
239
-                    {   
240
-                        /**
241
-                         * If the relation has no value then marke the relation data 
242
-                         * related to the model to be deleted.
243
-                         */
244
-                        if ( ! $value || ! count($value)) 
245
-                        {
246
-                            $relations[$relation] = 'delete';
247
-                        }   
248
-                    }
249
-                    if (is_array($value)) 
250
-                    {
251
-                        /**
252
-                         * Loop through the relation data.
253
-                         */
254
-                        foreach ($value as $attr => $val) 
255
-                        {
256
-                            /**
257
-                             * Get the relation model.
258
-                             */
259
-                            $relationBaseModel = \Core::$relation()->model;
260
-
261
-                            /**
262
-                             * Check if the relation is a collection.
263
-                             */
264
-                            if (class_basename($model->$relation) == 'Collection')
265
-                            {
266
-                                /**
267
-                                 * If the id is present in the data then select the relation model for updating,
268
-                                 * else create new model.
269
-                                 */
270
-                                $relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
271
-
272
-                                /**
273
-                                 * If model doesn't exists.
274
-                                 */
275
-                                if ( ! $relationModel) 
276
-                                {
277
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
278
-                                }
279
-
280
-                                /**
281
-                                 * Loop through the relation attributes.
282
-                                 */
283
-                                foreach ($val as $attr => $val) 
284
-                                {
285
-                                    /**
286
-                                     * Prevent the sub relations or attributes not in the fillable.
287
-                                     */
288
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
289
-                                    {
290
-                                        $relationModel->$attr = $val;
291
-                                    }
292
-                                }
293
-
294
-                                $relations[$relation][] = $relationModel;
295
-                            }
296
-                            /**
297
-                             * If not collection.
298
-                             */
299
-                            else
300
-                            {
301
-                                /**
302
-                                 * Prevent the sub relations.
303
-                                 */
304
-                                if (gettype($val) !== 'object' && gettype($val) !== 'array') 
305
-                                {
306
-
307
-                                    /**
308
-                                     * If the id is present in the data then select the relation model for updating,
309
-                                     * else create new model.
310
-                                     */
311
-                                    $relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
312
-
313
-                                    /**
314
-                                     * If model doesn't exists.
315
-                                     */
316
-                                    if ( ! $relationModel) 
317
-                                    {
318
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
319
-                                    }
320
-
321
-                                    foreach ($value as $relationAttribute => $relationValue) 
322
-                                    {
323
-                                        /**
324
-                                         * Prevent attributes not in the fillable.
325
-                                         */
326
-                                        if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) 
327
-                                        {
328
-                                            $relationModel->$relationAttribute = $relationValue;
329
-                                        }
330
-                                    }
331
-
332
-                                    $relations[$relation] = $relationModel;
333
-                                }
334
-                            }
335
-                        }
336
-                    }
337
-                }
338
-                /**
339
-                 * If the attribute isn't a relation and prevent attributes not in the fillable.
340
-                 */
341
-                else if (array_search($key, $model->getFillable(), true) !== false)
342
-                {
343
-                    $model->$key = $value;   
344
-                }
345
-            }
346
-
347
-            /**
348
-             * Loop through the relations array.
349
-             */
350
-            foreach ($relations as $key => $value) 
351
-            {
352
-                /**
353
-                 * If the relation is marked for delete then delete it.
354
-                 */
355
-                if ($value == 'delete' && $model->$key()->count())
356
-                {
357
-                    $model->$key()->delete();
358
-                }
359
-                /**
360
-                 * If the relation is an array.
361
-                 */
362
-                else if (gettype($value) == 'array') 
363
-                {
364
-                    /**
365
-                     * Save the model.
366
-                     */
367
-                    $model->save();
368
-                    $ids = [];
369
-
370
-                    /**
371
-                     * Loop through the relations.
372
-                     */
373
-                    foreach ($value as $val) 
374
-                    {
375
-                        switch (class_basename($model->$key())) 
376
-                        {
377
-                            /**
378
-                             * If the relation is one to many then update it's foreign key with
379
-                             * the model id and save it then add its id to ids array to delete all 
380
-                             * relations who's id isn't in the ids array.
381
-                             */
382
-                            case 'HasMany':
383
-                                $foreignKeyName       = $model->$key()->getForeignKeyName();
384
-                                $val->$foreignKeyName = $model->id;
385
-                                $val->save();
386
-                                $ids[] = $val->id;
387
-                                break;
388
-
389
-                            /**
390
-                             * If the relation is many to many then add it's id to the ids array to
391
-                             * attache these ids to the model.
392
-                             */
393
-                            case 'BelongsToMany':
394
-                                $val->save();
395
-                                $ids[] = $val->id;
396
-                                break;
397
-                        }
398
-                    }
399
-                    switch (class_basename($model->$key())) 
400
-                    {
401
-                        /**
402
-                         * If the relation is one to many then delete all 
403
-                         * relations who's id isn't in the ids array.
404
-                         */
405
-                        case 'HasMany':
406
-                            $model->$key()->whereNotIn('id', $ids)->delete();
407
-                            break;
408
-
409
-                        /**
410
-                         * If the relation is many to many then 
411
-                         * detach the previous data and attach 
412
-                         * the ids array to the model.
413
-                         */
414
-                        case 'BelongsToMany':
415
-                            $model->$key()->detach();
416
-                            $model->$key()->attach($ids);
417
-                            break;
418
-                    }
419
-                }
420
-                /**
421
-                 * If the relation isn't array.
422
-                 */
423
-                else
424
-                {
425
-                    switch (class_basename($model->$key())) 
426
-                    {
427
-                        /**
428
-                         * If the relation is one to one.
429
-                         */
430
-                        case 'HasOne':
431
-                            /**
432
-                             * Save the model.
433
-                             */
434
-                            $model->save();
435
-                            $foreignKeyName         = $model->$key()->getForeignKeyName();
436
-                            $value->$foreignKeyName = $model->id;
437
-                            $value->save();
438
-                            break;
439
-                        case 'BelongsTo':
440
-                            /**
441
-                             * Save the model.
442
-                             */
443
-                            $value->save();
444
-                            $model->$key()->associate($value);
445
-                            break;
446
-                    }
447
-                }
448
-            }
449
-
450
-            /**
451
-             * Save the model.
452
-             */
453
-            $model->save();
454
-        });
197
+	/**
198
+	 * Save the given model to the storage.
199
+	 * 
200
+	 * @param  array   $data
201
+	 * @return object
202
+	 */
203
+	public function save(array $data)
204
+	{
205
+		\Session::put('locale', 'all');
206
+		$model      = false;
207
+		$modelClass = $this->model;
208
+		$relations  = [];
209
+
210
+		\DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
211
+			/**
212
+			 * If the id is present in the data then select the model for updating,
213
+			 * else create new model.
214
+			 * @var array
215
+			 */
216
+			$model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
217
+			if ( ! $model) 
218
+			{
219
+				\ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
220
+			}
221
+
222
+			/**
223
+			 * Construct the model object with the given data,
224
+			 * and if there is a relation add it to relations array,
225
+			 * then save the model.
226
+			 */
227
+			foreach ($data as $key => $value) 
228
+			{
229
+				/**
230
+				 * If the attribute is a relation.
231
+				 */
232
+				$relation = camel_case($key);
233
+				if (method_exists($model, $relation) && \Core::$relation())
234
+				{
235
+					/**
236
+					 * Check if the relation is a collection.
237
+					 */
238
+					if (class_basename($model->$relation) == 'Collection') 
239
+					{   
240
+						/**
241
+						 * If the relation has no value then marke the relation data 
242
+						 * related to the model to be deleted.
243
+						 */
244
+						if ( ! $value || ! count($value)) 
245
+						{
246
+							$relations[$relation] = 'delete';
247
+						}   
248
+					}
249
+					if (is_array($value)) 
250
+					{
251
+						/**
252
+						 * Loop through the relation data.
253
+						 */
254
+						foreach ($value as $attr => $val) 
255
+						{
256
+							/**
257
+							 * Get the relation model.
258
+							 */
259
+							$relationBaseModel = \Core::$relation()->model;
260
+
261
+							/**
262
+							 * Check if the relation is a collection.
263
+							 */
264
+							if (class_basename($model->$relation) == 'Collection')
265
+							{
266
+								/**
267
+								 * If the id is present in the data then select the relation model for updating,
268
+								 * else create new model.
269
+								 */
270
+								$relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
271
+
272
+								/**
273
+								 * If model doesn't exists.
274
+								 */
275
+								if ( ! $relationModel) 
276
+								{
277
+									\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
278
+								}
279
+
280
+								/**
281
+								 * Loop through the relation attributes.
282
+								 */
283
+								foreach ($val as $attr => $val) 
284
+								{
285
+									/**
286
+									 * Prevent the sub relations or attributes not in the fillable.
287
+									 */
288
+									if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
289
+									{
290
+										$relationModel->$attr = $val;
291
+									}
292
+								}
293
+
294
+								$relations[$relation][] = $relationModel;
295
+							}
296
+							/**
297
+							 * If not collection.
298
+							 */
299
+							else
300
+							{
301
+								/**
302
+								 * Prevent the sub relations.
303
+								 */
304
+								if (gettype($val) !== 'object' && gettype($val) !== 'array') 
305
+								{
306
+
307
+									/**
308
+									 * If the id is present in the data then select the relation model for updating,
309
+									 * else create new model.
310
+									 */
311
+									$relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
312
+
313
+									/**
314
+									 * If model doesn't exists.
315
+									 */
316
+									if ( ! $relationModel) 
317
+									{
318
+										\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
319
+									}
320
+
321
+									foreach ($value as $relationAttribute => $relationValue) 
322
+									{
323
+										/**
324
+										 * Prevent attributes not in the fillable.
325
+										 */
326
+										if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) 
327
+										{
328
+											$relationModel->$relationAttribute = $relationValue;
329
+										}
330
+									}
331
+
332
+									$relations[$relation] = $relationModel;
333
+								}
334
+							}
335
+						}
336
+					}
337
+				}
338
+				/**
339
+				 * If the attribute isn't a relation and prevent attributes not in the fillable.
340
+				 */
341
+				else if (array_search($key, $model->getFillable(), true) !== false)
342
+				{
343
+					$model->$key = $value;   
344
+				}
345
+			}
346
+
347
+			/**
348
+			 * Loop through the relations array.
349
+			 */
350
+			foreach ($relations as $key => $value) 
351
+			{
352
+				/**
353
+				 * If the relation is marked for delete then delete it.
354
+				 */
355
+				if ($value == 'delete' && $model->$key()->count())
356
+				{
357
+					$model->$key()->delete();
358
+				}
359
+				/**
360
+				 * If the relation is an array.
361
+				 */
362
+				else if (gettype($value) == 'array') 
363
+				{
364
+					/**
365
+					 * Save the model.
366
+					 */
367
+					$model->save();
368
+					$ids = [];
369
+
370
+					/**
371
+					 * Loop through the relations.
372
+					 */
373
+					foreach ($value as $val) 
374
+					{
375
+						switch (class_basename($model->$key())) 
376
+						{
377
+							/**
378
+							 * If the relation is one to many then update it's foreign key with
379
+							 * the model id and save it then add its id to ids array to delete all 
380
+							 * relations who's id isn't in the ids array.
381
+							 */
382
+							case 'HasMany':
383
+								$foreignKeyName       = $model->$key()->getForeignKeyName();
384
+								$val->$foreignKeyName = $model->id;
385
+								$val->save();
386
+								$ids[] = $val->id;
387
+								break;
388
+
389
+							/**
390
+							 * If the relation is many to many then add it's id to the ids array to
391
+							 * attache these ids to the model.
392
+							 */
393
+							case 'BelongsToMany':
394
+								$val->save();
395
+								$ids[] = $val->id;
396
+								break;
397
+						}
398
+					}
399
+					switch (class_basename($model->$key())) 
400
+					{
401
+						/**
402
+						 * If the relation is one to many then delete all 
403
+						 * relations who's id isn't in the ids array.
404
+						 */
405
+						case 'HasMany':
406
+							$model->$key()->whereNotIn('id', $ids)->delete();
407
+							break;
408
+
409
+						/**
410
+						 * If the relation is many to many then 
411
+						 * detach the previous data and attach 
412
+						 * the ids array to the model.
413
+						 */
414
+						case 'BelongsToMany':
415
+							$model->$key()->detach();
416
+							$model->$key()->attach($ids);
417
+							break;
418
+					}
419
+				}
420
+				/**
421
+				 * If the relation isn't array.
422
+				 */
423
+				else
424
+				{
425
+					switch (class_basename($model->$key())) 
426
+					{
427
+						/**
428
+						 * If the relation is one to one.
429
+						 */
430
+						case 'HasOne':
431
+							/**
432
+							 * Save the model.
433
+							 */
434
+							$model->save();
435
+							$foreignKeyName         = $model->$key()->getForeignKeyName();
436
+							$value->$foreignKeyName = $model->id;
437
+							$value->save();
438
+							break;
439
+						case 'BelongsTo':
440
+							/**
441
+							 * Save the model.
442
+							 */
443
+							$value->save();
444
+							$model->$key()->associate($value);
445
+							break;
446
+					}
447
+				}
448
+			}
449
+
450
+			/**
451
+			 * Save the model.
452
+			 */
453
+			$model->save();
454
+		});
455 455
             
456
-        return $model;
457
-    }
456
+		return $model;
457
+	}
458 458
     
459
-    /**
460
-     * Update record in the storage based on the given
461
-     * condition.
462
-     * 
463
-     * @param  var $value condition value
464
-     * @param  array $data
465
-     * @param  string $attribute condition column name
466
-     * @return void
467
-     */
468
-    public function update($value, array $data, $attribute = 'id')
469
-    {
470
-        if ($attribute == 'id') 
471
-        {
472
-            $model = $this->model->lockForUpdate()->find($value);
473
-            $model ? $model->update($data) : 0;
474
-        }
475
-        else
476
-        {
477
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
478
-                $model->update($data);
479
-            });
480
-        }
481
-    }
482
-
483
-    /**
484
-     * Delete record from the storage based on the given
485
-     * condition.
486
-     * 
487
-     * @param  var $value condition value
488
-     * @param  string $attribute condition column name
489
-     * @return void
490
-     */
491
-    public function delete($value, $attribute = 'id')
492
-    {
493
-        if ($attribute == 'id') 
494
-        {
495
-            \DB::transaction(function () use ($value, $attribute, &$result) {
496
-                $model = $this->model->lockForUpdate()->find($value);
497
-                if ( ! $model) 
498
-                {
499
-                    \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
500
-                }
459
+	/**
460
+	 * Update record in the storage based on the given
461
+	 * condition.
462
+	 * 
463
+	 * @param  var $value condition value
464
+	 * @param  array $data
465
+	 * @param  string $attribute condition column name
466
+	 * @return void
467
+	 */
468
+	public function update($value, array $data, $attribute = 'id')
469
+	{
470
+		if ($attribute == 'id') 
471
+		{
472
+			$model = $this->model->lockForUpdate()->find($value);
473
+			$model ? $model->update($data) : 0;
474
+		}
475
+		else
476
+		{
477
+			call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
478
+				$model->update($data);
479
+			});
480
+		}
481
+	}
482
+
483
+	/**
484
+	 * Delete record from the storage based on the given
485
+	 * condition.
486
+	 * 
487
+	 * @param  var $value condition value
488
+	 * @param  string $attribute condition column name
489
+	 * @return void
490
+	 */
491
+	public function delete($value, $attribute = 'id')
492
+	{
493
+		if ($attribute == 'id') 
494
+		{
495
+			\DB::transaction(function () use ($value, $attribute, &$result) {
496
+				$model = $this->model->lockForUpdate()->find($value);
497
+				if ( ! $model) 
498
+				{
499
+					\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
500
+				}
501 501
                 
502
-                $model->delete();
503
-            });
504
-        }
505
-        else
506
-        {
507
-            \DB::transaction(function () use ($value, $attribute, &$result) {
508
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
509
-                    $model->delete();
510
-                });
511
-            });   
512
-        }
513
-    }
502
+				$model->delete();
503
+			});
504
+		}
505
+		else
506
+		{
507
+			\DB::transaction(function () use ($value, $attribute, &$result) {
508
+				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
509
+					$model->delete();
510
+				});
511
+			});   
512
+		}
513
+	}
514 514
     
515
-    /**
516
-     * Fetch records from the storage based on the given
517
-     * id.
518
-     * 
519
-     * @param  integer $id
520
-     * @param  array   $relations
521
-     * @param  array   $columns
522
-     * @return object
523
-     */
524
-    public function find($id, $relations = [], $columns = array('*'))
525
-    {
526
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
527
-    }
515
+	/**
516
+	 * Fetch records from the storage based on the given
517
+	 * id.
518
+	 * 
519
+	 * @param  integer $id
520
+	 * @param  array   $relations
521
+	 * @param  array   $columns
522
+	 * @return object
523
+	 */
524
+	public function find($id, $relations = [], $columns = array('*'))
525
+	{
526
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
527
+	}
528 528
     
529
-    /**
530
-     * Fetch records from the storage based on the given
531
-     * condition.
532
-     * 
533
-     * @param  array   $conditions array of conditions
534
-     * @param  array   $relations
535
-     * @param  string  $sortBy
536
-     * @param  boolean $desc
537
-     * @param  array   $columns
538
-     * @return collection
539
-     */
540
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
541
-    {
542
-        $conditions = $this->constructConditions($conditions, $this->model);
543
-        $sort       = $desc ? 'desc' : 'asc';
544
-        return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
545
-    }
546
-
547
-    /**
548
-     * Fetch the first record from the storage based on the given
549
-     * condition.
550
-     *
551
-     * @param  array   $conditions array of conditions
552
-     * @param  array   $relations
553
-     * @param  array   $columns
554
-     * @return object
555
-     */
556
-    public function first($conditions, $relations = [], $columns = array('*'))
557
-    {
558
-        $conditions = $this->constructConditions($conditions, $this->model);
559
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);  
560
-    }
561
-
562
-    /**
563
-     * Return the deleted models in pages based on the given conditions.
564
-     * 
565
-     * @param  array   $conditions array of conditions
566
-     * @param  integer $perPage
567
-     * @param  string  $sortBy
568
-     * @param  boolean $desc
569
-     * @param  array   $columns
570
-     * @return collection
571
-     */
572
-    public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = array('*'))
573
-    {
574
-        unset($conditions['page']);
575
-        $conditions = $this->constructConditions($conditions, $this->model);
576
-        $sort       = $desc ? 'desc' : 'asc';
577
-        $model      = $this->model->onlyTrashed();
578
-
579
-        if (count($conditions['conditionValues']))
580
-        {
581
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
582
-        }
583
-
584
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
585
-    }
586
-
587
-    /**
588
-     * Restore the deleted model.
589
-     * 
590
-     * @param  integer $id
591
-     * @return void
592
-     */
593
-    public function restore($id)
594
-    {
595
-        $model = $this->model->onlyTrashed()->find($id);
596
-
597
-        if ( ! $model) 
598
-        {
599
-            \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
600
-        }
601
-
602
-        $model->restore();
603
-    }
604
-
605
-    /**
606
-     * Build the conditions recursively for the retrieving methods.
607
-     * @param  array $conditions
608
-     * @return array
609
-     */
610
-    protected function constructConditions($conditions, $model)
611
-    {   
612
-        $conditionString = '';
613
-        $conditionValues = [];
614
-        foreach ($conditions as $key => $value) 
615
-        {
616
-            if (str_contains($key, '->')) 
617
-            {
618
-                $key = $this->wrapJsonSelector($key);
619
-            }
620
-
621
-            if ($key == 'and') 
622
-            {
623
-                $conditions       = $this->constructConditions($value, $model);
624
-                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
625
-                $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
626
-            }
627
-            else if ($key == 'or')
628
-            {
629
-                $conditions       = $this->constructConditions($value, $model);
630
-                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
631
-                $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
632
-            }
633
-            else
634
-            {
635
-                if (is_array($value)) 
636
-                {
637
-                    $operator = $value['op'];
638
-                    if (strtolower($operator) == 'between') 
639
-                    {
640
-                        $value1 = $value['val1'];
641
-                        $value2 = $value['val2'];
642
-                    }
643
-                    else
644
-                    {
645
-                        $value = array_key_exists('val', $value) ? $value['val'] : '';
646
-                    }
647
-                }
648
-                else
649
-                {
650
-                    $operator = '=';
651
-                }
529
+	/**
530
+	 * Fetch records from the storage based on the given
531
+	 * condition.
532
+	 * 
533
+	 * @param  array   $conditions array of conditions
534
+	 * @param  array   $relations
535
+	 * @param  string  $sortBy
536
+	 * @param  boolean $desc
537
+	 * @param  array   $columns
538
+	 * @return collection
539
+	 */
540
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
541
+	{
542
+		$conditions = $this->constructConditions($conditions, $this->model);
543
+		$sort       = $desc ? 'desc' : 'asc';
544
+		return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
545
+	}
546
+
547
+	/**
548
+	 * Fetch the first record from the storage based on the given
549
+	 * condition.
550
+	 *
551
+	 * @param  array   $conditions array of conditions
552
+	 * @param  array   $relations
553
+	 * @param  array   $columns
554
+	 * @return object
555
+	 */
556
+	public function first($conditions, $relations = [], $columns = array('*'))
557
+	{
558
+		$conditions = $this->constructConditions($conditions, $this->model);
559
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);  
560
+	}
561
+
562
+	/**
563
+	 * Return the deleted models in pages based on the given conditions.
564
+	 * 
565
+	 * @param  array   $conditions array of conditions
566
+	 * @param  integer $perPage
567
+	 * @param  string  $sortBy
568
+	 * @param  boolean $desc
569
+	 * @param  array   $columns
570
+	 * @return collection
571
+	 */
572
+	public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = array('*'))
573
+	{
574
+		unset($conditions['page']);
575
+		$conditions = $this->constructConditions($conditions, $this->model);
576
+		$sort       = $desc ? 'desc' : 'asc';
577
+		$model      = $this->model->onlyTrashed();
578
+
579
+		if (count($conditions['conditionValues']))
580
+		{
581
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
582
+		}
583
+
584
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
585
+	}
586
+
587
+	/**
588
+	 * Restore the deleted model.
589
+	 * 
590
+	 * @param  integer $id
591
+	 * @return void
592
+	 */
593
+	public function restore($id)
594
+	{
595
+		$model = $this->model->onlyTrashed()->find($id);
596
+
597
+		if ( ! $model) 
598
+		{
599
+			\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
600
+		}
601
+
602
+		$model->restore();
603
+	}
604
+
605
+	/**
606
+	 * Build the conditions recursively for the retrieving methods.
607
+	 * @param  array $conditions
608
+	 * @return array
609
+	 */
610
+	protected function constructConditions($conditions, $model)
611
+	{   
612
+		$conditionString = '';
613
+		$conditionValues = [];
614
+		foreach ($conditions as $key => $value) 
615
+		{
616
+			if (str_contains($key, '->')) 
617
+			{
618
+				$key = $this->wrapJsonSelector($key);
619
+			}
620
+
621
+			if ($key == 'and') 
622
+			{
623
+				$conditions       = $this->constructConditions($value, $model);
624
+				$conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
625
+				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
626
+			}
627
+			else if ($key == 'or')
628
+			{
629
+				$conditions       = $this->constructConditions($value, $model);
630
+				$conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
631
+				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
632
+			}
633
+			else
634
+			{
635
+				if (is_array($value)) 
636
+				{
637
+					$operator = $value['op'];
638
+					if (strtolower($operator) == 'between') 
639
+					{
640
+						$value1 = $value['val1'];
641
+						$value2 = $value['val2'];
642
+					}
643
+					else
644
+					{
645
+						$value = array_key_exists('val', $value) ? $value['val'] : '';
646
+					}
647
+				}
648
+				else
649
+				{
650
+					$operator = '=';
651
+				}
652 652
                 
653
-                if (strtolower($operator) == 'between') 
654
-                {
655
-                    $conditionString  .= $key . ' >= ? and ';
656
-                    $conditionValues[] = $value1;
657
-
658
-                    $conditionString  .= $key . ' <= ? {op} ';
659
-                    $conditionValues[] = $value2;
660
-                }
661
-                elseif (strtolower($operator) == 'in') 
662
-                {
663
-                    $conditionValues  = array_merge($conditionValues, $value);
664
-                    $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
665
-                    $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
666
-                }
667
-                elseif (strtolower($operator) == 'null') 
668
-                {
669
-                    $conditionString .= $key . ' is null {op} ';
670
-                }
671
-                elseif (strtolower($operator) == 'not null') 
672
-                {
673
-                    $conditionString .= $key . ' is not null {op} ';
674
-                }
675
-                elseif (strtolower($operator) == 'has') 
676
-                {
677
-                    $sql              = $model->withTrashed()->has($key)->toSql();
678
-                    $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
679
-                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
680
-                    $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
681
-                }
682
-                else
683
-                {
684
-                    $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
685
-                    $conditionValues[] = $value;
686
-                }
687
-            }
688
-        }
689
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
690
-        return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
691
-    }
692
-
693
-    /**
694
-     * Wrap the given JSON selector.
695
-     *
696
-     * @param  string  $value
697
-     * @return string
698
-     */
699
-    protected function wrapJsonSelector($value)
700
-    {
701
-        $removeLast = strpos($value, ')');
702
-        $value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
703
-        $path       = explode('->', $value);
704
-        $field      = array_shift($path);
705
-        $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
706
-            return '"'.$part.'"';
707
-        })->implode('.'));
653
+				if (strtolower($operator) == 'between') 
654
+				{
655
+					$conditionString  .= $key . ' >= ? and ';
656
+					$conditionValues[] = $value1;
657
+
658
+					$conditionString  .= $key . ' <= ? {op} ';
659
+					$conditionValues[] = $value2;
660
+				}
661
+				elseif (strtolower($operator) == 'in') 
662
+				{
663
+					$conditionValues  = array_merge($conditionValues, $value);
664
+					$inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
665
+					$conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
666
+				}
667
+				elseif (strtolower($operator) == 'null') 
668
+				{
669
+					$conditionString .= $key . ' is null {op} ';
670
+				}
671
+				elseif (strtolower($operator) == 'not null') 
672
+				{
673
+					$conditionString .= $key . ' is not null {op} ';
674
+				}
675
+				elseif (strtolower($operator) == 'has') 
676
+				{
677
+					$sql              = $model->withTrashed()->has($key)->toSql();
678
+					$conditions       = $this->constructConditions($value, $model->$key()->getRelated());
679
+					$conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
680
+					$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
681
+				}
682
+				else
683
+				{
684
+					$conditionString  .= $key . ' ' . $operator . ' ? {op} ';
685
+					$conditionValues[] = $value;
686
+				}
687
+			}
688
+		}
689
+		$conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
690
+		return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
691
+	}
692
+
693
+	/**
694
+	 * Wrap the given JSON selector.
695
+	 *
696
+	 * @param  string  $value
697
+	 * @return string
698
+	 */
699
+	protected function wrapJsonSelector($value)
700
+	{
701
+		$removeLast = strpos($value, ')');
702
+		$value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
703
+		$path       = explode('->', $value);
704
+		$field      = array_shift($path);
705
+		$result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
706
+			return '"'.$part.'"';
707
+		})->implode('.'));
708 708
         
709
-        return $removeLast === false ? $result : $result . ')';
710
-    }
711
-
712
-    /**
713
-     * Abstract method that return the necessary 
714
-     * information (full model namespace)
715
-     * needed to preform the previous actions.
716
-     * 
717
-     * @return string
718
-     */
719
-    abstract protected function getModel();
709
+		return $removeLast === false ? $result : $result . ')';
710
+	}
711
+
712
+	/**
713
+	 * Abstract method that return the necessary 
714
+	 * information (full model namespace)
715
+	 * needed to preform the previous actions.
716
+	 * 
717
+	 * @return string
718
+	 */
719
+	abstract protected function getModel();
720 720
 }
721 721
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/Core/Console/Commands/GenerateDoc.php 4 patches
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,6 +123,7 @@  discard block
 block discarded – undo
123 123
      * 
124 124
      * @param  array  &$route
125 125
      * @param  object $reflectionMethod]
126
+     * @param \ReflectionMethod $reflectionMethod
126 127
      * @return void
127 128
      */
128 129
     protected function processDocBlock(&$route, $reflectionMethod)
@@ -145,7 +146,7 @@  discard block
 block discarded – undo
145 146
      * Generate post body for the given route.
146 147
      * 
147 148
      * @param  array  &$route
148
-     * @param  object $reflectionMethod
149
+     * @param  \ReflectionMethod $reflectionMethod
149 150
      * @param  array  $validationRules
150 151
      * @return void
151 152
      */
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -162,8 +162,7 @@  discard block
 block discarded – undo
162 162
                 if ($match[1] == '$this->validationRules')
163 163
                 {
164 164
                     $route['body'] = $validationRules;
165
-                }
166
-                else
165
+                } else
167 166
                 {
168 167
                     $route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
169 168
                 }
@@ -173,14 +172,12 @@  discard block
 block discarded – undo
173 172
                     if(strpos($rule, 'unique'))
174 173
                     {
175 174
                         $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
176
-                    }
177
-                    elseif(strpos($rule, 'exists'))
175
+                    } elseif(strpos($rule, 'exists'))
178 176
                     {
179 177
                         $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
180 178
                     }
181 179
                 }
182
-            }
183
-            else
180
+            } else
184 181
             {
185 182
                 $route['body'] = 'conditions';
186 183
             }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
             if ($route) 
46 46
             {
47 47
                 $actoinArray = explode('@', $route['action']);
48
-                if(array_get($actoinArray, 1, false))
48
+                if (array_get($actoinArray, 1, false))
49 49
                 {
50 50
                     $controller       = $actoinArray[0];
51 51
                     $method           = $actoinArray[1];
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
                     $route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']);
65 65
 
66 66
                     preg_match('/api\/([^#]+)\//iU', $route['uri'], $module);
67
-                    $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/' . $module[1] . '/') - 1)][] = $route;
67
+                    $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/'.$module[1].'/') - 1)][] = $route;
68 68
 
69 69
                     $this->getModels($classProperties['model'], $docData);   
70 70
                 }
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
      */
83 83
     protected function getRoutes()
84 84
     {
85
-        return collect(\Route::getRoutes())->map(function ($route) {
85
+        return collect(\Route::getRoutes())->map(function($route) {
86 86
             if (strpos($route->uri(), 'api') !== false) 
87 87
             {
88 88
                 return [
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
         ];
115 115
 
116 116
 
117
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
117
+        if ( ! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
118 118
         {
119 119
             $route['headers']['Authorization'] = 'Bearer {token}';
120 120
         }
@@ -168,16 +168,16 @@  discard block
 block discarded – undo
168 168
                 }
169 169
                 else
170 170
                 {
171
-                    $route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
171
+                    $route['body'] = eval('return '.str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]).';');
172 172
                 }
173 173
 
174 174
                 foreach ($route['body'] as &$rule) 
175 175
                 {
176
-                    if(strpos($rule, 'unique'))
176
+                    if (strpos($rule, 'unique'))
177 177
                     {
178 178
                         $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
179 179
                     }
180
-                    elseif(strpos($rule, 'exists'))
180
+                    elseif (strpos($rule, 'exists'))
181 181
                     {
182 182
                         $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
183 183
                     }
@@ -250,10 +250,10 @@  discard block
 block discarded – undo
250 250
             $model      = factory($modelClass)->make();
251 251
             $modelArr   = $model->toArray();
252 252
 
253
-            if ( $model->trans && ! $model->trans->count()) 
253
+            if ($model->trans && ! $model->trans->count()) 
254 254
             {
255 255
                 $modelArr['trans'] = [
256
-                    'en' => factory($modelClass . 'Translation')->make()->toArray()
256
+                    'en' => factory($modelClass.'Translation')->make()->toArray()
257 257
                 ];
258 258
             }
259 259
 
Please login to merge, or discard this patch.
Indentation   +244 added lines, -244 removed lines patch added patch discarded remove patch
@@ -6,276 +6,276 @@
 block discarded – undo
6 6
 
7 7
 class GenerateDoc extends Command
8 8
 {
9
-    /**
10
-     * The name and signature of the console command.
11
-     *
12
-     * @var string
13
-     */
14
-    protected $signature = 'doc:generate';
9
+	/**
10
+	 * The name and signature of the console command.
11
+	 *
12
+	 * @var string
13
+	 */
14
+	protected $signature = 'doc:generate';
15 15
 
16
-    /**
17
-     * The console command description.
18
-     *
19
-     * @var string
20
-     */
21
-    protected $description = 'Generate api documentation';
16
+	/**
17
+	 * The console command description.
18
+	 *
19
+	 * @var string
20
+	 */
21
+	protected $description = 'Generate api documentation';
22 22
 
23
-    /**
24
-     * Create a new command instance.
25
-     *
26
-     * @return void
27
-     */
28
-    public function __construct()
29
-    {
30
-        parent::__construct();
31
-    }
23
+	/**
24
+	 * Create a new command instance.
25
+	 *
26
+	 * @return void
27
+	 */
28
+	public function __construct()
29
+	{
30
+		parent::__construct();
31
+	}
32 32
 
33
-    /**
34
-     * Execute the console command.
35
-     *
36
-     * @return mixed
37
-     */
38
-    public function handle()
39
-    {
40
-        $docData           = [];
41
-        $docData['models'] = [];
42
-        $routes            = $this->getRoutes();
43
-        foreach ($routes as $route) 
44
-        {
45
-            if ($route) 
46
-            {
47
-                $actoinArray = explode('@', $route['action']);
48
-                if(array_get($actoinArray, 1, false))
49
-                {
50
-                    $controller       = $actoinArray[0];
51
-                    $method           = $actoinArray[1];
52
-                    $route['name']    = $method !== 'index' ? $method : 'list';
33
+	/**
34
+	 * Execute the console command.
35
+	 *
36
+	 * @return mixed
37
+	 */
38
+	public function handle()
39
+	{
40
+		$docData           = [];
41
+		$docData['models'] = [];
42
+		$routes            = $this->getRoutes();
43
+		foreach ($routes as $route) 
44
+		{
45
+			if ($route) 
46
+			{
47
+				$actoinArray = explode('@', $route['action']);
48
+				if(array_get($actoinArray, 1, false))
49
+				{
50
+					$controller       = $actoinArray[0];
51
+					$method           = $actoinArray[1];
52
+					$route['name']    = $method !== 'index' ? $method : 'list';
53 53
                     
54
-                    $reflectionClass  = new \ReflectionClass($controller);
55
-                    $reflectionMethod = $reflectionClass->getMethod($method);
56
-                    $classProperties  = $reflectionClass->getDefaultProperties();
57
-                    $skipLoginCheck   = array_key_exists('skipLoginCheck', $classProperties) ? $classProperties['skipLoginCheck'] : false;
58
-                    $validationRules  = array_key_exists('validationRules', $classProperties) ? $classProperties['validationRules'] : false;
54
+					$reflectionClass  = new \ReflectionClass($controller);
55
+					$reflectionMethod = $reflectionClass->getMethod($method);
56
+					$classProperties  = $reflectionClass->getDefaultProperties();
57
+					$skipLoginCheck   = array_key_exists('skipLoginCheck', $classProperties) ? $classProperties['skipLoginCheck'] : false;
58
+					$validationRules  = array_key_exists('validationRules', $classProperties) ? $classProperties['validationRules'] : false;
59 59
 
60
-                    $this->processDocBlock($route, $reflectionMethod);
61
-                    $this->getHeaders($route, $method, $skipLoginCheck);
62
-                    $this->getPostData($route, $reflectionMethod, $validationRules);
60
+					$this->processDocBlock($route, $reflectionMethod);
61
+					$this->getHeaders($route, $method, $skipLoginCheck);
62
+					$this->getPostData($route, $reflectionMethod, $validationRules);
63 63
 
64
-                    $route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']);
64
+					$route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']);
65 65
 
66
-                    preg_match('/api\/([^#]+)\//iU', $route['uri'], $module);
67
-                    $docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/' . $module[1] . '/') - 1)][] = $route;
66
+					preg_match('/api\/([^#]+)\//iU', $route['uri'], $module);
67
+					$docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/' . $module[1] . '/') - 1)][] = $route;
68 68
 
69
-                    $this->getModels($classProperties['model'], $docData);   
70
-                }
71
-            }
72
-        }
69
+					$this->getModels($classProperties['model'], $docData);   
70
+				}
71
+			}
72
+		}
73 73
         
74
-        $docData['errors']  = $this->getErrors();
75
-        $docData['reports'] = \Core::reports()->all();
76
-        \File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
77
-    }
74
+		$docData['errors']  = $this->getErrors();
75
+		$docData['reports'] = \Core::reports()->all();
76
+		\File::put(app_path('Modules/Core/Resources/api.json'), json_encode($docData));
77
+	}
78 78
 
79
-    /**
80
-     * Get list of all registered routes.
81
-     * 
82
-     * @return collection
83
-     */
84
-    protected function getRoutes()
85
-    {
86
-        return collect(\Route::getRoutes())->map(function ($route) {
87
-            if (strpos($route->uri(), 'api') !== false) 
88
-            {
89
-                return [
90
-                    'method' => $route->methods()[0],
91
-                    'uri'    => $route->uri(),
92
-                    'action' => $route->getActionName(),
93
-                    'prefix' => $route->getPrefix()
94
-                ];
95
-            }
96
-            return false;
97
-        })->all();
98
-    }
79
+	/**
80
+	 * Get list of all registered routes.
81
+	 * 
82
+	 * @return collection
83
+	 */
84
+	protected function getRoutes()
85
+	{
86
+		return collect(\Route::getRoutes())->map(function ($route) {
87
+			if (strpos($route->uri(), 'api') !== false) 
88
+			{
89
+				return [
90
+					'method' => $route->methods()[0],
91
+					'uri'    => $route->uri(),
92
+					'action' => $route->getActionName(),
93
+					'prefix' => $route->getPrefix()
94
+				];
95
+			}
96
+			return false;
97
+		})->all();
98
+	}
99 99
 
100
-    /**
101
-     * Generate headers for the given route.
102
-     * 
103
-     * @param  array  &$route
104
-     * @param  string $method
105
-     * @param  array  $skipLoginCheck
106
-     * @return void
107
-     */
108
-    protected function getHeaders(&$route, $method, $skipLoginCheck)
109
-    {
110
-        $route['headers'] = [
111
-        'Accept'       => 'application/json',
112
-        'Content-Type' => 'application/json',
113
-        'locale'       => 'The language of the returned data: ar, en or all.',
114
-        'time-zone'    => 'Your locale time zone',
115
-        ];
100
+	/**
101
+	 * Generate headers for the given route.
102
+	 * 
103
+	 * @param  array  &$route
104
+	 * @param  string $method
105
+	 * @param  array  $skipLoginCheck
106
+	 * @return void
107
+	 */
108
+	protected function getHeaders(&$route, $method, $skipLoginCheck)
109
+	{
110
+		$route['headers'] = [
111
+		'Accept'       => 'application/json',
112
+		'Content-Type' => 'application/json',
113
+		'locale'       => 'The language of the returned data: ar, en or all.',
114
+		'time-zone'    => 'Your locale time zone',
115
+		];
116 116
 
117 117
 
118
-        if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
119
-        {
120
-            $route['headers']['Authorization'] = 'Bearer {token}';
121
-        }
122
-    }
118
+		if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
119
+		{
120
+			$route['headers']['Authorization'] = 'Bearer {token}';
121
+		}
122
+	}
123 123
 
124
-    /**
125
-     * Generate description and params for the given route
126
-     * based on the docblock.
127
-     * 
128
-     * @param  array  &$route
129
-     * @param  object $reflectionMethod]
130
-     * @return void
131
-     */
132
-    protected function processDocBlock(&$route, $reflectionMethod)
133
-    {
134
-        $factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
135
-        $docblock                = $factory->create($reflectionMethod->getDocComment());
136
-        $route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
137
-        $params                  = $docblock->getTagsByName('param');
138
-        $route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
139
-        foreach ($params as $param) 
140
-        {
141
-            $name = $param->getVariableName();
142
-            if ($name !== 'request') 
143
-            {
144
-                $route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
145
-            }
146
-        }
147
-    }
124
+	/**
125
+	 * Generate description and params for the given route
126
+	 * based on the docblock.
127
+	 * 
128
+	 * @param  array  &$route
129
+	 * @param  object $reflectionMethod]
130
+	 * @return void
131
+	 */
132
+	protected function processDocBlock(&$route, $reflectionMethod)
133
+	{
134
+		$factory                 = \phpDocumentor\Reflection\DocBlockFactory::createInstance();
135
+		$docblock                = $factory->create($reflectionMethod->getDocComment());
136
+		$route['description']    = trim(preg_replace('/\s+/', ' ', $docblock->getSummary()));
137
+		$params                  = $docblock->getTagsByName('param');
138
+		$route['returnDocBlock'] = $docblock->getTagsByName('return')[0]->getType()->getFqsen()->getName();
139
+		foreach ($params as $param) 
140
+		{
141
+			$name = $param->getVariableName();
142
+			if ($name !== 'request') 
143
+			{
144
+				$route['parametars'][$param->getVariableName()] = $param->getDescription()->render();
145
+			}
146
+		}
147
+	}
148 148
 
149
-    /**
150
-     * Generate post body for the given route.
151
-     * 
152
-     * @param  array  &$route
153
-     * @param  object $reflectionMethod
154
-     * @param  array  $validationRules
155
-     * @return void
156
-     */
157
-    protected function getPostData(&$route, $reflectionMethod, $validationRules)
158
-    {
159
-        if ($route['method'] == 'POST') 
160
-        {
161
-            $body = $this->getMethodBody($reflectionMethod);
149
+	/**
150
+	 * Generate post body for the given route.
151
+	 * 
152
+	 * @param  array  &$route
153
+	 * @param  object $reflectionMethod
154
+	 * @param  array  $validationRules
155
+	 * @return void
156
+	 */
157
+	protected function getPostData(&$route, $reflectionMethod, $validationRules)
158
+	{
159
+		if ($route['method'] == 'POST') 
160
+		{
161
+			$body = $this->getMethodBody($reflectionMethod);
162 162
 
163
-            preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match);
164
-            if (count($match)) 
165
-            {
166
-                if ($match[1] == '$this->validationRules')
167
-                {
168
-                    $route['body'] = $validationRules;
169
-                }
170
-                else
171
-                {
172
-                    $route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
173
-                }
163
+			preg_match('/\$this->validate\(\$request,([^#]+)\);/iU', $body, $match);
164
+			if (count($match)) 
165
+			{
166
+				if ($match[1] == '$this->validationRules')
167
+				{
168
+					$route['body'] = $validationRules;
169
+				}
170
+				else
171
+				{
172
+					$route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
173
+				}
174 174
 
175
-                foreach ($route['body'] as &$rule) 
176
-                {
177
-                    if(strpos($rule, 'unique'))
178
-                    {
179
-                        $rule = substr($rule, 0, strpos($rule, 'unique') + 6);
180
-                    }
181
-                    elseif(strpos($rule, 'exists'))
182
-                    {
183
-                        $rule = substr($rule, 0, strpos($rule, 'exists') - 1);
184
-                    }
185
-                }
186
-            }
187
-            else
188
-            {
189
-                $route['body'] = 'conditions';
190
-            }
191
-        }
192
-    }
175
+				foreach ($route['body'] as &$rule) 
176
+				{
177
+					if(strpos($rule, 'unique'))
178
+					{
179
+						$rule = substr($rule, 0, strpos($rule, 'unique') + 6);
180
+					}
181
+					elseif(strpos($rule, 'exists'))
182
+					{
183
+						$rule = substr($rule, 0, strpos($rule, 'exists') - 1);
184
+					}
185
+				}
186
+			}
187
+			else
188
+			{
189
+				$route['body'] = 'conditions';
190
+			}
191
+		}
192
+	}
193 193
 
194
-    /**
195
-     * Generate application errors.
196
-     * 
197
-     * @return array
198
-     */
199
-    protected function getErrors()
200
-    {
201
-        $errors          = [];
202
-        $reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler');
203
-        foreach ($reflectionClass->getMethods() as $method) 
204
-        {
205
-            $methodName       = $method->getName();
206
-            $reflectionMethod = $reflectionClass->getMethod($methodName);
207
-            $body             = $this->getMethodBody($reflectionMethod);
194
+	/**
195
+	 * Generate application errors.
196
+	 * 
197
+	 * @return array
198
+	 */
199
+	protected function getErrors()
200
+	{
201
+		$errors          = [];
202
+		$reflectionClass = new \ReflectionClass('App\Modules\Core\Utl\ErrorHandler');
203
+		foreach ($reflectionClass->getMethods() as $method) 
204
+		{
205
+			$methodName       = $method->getName();
206
+			$reflectionMethod = $reflectionClass->getMethod($methodName);
207
+			$body             = $this->getMethodBody($reflectionMethod);
208 208
 
209
-            preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
209
+			preg_match('/\$error=\[\'status\'=>([^#]+)\,/iU', $body, $match);
210 210
 
211
-            if (count($match)) 
212
-            {
213
-                $errors[$match[1]][] = $methodName;
214
-            }
215
-        }
211
+			if (count($match)) 
212
+			{
213
+				$errors[$match[1]][] = $methodName;
214
+			}
215
+		}
216 216
 
217
-        return $errors;
218
-    }
217
+		return $errors;
218
+	}
219 219
 
220
-    /**
221
-     * Get the given method body code.
222
-     * 
223
-     * @param  object $reflectionMethod
224
-     * @return string
225
-     */
226
-    protected function getMethodBody($reflectionMethod)
227
-    {
228
-        $filename   = $reflectionMethod->getFileName();
229
-        $start_line = $reflectionMethod->getStartLine() - 1;
230
-        $end_line   = $reflectionMethod->getEndLine();
231
-        $length     = $end_line - $start_line;         
232
-        $source     = file($filename);
233
-        $body       = implode("", array_slice($source, $start_line, $length));
234
-        $body       = trim(preg_replace('/\s+/', '', $body));
220
+	/**
221
+	 * Get the given method body code.
222
+	 * 
223
+	 * @param  object $reflectionMethod
224
+	 * @return string
225
+	 */
226
+	protected function getMethodBody($reflectionMethod)
227
+	{
228
+		$filename   = $reflectionMethod->getFileName();
229
+		$start_line = $reflectionMethod->getStartLine() - 1;
230
+		$end_line   = $reflectionMethod->getEndLine();
231
+		$length     = $end_line - $start_line;         
232
+		$source     = file($filename);
233
+		$body       = implode("", array_slice($source, $start_line, $length));
234
+		$body       = trim(preg_replace('/\s+/', '', $body));
235 235
 
236
-        return $body;
237
-    }
236
+		return $body;
237
+	}
238 238
 
239
-    /**
240
-     * Get example object of all availble models.
241
-     * 
242
-     * @param  string $modelName
243
-     * @param  array  $docData
244
-     * @return string
245
-     */
246
-    protected function getModels($modelName, &$docData)
247
-    {
248
-        if ($modelName && ! array_key_exists($modelName, $docData['models'])) 
249
-        {
250
-            $modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass;
251
-            $model      = factory($modelClass)->make();
252
-            $modelArr   = $model->toArray();
239
+	/**
240
+	 * Get example object of all availble models.
241
+	 * 
242
+	 * @param  string $modelName
243
+	 * @param  array  $docData
244
+	 * @return string
245
+	 */
246
+	protected function getModels($modelName, &$docData)
247
+	{
248
+		if ($modelName && ! array_key_exists($modelName, $docData['models'])) 
249
+		{
250
+			$modelClass = call_user_func_array("\Core::{$modelName}", [])->modelClass;
251
+			$model      = factory($modelClass)->make();
252
+			$modelArr   = $model->toArray();
253 253
 
254
-            if ( $model->trans && ! $model->trans->count()) 
255
-            {
256
-                $modelArr['trans'] = [
257
-                    'en' => factory($modelClass . 'Translation')->make()->toArray()
258
-                ];
259
-            }
254
+			if ( $model->trans && ! $model->trans->count()) 
255
+			{
256
+				$modelArr['trans'] = [
257
+					'en' => factory($modelClass . 'Translation')->make()->toArray()
258
+				];
259
+			}
260 260
 
261
-            $docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
262
-        }
263
-    }
261
+			$docData['models'][$modelName] = json_encode($modelArr, JSON_PRETTY_PRINT);
262
+		}
263
+	}
264 264
 
265
-    /**
266
-     * Get the route response object type.
267
-     * 
268
-     * @param  string $modelName
269
-     * @param  string $method
270
-     * @param  string $returnDocBlock
271
-     * @return array
272
-     */
273
-    protected function getResponseObject($modelName, $method, $returnDocBlock)
274
-    {
275
-        $config    = \CoreConfig::getConfig();
276
-        $relations = array_key_exists($modelName, $config['relations']) ? array_key_exists($method, $config['relations'][$modelName]) ? $config['relations'][$modelName] : false : false;
277
-        $modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
265
+	/**
266
+	 * Get the route response object type.
267
+	 * 
268
+	 * @param  string $modelName
269
+	 * @param  string $method
270
+	 * @param  string $returnDocBlock
271
+	 * @return array
272
+	 */
273
+	protected function getResponseObject($modelName, $method, $returnDocBlock)
274
+	{
275
+		$config    = \CoreConfig::getConfig();
276
+		$relations = array_key_exists($modelName, $config['relations']) ? array_key_exists($method, $config['relations'][$modelName]) ? $config['relations'][$modelName] : false : false;
277
+		$modelName = call_user_func_array("\Core::{$returnDocBlock}", []) ? $returnDocBlock : $modelName;
278 278
 
279
-        return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
280
-    }
279
+		return $relations ? [$modelName => $relations && $relations[$method] ? $relations[$method] : []] : false;
280
+	}
281 281
 }
Please login to merge, or discard this patch.
src/Modules/Core/Http/Controllers/ApiDocumentController.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 namespace App\Modules\Core\Http\Controllers;
3 3
 
4 4
 use App\Http\Controllers\Controller;
5
-use Illuminate\Http\Request;
6 5
 
7 6
 class ApiDocumentController extends Controller
8 7
 {
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,27 +20,27 @@  discard block
 block discarded – undo
20 20
 			],
21 21
 			[
22 22
 				'title'   => 'email equal [email protected] and user is blocked:',
23
-				'content' => ['and' => ['email' => '[email protected]','blocked' => 1]]
23
+				'content' => ['and' => ['email' => '[email protected]', 'blocked' => 1]]
24 24
 			],
25 25
 			[
26 26
 				'title'   => 'email equal [email protected] or user is blocked:',
27
-				'content' => ['or' => ['email' => '[email protected]','blocked' => 1]]
27
+				'content' => ['or' => ['email' => '[email protected]', 'blocked' => 1]]
28 28
 			],
29 29
 			[
30 30
 				'title'   => 'email contain John:',
31
-				'content' => ['email' => ['op' => 'like','val' => '%John%']]
31
+				'content' => ['email' => ['op' => 'like', 'val' => '%John%']]
32 32
 			],
33 33
 			[
34 34
 				'title'   => 'user created after 2016-10-25:',
35
-				'content' => ['created_at' => ['op' => '>','val' => '2016-10-25']]
35
+				'content' => ['created_at' => ['op' => '>', 'val' => '2016-10-25']]
36 36
 			],
37 37
 			[
38 38
 				'title'   => 'user created between 2016-10-20 and 2016-10-25:',
39
-				'content' => ['created_at' => ['op' => 'between','val1' => '2016-10-20','val2' => '2016-10-25']]
39
+				'content' => ['created_at' => ['op' => 'between', 'val1' => '2016-10-20', 'val2' => '2016-10-25']]
40 40
 			],
41 41
 			[
42 42
 				'title'   => 'user id in 1,2,3:',
43
-				'content' => ['id' => ['op' => 'in','val' => [1, 2, 3]]]
43
+				'content' => ['id' => ['op' => 'in', 'val' => [1, 2, 3]]]
44 44
 			],
45 45
 			[
46 46
 				'title'   => 'user name is null:',
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 			],
53 53
 			[
54 54
 				'title'   => 'user has group admin:',
55
-				'content' => ['groups' => ['op' => 'has','val' => ['name' => 'Admin']]]
55
+				'content' => ['groups' => ['op' => 'has', 'val' => ['name' => 'Admin']]]
56 56
 			]
57 57
 		];
58 58
 
Please login to merge, or discard this patch.
src/Modules/Notifications/Notifications/ResetPassword.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
      * Get the notification's delivery channels.
29 29
      *
30 30
      * @param  mixed  $notifiable
31
-     * @return array
31
+     * @return string[]
32 32
      */
33 33
     public function via($notifiable)
34 34
     {
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,6 @@
 block discarded – undo
6 6
 use Illuminate\Notifications\Notification;
7 7
 use Illuminate\Contracts\Queue\ShouldQueue;
8 8
 use Illuminate\Notifications\Messages\MailMessage;
9
-use Illuminate\Notifications\Messages\BroadcastMessage;
10 9
 
11 10
 class ResetPassword extends Notification implements ShouldQueue
12 11
 {
Please login to merge, or discard this patch.
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -10,43 +10,43 @@
 block discarded – undo
10 10
 
11 11
 class ResetPassword extends Notification implements ShouldQueue
12 12
 {
13
-    use Queueable;
13
+	use Queueable;
14 14
 
15
-    protected $token;
15
+	protected $token;
16 16
 
17
-    /**
18
-     * Create a new notification instance.
19
-     *
20
-     * @return void
21
-     */
22
-    public function __construct($token)
23
-    {
24
-        $this->token = $token;
25
-    }
17
+	/**
18
+	 * Create a new notification instance.
19
+	 *
20
+	 * @return void
21
+	 */
22
+	public function __construct($token)
23
+	{
24
+		$this->token = $token;
25
+	}
26 26
 
27
-    /**
28
-     * Get the notification's delivery channels.
29
-     *
30
-     * @param  mixed  $notifiable
31
-     * @return array
32
-     */
33
-    public function via($notifiable)
34
-    {
35
-        return ['mail'];
36
-    }
27
+	/**
28
+	 * Get the notification's delivery channels.
29
+	 *
30
+	 * @param  mixed  $notifiable
31
+	 * @return array
32
+	 */
33
+	public function via($notifiable)
34
+	{
35
+		return ['mail'];
36
+	}
37 37
 
38
-    /**
39
-     * Get the mail representation of the notification.
40
-     *
41
-     * @param  mixed  $notifiable
42
-     * @return \Illuminate\Notifications\Messages\MailMessage
43
-     */
44
-    public function toMail($notifiable)
45
-    {
46
-        return (new MailMessage)
47
-            ->subject('Reset passowrd')
48
-            ->line('Reset passowrd')
49
-            ->line('To reset your password click on the button below')
50
-            ->action('Reset password', config('skeleton.reset_password_url') . '/' . $this->token);
51
-    }
38
+	/**
39
+	 * Get the mail representation of the notification.
40
+	 *
41
+	 * @param  mixed  $notifiable
42
+	 * @return \Illuminate\Notifications\Messages\MailMessage
43
+	 */
44
+	public function toMail($notifiable)
45
+	{
46
+		return (new MailMessage)
47
+			->subject('Reset passowrd')
48
+			->line('Reset passowrd')
49
+			->line('To reset your password click on the button below')
50
+			->action('Reset password', config('skeleton.reset_password_url') . '/' . $this->token);
51
+	}
52 52
 }
53 53
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,6 +47,6 @@
 block discarded – undo
47 47
             ->subject('Reset passowrd')
48 48
             ->line('Reset passowrd')
49 49
             ->line('To reset your password click on the button below')
50
-            ->action('Reset password', config('skeleton.reset_password_url') . '/' . $this->token);
50
+            ->action('Reset password', config('skeleton.reset_password_url').'/'.$this->token);
51 51
     }
52 52
 }
53 53
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/Notifications/Repositories/PushNotificationDeviceRepository.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
      * Register the given device to the logged in user.
22 22
      *
23 23
      * @param  string $data
24
-     * @return void
24
+     * @return boolean
25 25
      */
26 26
     public function registerDevice($data)
27 27
     {
Please login to merge, or discard this patch.
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -7,56 +7,56 @@
 block discarded – undo
7 7
 
8 8
 class PushNotificationDeviceRepository extends AbstractRepository
9 9
 {
10
-    /**
11
-    * Return the model full namespace.
12
-    * 
13
-    * @return string
14
-    */
15
-    protected function getModel()
16
-    {
17
-        return 'App\Modules\Notifications\PushNotificationDevice';
18
-    }
19
-
20
-    /**
21
-     * Register the given device to the logged in user.
22
-     *
23
-     * @param  string $data
24
-     * @return void
25
-     */
26
-    public function registerDevice($data)
27
-    {
28
-        $data['access_token'] = \Auth::user()->token();
29
-        $data['user_id']      = \Auth::id();
30
-        if ($device = $this->model->where('device_token', $data['device_token'])->where('user_id', $data['user_id'])->first()) 
31
-        {
32
-            $data['id'] = $device->id;
33
-        }
34
-
35
-        return $this->save($data);
36
-    }
37
-
38
-    /**
39
-     * Generate the given message data.
40
-     *
41
-     * @param  string $title
42
-     * @param  string $message
43
-     * @param  string $data
44
-     * @return void
45
-     */
46
-    public function generateMessageData($title, $message, $data = [])
47
-    {
48
-        $optionBuilder       = new OptionsBuilder();
49
-        $notificationBuilder = new PayloadNotificationBuilder($title);
50
-        $dataBuilder         = new PayloadDataBuilder();
51
-
52
-        $optionBuilder->setTimeToLive(60*20);
53
-        $notificationBuilder->setBody($message);
54
-        $dataBuilder->addData($data);
55
-
56
-        $options             = $optionBuilder->build();
57
-        $notification        = $notificationBuilder->build();
58
-        $data                = $dataBuilder->build();
59
-
60
-        return compact('options', 'notification', 'data');
61
-    }
10
+	/**
11
+	 * Return the model full namespace.
12
+	 * 
13
+	 * @return string
14
+	 */
15
+	protected function getModel()
16
+	{
17
+		return 'App\Modules\Notifications\PushNotificationDevice';
18
+	}
19
+
20
+	/**
21
+	 * Register the given device to the logged in user.
22
+	 *
23
+	 * @param  string $data
24
+	 * @return void
25
+	 */
26
+	public function registerDevice($data)
27
+	{
28
+		$data['access_token'] = \Auth::user()->token();
29
+		$data['user_id']      = \Auth::id();
30
+		if ($device = $this->model->where('device_token', $data['device_token'])->where('user_id', $data['user_id'])->first()) 
31
+		{
32
+			$data['id'] = $device->id;
33
+		}
34
+
35
+		return $this->save($data);
36
+	}
37
+
38
+	/**
39
+	 * Generate the given message data.
40
+	 *
41
+	 * @param  string $title
42
+	 * @param  string $message
43
+	 * @param  string $data
44
+	 * @return void
45
+	 */
46
+	public function generateMessageData($title, $message, $data = [])
47
+	{
48
+		$optionBuilder       = new OptionsBuilder();
49
+		$notificationBuilder = new PayloadNotificationBuilder($title);
50
+		$dataBuilder         = new PayloadDataBuilder();
51
+
52
+		$optionBuilder->setTimeToLive(60*20);
53
+		$notificationBuilder->setBody($message);
54
+		$dataBuilder->addData($data);
55
+
56
+		$options             = $optionBuilder->build();
57
+		$notification        = $notificationBuilder->build();
58
+		$data                = $dataBuilder->build();
59
+
60
+		return compact('options', 'notification', 'data');
61
+	}
62 62
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
         $notificationBuilder = new PayloadNotificationBuilder($title);
50 50
         $dataBuilder         = new PayloadDataBuilder();
51 51
 
52
-        $optionBuilder->setTimeToLive(60*20);
52
+        $optionBuilder->setTimeToLive(60 * 20);
53 53
         $notificationBuilder->setBody($message);
54 54
         $dataBuilder->addData($data);
55 55
 
Please login to merge, or discard this patch.
src/Modules/Reporting/Report.php 2 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -5,32 +5,32 @@
 block discarded – undo
5 5
 
6 6
 class Report extends Model{
7 7
 
8
-    use SoftDeletes;
8
+	use SoftDeletes;
9 9
 	protected $table    = 'reports';
10 10
 	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
11 11
 	protected $hidden   = ['deleted_at'];
12 12
 	protected $guarded  = ['id'];
13 13
 	protected $fillable = ['report_name', 'view_name'];
14
-    public $searchable  = ['report_name', 'view_name'];
14
+	public $searchable  = ['report_name', 'view_name'];
15 15
 
16 16
 	public function getCreatedAtAttribute($value)
17
-    {
18
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
19
-    }
17
+	{
18
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
19
+	}
20 20
 
21
-    public function getUpdatedAtAttribute($value)
22
-    {
23
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
24
-    }
21
+	public function getUpdatedAtAttribute($value)
22
+	{
23
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
24
+	}
25 25
 
26
-    public function getDeletedAtAttribute($value)
27
-    {
28
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
29
-    }
26
+	public function getDeletedAtAttribute($value)
27
+	{
28
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
29
+	}
30 30
     
31
-    public static function boot()
32
-    {
33
-        parent::boot();
34
-        parent::observe(\App::make('App\Modules\Reporting\ModelObservers\ReprotObserver'));
35
-    }
31
+	public static function boot()
32
+	{
33
+		parent::boot();
34
+		parent::observe(\App::make('App\Modules\Reporting\ModelObservers\ReprotObserver'));
35
+	}
36 36
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 use Illuminate\Database\Eloquent\Model;
4 4
 use Illuminate\Database\Eloquent\SoftDeletes;
5 5
 
6
-class Report extends Model{
6
+class Report extends Model {
7 7
 
8 8
     use SoftDeletes;
9 9
 	protected $table    = 'reports';
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 	protected $hidden   = ['deleted_at'];
12 12
 	protected $guarded  = ['id'];
13 13
 	protected $fillable = ['report_name', 'view_name'];
14
-    public $searchable  = ['report_name', 'view_name'];
14
+    public $searchable = ['report_name', 'view_name'];
15 15
 
16 16
 	public function getCreatedAtAttribute($value)
17 17
     {
Please login to merge, or discard this patch.
src/Modules/Reporting/Providers/RouteServiceProvider.php 2 patches
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -8,72 +8,72 @@
 block discarded – undo
8 8
 class RouteServiceProvider extends ServiceProvider
9 9
 {
10 10
 	/**
11
-     * This namespace is applied to your controller routes.
12
-     *
13
-     * In addition, it is set as the URL generator's root namespace.
14
-     *
15
-     * @var string
16
-     */
17
-    protected $namespace = 'App\Modules\Reporting\Http\Controllers';
11
+	 * This namespace is applied to your controller routes.
12
+	 *
13
+	 * In addition, it is set as the URL generator's root namespace.
14
+	 *
15
+	 * @var string
16
+	 */
17
+	protected $namespace = 'App\Modules\Reporting\Http\Controllers';
18 18
 
19
-    /**
20
-     * Define your route model bindings, pattern filters, etc.
21
-     *
22
-     * @return void
23
-     */
24
-    public function boot()
25
-    {
26
-        //
19
+	/**
20
+	 * Define your route model bindings, pattern filters, etc.
21
+	 *
22
+	 * @return void
23
+	 */
24
+	public function boot()
25
+	{
26
+		//
27 27
 
28
-        parent::boot();
29
-    }
28
+		parent::boot();
29
+	}
30 30
 
31
-    /**
32
-     * Define the routes for the module.
33
-     *
34
-     * @return void
35
-     */
36
-    public function map()
37
-    {
38
-        $this->mapWebRoutes();
31
+	/**
32
+	 * Define the routes for the module.
33
+	 *
34
+	 * @return void
35
+	 */
36
+	public function map()
37
+	{
38
+		$this->mapWebRoutes();
39 39
 
40
-        $this->mapApiRoutes();
40
+		$this->mapApiRoutes();
41 41
 
42
-        //
43
-    }
42
+		//
43
+	}
44 44
 
45
-    /**
46
-     * Define the "web" routes for the module.
47
-     *
48
-     * These routes all receive session state, CSRF protection, etc.
49
-     *
50
-     * @return void
51
-     */
52
-    protected function mapWebRoutes()
53
-    {
54
-        Route::group([
55
-            'middleware' => 'web',
56
-            'namespace'  => $this->namespace,
57
-        ], function ($router) {
58
-            require module_path('reporting', 'Routes/web.php');
59
-        });
60
-    }
45
+	/**
46
+	 * Define the "web" routes for the module.
47
+	 *
48
+	 * These routes all receive session state, CSRF protection, etc.
49
+	 *
50
+	 * @return void
51
+	 */
52
+	protected function mapWebRoutes()
53
+	{
54
+		Route::group([
55
+			'middleware' => 'web',
56
+			'namespace'  => $this->namespace,
57
+		], function ($router) {
58
+			require module_path('reporting', 'Routes/web.php');
59
+		});
60
+	}
61 61
 
62
-    /**
63
-     * Define the "api" routes for the module.
64
-     *
65
-     * These routes are typically stateless.
66
-     *
67
-     * @return void
68
-     */
69
-    protected function mapApiRoutes()
70
-    {
71
-        Route::group([
72
-            'middleware' => 'api',
73
-            'namespace'  => $this->namespace,
74
-            'prefix'     => 'api',
75
-        ], function ($router) {
76
-            require module_path('reporting', 'Routes/api.php');
77
-        });
78
-    }
62
+	/**
63
+	 * Define the "api" routes for the module.
64
+	 *
65
+	 * These routes are typically stateless.
66
+	 *
67
+	 * @return void
68
+	 */
69
+	protected function mapApiRoutes()
70
+	{
71
+		Route::group([
72
+			'middleware' => 'api',
73
+			'namespace'  => $this->namespace,
74
+			'prefix'     => 'api',
75
+		], function ($router) {
76
+			require module_path('reporting', 'Routes/api.php');
77
+		});
78
+	}
79 79
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         Route::group([
55 55
             'middleware' => 'web',
56 56
             'namespace'  => $this->namespace,
57
-        ], function ($router) {
57
+        ], function($router) {
58 58
             require module_path('reporting', 'Routes/web.php');
59 59
         });
60 60
     }
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
             'middleware' => 'api',
73 73
             'namespace'  => $this->namespace,
74 74
             'prefix'     => 'api',
75
-        ], function ($router) {
75
+        ], function($router) {
76 76
             require module_path('reporting', 'Routes/api.php');
77 77
         });
78 78
     }
Please login to merge, or discard this patch.
src/Modules/Reporting/Providers/ModuleServiceProvider.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -7,26 +7,26 @@
 block discarded – undo
7 7
 class ModuleServiceProvider extends ServiceProvider
8 8
 {
9 9
 	/**
10
-     * Bootstrap the module services.
11
-     *
12
-     * @return void
13
-     */
14
-    public function boot()
15
-    {
16
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting');
17
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting');
10
+	 * Bootstrap the module services.
11
+	 *
12
+	 * @return void
13
+	 */
14
+	public function boot()
15
+	{
16
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting');
17
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting');
18 18
         
19
-        $factory = app('Illuminate\Database\Eloquent\Factory');
20
-        $factory->load(__DIR__.'/../Database/Factories');
21
-    }
19
+		$factory = app('Illuminate\Database\Eloquent\Factory');
20
+		$factory->load(__DIR__.'/../Database/Factories');
21
+	}
22 22
 
23
-    /**
24
-     * Register the module services.
25
-     *
26
-     * @return void
27
-     */
28
-    public function register()
29
-    {
30
-        $this->app->register(RouteServiceProvider::class);
31
-    }
23
+	/**
24
+	 * Register the module services.
25
+	 *
26
+	 * @return void
27
+	 */
28
+	public function register()
29
+	{
30
+		$this->app->register(RouteServiceProvider::class);
31
+	}
32 32
 }
Please login to merge, or discard this patch.
src/Modules/Reporting/Database/Seeds/ReportsTableSeeder.php 1 patch
Indentation   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -6,70 +6,70 @@
 block discarded – undo
6 6
 
7 7
 class ReportsTableSeeder extends Seeder
8 8
 {
9
-    /**
10
-     * Run the database seeds.
11
-     *
12
-     * @return void
13
-     */
14
-    public function run()
15
-    {
16
-    	/**
17
-         * Insert the permissions related to settings table.
18
-         */
19
-        \DB::table('permissions')->insert(
20
-        	[
21
-        		/**
22
-        		 * Reporting model permissions.
23
-        		 */
24
-	        	[
25
-	        	'name'       => 'find',
26
-	        	'model'      => 'reports',
27
-	        	'created_at' => \DB::raw('NOW()'),
28
-	        	'updated_at' => \DB::raw('NOW()')
29
-	        	],
30
-	        	[
31
-	        	'name'       => 'search',
32
-	        	'model'      => 'reports',
33
-	        	'created_at' => \DB::raw('NOW()'),
34
-	        	'updated_at' => \DB::raw('NOW()')
35
-	        	],
36
-	        	[
37
-	        	'name'       => 'list',
38
-	        	'model'      => 'reports',
39
-	        	'created_at' => \DB::raw('NOW()'),
40
-	        	'updated_at' => \DB::raw('NOW()')
41
-	        	],
42
-	        	[
43
-	        	'name'       => 'findby',
44
-	        	'model'      => 'reports',
45
-	        	'created_at' => \DB::raw('NOW()'),
46
-	        	'updated_at' => \DB::raw('NOW()')
47
-	        	],
48
-	        	[
49
-	        	'name'       => 'first',
50
-	        	'model'      => 'reports',
51
-	        	'created_at' => \DB::raw('NOW()'),
52
-	        	'updated_at' => \DB::raw('NOW()')
53
-	        	],
54
-	        	[
55
-	        	'name'       => 'paginate',
56
-	        	'model'      => 'reports',
57
-	        	'created_at' => \DB::raw('NOW()'),
58
-	        	'updated_at' => \DB::raw('NOW()')
59
-	        	],
60
-	        	[
61
-	        	'name'       => 'paginateby',
62
-	        	'model'      => 'reports',
63
-	        	'created_at' => \DB::raw('NOW()'),
64
-	        	'updated_at' => \DB::raw('NOW()')
65
-	        	],
66
-	        	[
67
-	        	'name'       => 'admin_count',
68
-	        	'model'      => 'reports',
69
-	        	'created_at' => \DB::raw('NOW()'),
70
-	        	'updated_at' => \DB::raw('NOW()')
71
-	        	]
72
-        	]
73
-        );
74
-    }
9
+	/**
10
+	 * Run the database seeds.
11
+	 *
12
+	 * @return void
13
+	 */
14
+	public function run()
15
+	{
16
+		/**
17
+		 * Insert the permissions related to settings table.
18
+		 */
19
+		\DB::table('permissions')->insert(
20
+			[
21
+				/**
22
+				 * Reporting model permissions.
23
+				 */
24
+				[
25
+				'name'       => 'find',
26
+				'model'      => 'reports',
27
+				'created_at' => \DB::raw('NOW()'),
28
+				'updated_at' => \DB::raw('NOW()')
29
+				],
30
+				[
31
+				'name'       => 'search',
32
+				'model'      => 'reports',
33
+				'created_at' => \DB::raw('NOW()'),
34
+				'updated_at' => \DB::raw('NOW()')
35
+				],
36
+				[
37
+				'name'       => 'list',
38
+				'model'      => 'reports',
39
+				'created_at' => \DB::raw('NOW()'),
40
+				'updated_at' => \DB::raw('NOW()')
41
+				],
42
+				[
43
+				'name'       => 'findby',
44
+				'model'      => 'reports',
45
+				'created_at' => \DB::raw('NOW()'),
46
+				'updated_at' => \DB::raw('NOW()')
47
+				],
48
+				[
49
+				'name'       => 'first',
50
+				'model'      => 'reports',
51
+				'created_at' => \DB::raw('NOW()'),
52
+				'updated_at' => \DB::raw('NOW()')
53
+				],
54
+				[
55
+				'name'       => 'paginate',
56
+				'model'      => 'reports',
57
+				'created_at' => \DB::raw('NOW()'),
58
+				'updated_at' => \DB::raw('NOW()')
59
+				],
60
+				[
61
+				'name'       => 'paginateby',
62
+				'model'      => 'reports',
63
+				'created_at' => \DB::raw('NOW()'),
64
+				'updated_at' => \DB::raw('NOW()')
65
+				],
66
+				[
67
+				'name'       => 'admin_count',
68
+				'model'      => 'reports',
69
+				'created_at' => \DB::raw('NOW()'),
70
+				'updated_at' => \DB::raw('NOW()')
71
+				]
72
+			]
73
+		);
74
+	}
75 75
 }
Please login to merge, or discard this patch.