Completed
Pull Request — master (#201)
by
unknown
02:13
created
resources/views/default/components/filters/date_range_picker.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 /** @var Nayjest\Grids\Components\Filters\DateRangePicker $component */
3 3
 $id = uniqid();
4 4
 ?>
5
-<?php if($component->getLabel()): ?>
5
+<?php if ($component->getLabel()): ?>
6 6
     <span>
7 7
         <span class="glyphicon glyphicon-calendar"></span>
8 8
         <?= $component->getLabel() ?>
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             start.val(picker.startDate.format(options.format));
37 37
             var end = $('[name="<?= $component->getEndInputName() ?>"]');
38 38
             end.val(picker.endDate.format(options.format));
39
-            <?php if($component->isSubmittedOnChange()): ?>
39
+            <?php if ($component->isSubmittedOnChange()): ?>
40 40
             	end.get(0).form.submit();
41 41
             <?php endif ?>
42 42
         };
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
                 $('[name="<?= $component->getStartInputName() ?>"]').val('');
49 49
                 $('[name="<?= $component->getEndInputName() ?>"]').val('');
50 50
 
51
-                <?php if($component->isSubmittedOnChange()): ?>
51
+                <?php if ($component->isSubmittedOnChange()): ?>
52 52
                 var end = $('[name="<?= $component->getEndInputName() ?>"]');
53 53
                 end.get(0).form.submit();
54 54
                 <?php endif ?>
Please login to merge, or discard this patch.
resources/views/default/components/filters/checkboxes.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 /** @var Nayjest\Grids\Components\SelectFilter $component */
3 3
 $value = $component->getValue();
4 4
 if (!is_array($value)) $value = [];
5
-$id = uniqid() . mt_rand();
5
+$id = uniqid().mt_rand();
6 6
 ?>
7 7
 <div class="btn-group">
8 8
     <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
25 25
                 </label>
26 26
             </div>
27 27
         </li>
28
-        <?php foreach($component->getVariants() as $val => $label): ?>
29
-            <?php if(is_array($label)):?>
28
+        <?php foreach ($component->getVariants() as $val => $label): ?>
29
+            <?php if (is_array($label)):?>
30 30
                 <?php
31 31
                 $class = '';
