Completed
Pull Request — master (#3)
by
unknown
08:16
created
app/Http/Helpers.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
      *
103 103
      * @param string $module
104 104
      * @param array $possibleParameters
105
-     * @return boolean
105
+     * @return false|string
106 106
      */
107 107
     public static function resetSaveIndexParameters($module, $possibleParameters = ['search', 'orderbycolumn', 'orderbytype', 'relation'])
108 108
     {
Please login to merge, or discard this patch.
app/ImageCategory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
     /**
81 81
      * Image link
82 82
      * 
83
-     * @return object
83
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
84 84
      */
85 85
     public function images(){
86 86
         
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/ImageSelectController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -113,8 +113,7 @@
 block discarded – undo
113 113
         if ($validator->fails()) {
114 114
 
115 115
             $object->imagecategories()->associate(1);
116
-        }
117
-        else{
116
+        } else{
118 117
 
119 118
             $object->imagecategories()->associate($request->input('imagecategory_id'));
120 119
 
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/CommentController.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,8 +86,7 @@
 block discarded – undo
86 86
                 $object->commentstatuses()->associate(1);
87 87
             }
88 88
             
89
-        }
90
-        else{
89
+        } else{
91 90
 
92 91
             $object->commentstatuses()->associate($request->input('commentstatus_id'));
93 92
         }
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
      * 
145 145
      * @param integer $id
146 146
      * @param Request $request
147
-     * @return Response
147
+     * @return \Illuminate\Http\RedirectResponse
148 148
      */
149 149
     public function approve($id, Request $request){
150 150
         
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
      * 
187 187
      * @param integer $id
188 188
      * @param Request $request
189
-     * @return Response
189
+     * @return \Illuminate\Http\RedirectResponse
190 190
      */
191 191
     public function spam($id, Request $request){
192 192
         
Please login to merge, or discard this patch.
app/Http/Middleware/AddPublishedAt.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,8 +31,7 @@
 block discarded – undo
31 31
         if($request->has('published')){
32 32
             
33 33
             $request->merge(['published_at' => \Carbon\Carbon::now()]);
34
-        }
35
-        else{
34
+        } else{
36 35
 
37 36
             $request->merge(['published_at' => NULL]);
38 37
         }
Please login to merge, or discard this patch.
app/AdminModelTrait.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,8 +72,7 @@
 block discarded – undo
72 72
     {
73 73
         if(isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE){
74 74
             return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind) );
75
-        }
76
-        else{
75
+        } else{
77 76
             return $query;
78 77
         }
79 78
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/DashboardController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -126,8 +126,7 @@
 block discarded – undo
126 126
         {
127 127
             return round((($thisValue / ($lastValue / 100)) - 100), $round);
128 128
 
129
-        }
130
-        else {
129
+        } else {
131 130
 
132 131
             return 0;
133 132
         }
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/AdminModuleController.php 2 patches
Doc Comments   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -151,8 +151,6 @@  discard block
 block discarded – undo
151 151
     /**
152 152
      * Save transaction
153 153
      *
154
-     * @param int $typeId
155
-     * @param string $text
156 154
      * @param $userId
157 155
      * @param $amount
158 156
      */
@@ -242,7 +240,7 @@  discard block
 block discarded – undo
242 240
      * Change ar result if necessary
243 241
      *
244 242
      * @param $arResult
245
-     * @return mixed
243
+     * @return string|null
246 244
      */
247 245
     public function changeEditResultField($arResult){
248 246
         return $arResult;
@@ -319,7 +317,7 @@  discard block
 block discarded – undo
319 317
      * Store a newly created resource in storage.
320 318
      *
321 319
      * @param  Request  $request
322
-     * @return Response
320
+     * @return \Illuminate\Http\RedirectResponse
323 321
      */
324 322
     public function store(Request $request) {
325 323
 
@@ -459,7 +457,7 @@  discard block
 block discarded – undo
459 457
      *
460 458
      * @param  Request  $request
461 459
      * @param  int  $id
462
-     * @return Response
460
+     * @return \Illuminate\Http\RedirectResponse
463 461
      */
464 462
     public function update(Request $request, $id) {
465 463
 
@@ -591,7 +589,7 @@  discard block
 block discarded – undo
591 589
      * Remove the specified resource from storage.
592 590
      *
593 591
      * @param  int  $id
594
-     * @return Response
592
+     * @return \Illuminate\Http\RedirectResponse
595 593
      */
596 594
 
597 595
     public function destroy($id) {
Please login to merge, or discard this patch.
Braces   +12 added lines, -26 removed lines patch added patch discarded remove patch
@@ -202,8 +202,7 @@  discard block
 block discarded – undo
202 202
         if ($this->paginateRows == NULL) {
203 203
 
204 204
             return env('ADMIN_PAGINATE', 10);
205
-        }
206
-        else{
205
+        } else{
207 206
 
208 207
             return $this->paginateRows;
209 208
         }
@@ -281,8 +280,7 @@  discard block
 block discarded – undo
281 280
          */
282 281
         if(method_exists($arResults, 'getMedia')){
283 282
             $media = $arResults->getMedia();
284
-        }
285
-        else{
283
+        } else{
286 284
             $media = null;
287 285
         }
288 286
         
@@ -292,8 +290,7 @@  discard block
 block discarded – undo
292 290
          */
293 291
         if(empty($this->customView['index']) == TRUE){
294 292
             $view = $this->moduleBasicTemplatePath . '.index';
295
-        }
296
-        else{
293
+        } else{
297 294
             $view = $this->customView;
298 295
         }
299 296
 
@@ -315,8 +312,7 @@  discard block
 block discarded – undo
315 312
          */
316 313
         if(empty($this->customView['index']) == TRUE){
317 314
             $view = $this->moduleBasicTemplatePath . '.create_edit';
318
-        }
319
-        else{
315
+        } else{
320 316
             $view = $this->customView;
321 317
         }
322 318
         
@@ -365,16 +361,14 @@  discard block
 block discarded – undo
365 361
             if(in_array($name, $this->dateTimeLocalFields)){
366 362
 
367 363
                 $object->{$name} = str_replace('T', ' ', $request->input($name)). ':00';
368
-            }
369
-            else {
364
+            } else {
370 365
 
371 366
                 /**
372 367
                  * Change to null if needed
373 368
                  */
374 369
                 if(strlen($request->$name) < 1){
375 370
                     $object->{$name} = null;
376
-                }
377
-                else {
371
+                } else {
378 372
                     $object->{$name} = $request->input($name);
379 373
                 }
380 374
             }
@@ -442,8 +436,7 @@  discard block
 block discarded – undo
442 436
          */
443 437
         if(empty($this->customView['index']) == TRUE){
444 438
             $view = $this->moduleBasicTemplatePath . '.create_edit';
445
-        }
446
-        else{
439
+        } else{
447 440
             $view = $this->customView;
448 441
         }
449 442
 
@@ -520,8 +513,7 @@  discard block
 block discarded – undo
520 513
              */
521 514
             if(in_array($name, $this->binaryFields)){
522 515
 
523
-            }
524
-            else{
516
+            } else{
525 517
                 
526 518
                /**
527 519
                 * Empty exception
@@ -534,13 +526,10 @@  discard block
 block discarded – undo
534 526
                    if(in_array($name, $this->dateTimeLocalFields)){
535 527
 
536 528
                        $arResults->$name = str_replace('T', ' ', $request->input($name)). ':00';
537
-                   }
538
-                   else {
529
+                   } else {
539 530
                        $arResults->$name = $request->input($name);
540 531
                    }
541
-               }
542
-               
543
-               else{
532
+               } else{
544 533
                    
545 534
                    /**
546 535
                     * Numeric zero ?
@@ -548,9 +537,7 @@  discard block
 block discarded – undo
548 537
                    if(isset($request->$name) && is_numeric($request->input($name)) == TRUE){
549 538
                        
550 539
                       $arResults->$name = $request->input($name);
551
-                   }
552
-                   
553
-                   else{
540
+                   } else{
554 541
                     $arResults->$name = NULL;
555 542
                    }
556 543
                }
@@ -575,8 +562,7 @@  discard block
 block discarded – undo
575 562
                 
576 563
                 if (empty($request->$value) == FALSE) {
577 564
                    $arResults->$value = $request->$value;
578
-                }
579
-                else{
565
+                } else{
580 566
                     $arResults->$value = NULL;
581 567
                 }
582 568
             }
Please login to merge, or discard this patch.
app/Http/Controllers/Frontend/FrontendController.php 2 patches
Doc Comments   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,6 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
     /**
69 69
      * Reset all session fields
70
+     * @param \Illuminate\Http\Request $request
70 71
      */
71 72
     protected function _resetSessionFields($request){
72 73
 
@@ -130,6 +131,9 @@  discard block
 block discarded – undo
130 131
         return Page::findOrFail($id);
131 132
     }
132 133
 
134
+    /**
135
+     * @param integer $id
136
+     */
133 137
     protected function _getSettings($id){
134 138
 
135 139
         $settings = Settings::find($id);
@@ -145,8 +149,6 @@  discard block
 block discarded – undo
145 149
     /**
146 150
      * Save transaction
147 151
      *
148
-     * @param int $typeId
149
-     * @param string $text
150 152
      * @param $userId
151 153
      * @param $amount
152 154
      */
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -46,8 +46,7 @@  discard block
 block discarded – undo
46 46
 
47 47
         if (view()->exists($strView)) {
48 48
             return view($strView, $this->_arViewData);
49
-        }
50
-        else{
49
+        } else{
51 50
             return abort(404);
52 51
         }
53 52
     }
@@ -136,8 +135,7 @@  discard block
 block discarded – undo
136 135
 
137 136
         if(!empty($settings)){
138 137
             return $settings['value'];
139
-        }
140
-        else{
138
+        } else{
141 139
             return NULL;
142 140
         }
143 141
     }
Please login to merge, or discard this patch.