32
-                if(array_intersect(array_keys($label['values']), array_keys($value))) {
32
+                if (array_intersect(array_keys($label['values']), array_keys($value))) {
33 33
                     $class = ' in';
34 34
                 }
35 35
                 ?>
@@ -51,12 +51,12 @@  discard block
 block discarded – undo
51 51
                                 </label>
52 52
                             </div>
53 53
                         <?php endif ?>
54
-                        <?php foreach($label['values'] as $option_val=>$option_label):?>
54
+                        <?php foreach ($label['values'] as $option_val=>$option_label):?>
55 55
                             <div>
56 56
                                 <label>
57 57
                                     <input
58 58
                                         type="checkbox"
59
-                                        <?php if(!empty($value[$option_val])) echo "checked='checked'" ?>
59
+                                        <?php if (!empty($value[$option_val])) echo "checked='checked'" ?>
60 60
                                         name="<?= $component->getInputName() ?>[<?= $option_val ?>]"
61 61
                                     >
62 62
                                     <span><?= $option_label ?></span>
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
                     <label>
71 71
                         <input
72 72
                             type="checkbox"
73
-                            <?php if(!empty($value[$val])) echo "checked='checked'" ?>
73
+                            <?php if (!empty($value[$val])) echo "checked='checked'" ?>
74 74
                             name="<?= $component->getInputName() ?>[<?= $val ?>]"
75 75
                         >
76 76
                         <span><?= $label ?></span>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /** @var Nayjest\Grids\Components\SelectFilter $component */
3 3
 $value = $component->getValue();
4
-if (!is_array($value)) $value = [];
4
+if (!is_array($value)) {
5
+    $value = [];
6
+}
5 7
 $id = uniqid() . mt_rand();
6 8
 ?>
7 9
 <div class="btn-group">
Please login to merge, or discard this patch.
src/ObjectDataRow.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
         } else {
28 28
             try {
29 29
                 return $this->src->{$fieldName};
30
-            } catch(Exception $e) {
30
+            } catch (Exception $e) {
31 31
                 throw new RuntimeException(
32 32
                     "Can't read '$fieldName' property from DataRow",
33 33
                     0,
Please login to merge, or discard this patch.
src/Components/ExcelDownload.php 2 patches
Unused Use Statements   -8 removed lines patch added patch discarded remove patch
@@ -4,16 +4,8 @@
 block discarded – undo
4 4
 
5 5
 use Event;
6 6
 use Illuminate\Support\Facades\Storage;
7
-use Illuminate\Pagination\Paginator;
8
-use Illuminate\Foundation\Application;
9
-use Maatwebsite\Excel\Classes\LaravelExcelWorksheet;
10
-use Maatwebsite\Excel\Excel;
11
-use Maatwebsite\Excel\Writers\LaravelExcelWriter;
12 7
 use Nayjest\Grids\Components\Base\RenderableComponent;
13 8
 use Nayjest\Grids\Components\Base\RenderableRegistry;
14
-use Nayjest\Grids\DataProvider;
15
-use Nayjest\Grids\DataRow;
16
-use Nayjest\Grids\FieldConfig;
17 9
 use Nayjest\Grids\Grid;
18 10
 
19 11
 class ExcelDownload extends RenderableComponent
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,12 +67,12 @@
 block discarded – undo
67 67
     public function initialize(Grid $grid)
68 68
     {
69 69
         parent::initialize($grid);
70
-        Event::listen(Grid::EVENT_PREPARE, function (Grid $grid) {
70
+        Event::listen(Grid::EVENT_PREPARE, function(Grid $grid) {
71 71
             if ($this->grid !== $grid) {
72 72
                 return;
73 73
             }
74 74
             if ($grid->getInputProcessor()->getValue(static::INPUT_PARAM, false)) {
75
-                foreach (glob(Storage::disk('local')->getDriver()->getAdapter()->getPathPrefix() . 'public/excels/*.xlsx', GLOB_BRACE) as $fileName) {
75
+                foreach (glob(Storage::disk('local')->getDriver()->getAdapter()->getPathPrefix().'public/excels/*.xlsx', GLOB_BRACE) as $fileName) {
76 76
                     if (strpos($fileName, $this->getBaseName())) {
77 77
                         $this->responseWithProtectedFile($fileName);
78 78
                     }
Please login to merge, or discard this patch.
src/Grid.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
     /**
208 208
      * Returns footer component.
209 209
      *
210
-     * @return TFoot|null
210
+     * @return null|Components\Base\ComponentInterface
211 211
      */
212 212
     public function footer()
213 213
     {
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
     /**
218 218
      * Returns header component.
219 219
      *
220
-     * @return THead|null
220
+     * @return null|Components\Base\ComponentInterface
221 221
      */
222 222
     public function header()
223 223
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
             if (empty($trace['class']) || !$this instanceof $trace['class']) {
100 100
                 # may be closure
101 101
                 if (isset($trace['file'], $trace['line'])) {
102
-                    $str .= $trace['file'] . $trace['line'];
102
+                    $str .= $trace['file'].$trace['line'];
103 103
                 }
104 104
             }
105 105
         }
Please login to merge, or discard this patch.
src/Components/ExcelDispatchJobService.php 4 patches
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -103,7 +103,6 @@  discard block
 block discarded – undo
103 103
     }
104 104
 
105 105
     /**
106
-     * @param mixed $config
107 106
      */
108 107
     public function setClassName($className)
109 108
     {
@@ -120,7 +119,6 @@  discard block
 block discarded – undo
120 119
     }
121 120
 
122 121
     /**
123
-     * @param mixed $config
124 122
      */
125 123
     public function setUserId($userId)
126 124
     {
Please login to merge, or discard this patch.
Unused Use Statements   -3 removed lines patch added patch discarded remove patch
@@ -4,13 +4,10 @@
 block discarded – undo
4 4
 
5 5
 use App\Components\Grid\ExtendedTableRow;
6 6
 use App\Components\Grid\GridsToComponents;
7
-use App\Http\Controllers\SupportersController;
8 7
 use App\Topic;
9 8
 use App\User;
10
-use Event;
11 9
 use Illuminate\Pagination\Paginator;
12 10
 use Illuminate\Foundation\Application;
13
-use Illuminate\Support\Facades\DB;
14 11
 use Maatwebsite\Excel\Classes\LaravelExcelWorksheet;
15 12
 use Maatwebsite\Excel\Excel;
16 13
 use Maatwebsite\Excel\Writers\LaravelExcelWriter;
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -140,17 +140,17 @@  discard block
 block discarded – undo
140 140
         $user = User::find($this->userId);
141 141
 
142 142
         $controllers = GridsToComponents::getGridsControllers();
143
-        $className = 'App\\Http\\Controllers\\' . $controllers[$sheetName];
143
+        $className = 'App\\Http\\Controllers\\'.$controllers[$sheetName];
144 144
 
145
-        if($sheetName == 'topicQuestionsGrid') {
145
+        if ($sheetName == 'topicQuestionsGrid') {
146 146
             $topic = Topic::find($showId);
147 147
             $this->config = $className::getQuestionsGridConfig($topic);
148 148
         }
149
-        else{
149
+        else {
150 150
             $this->config = $className::getGridConfig($user);
151 151
         }
152 152
 
153
-        $grid = (new Grid($this->config->setRowComponent(new ExtendedTableRow(function ($model) {
153
+        $grid = (new Grid($this->config->setRowComponent(new ExtendedTableRow(function($model) {
154 154
             return $className::getRowAttributes($model);
155 155
         }))));
156 156
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
         if (version_compare(Application::VERSION, '5.0.0', '<')) {
249 249
             $provider->getPaginationFactory()->setPageName('page_unused');
250 250
         } else {
251
-            Paginator::currentPageResolver(function () {
251
+            Paginator::currentPageResolver(function() {
252 252
                 return 1;
253 253
             });
254 254
         }
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
         $excel = app('excel');
302 302
         $excel
303 303
             ->create($this->getFileName(), $this->getOnFileCreate())
304
-            ->store('xlsx',Storage::disk('local')->getDriver()->getAdapter()->getPathPrefix() . 'public/excels/');
304
+            ->store('xlsx', Storage::disk('local')->getDriver()->getAdapter()->getPathPrefix().'public/excels/');
305 305
     }
306 306
 
307 307
     protected function escapeString($str)
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
     public function getOnFileCreate()
363 363
     {
364 364
         if ($this->on_file_create === null) {
365
-            $this->on_file_create = function (LaravelExcelWriter $excel) {
365
+            $this->on_file_create = function(LaravelExcelWriter $excel) {
366 366
                 $excel->sheet($this->getSheetName(), $this->getOnSheetCreate());
367 367
 
368 368
             };
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
     public function getOnSheetCreate()
388 388
     {
389 389
         if ($this->on_sheet_create === null) {
390
-            $this->on_sheet_create = function (LaravelExcelWorksheet $sheet) {
390
+            $this->on_sheet_create = function(LaravelExcelWorksheet $sheet) {
391 391
 //                for($i = 0; $i < count($data); $i++) {
392 392
 //                    for ($j = 0; $j < count($data[$i]); $j++) {
393 393
 //                        $sheet->appendRow(($i * 1000) + $j + 1, $data[$i][$j]);
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -145,8 +145,7 @@
 block discarded – undo
145 145
         if($sheetName == 'topicQuestionsGrid') {
146 146
             $topic = Topic::find($showId);
147 147
             $this->config = $className::getQuestionsGridConfig($topic);
148
-        }
149
-        else{
148
+        } else{
150 149
             $this->config = $className::getGridConfig($user);
151 150
         }
152 151
 
Please login to merge, or discard this patch.
src/Components/ExcelExport.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,8 +56,8 @@
 block discarded – undo
56 56
     public function initialize(Grid $grid)
57 57
     {
58 58
         parent::initialize($grid);
59
-        $this->showId = substr(url()->current(), strrpos(url()->current(), '/' )+1);
60
-        Event::listen(Grid::EVENT_PREPARE, function (Grid $grid) {
59
+        $this->showId = substr(url()->current(), strrpos(url()->current(), '/') + 1);
60
+        Event::listen(Grid::EVENT_PREPARE, function(Grid $grid) {
61 61
             if ($grid->getInputProcessor()->getValue(static::INPUT_PARAM, false)) {
62 62
                 dispatch((new ExportExcel($this->getDate(), $grid->getConfig()->getName(), auth()->user()->id, $this->showId))->onQueue('default'));
63 63
             }
Please login to merge, or discard this patch.