Completed
Push — master ( 2554b1...252880 )
by Scott
02:18
created
models/Product.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -159,12 +159,12 @@  discard block
 block discarded – undo
159 159
      */
160 160
     protected function deleteRelatedInventories($inventories)
161 161
     {
162
-        return array_filter($inventories, function ($inventory) {
162
+        return array_filter($inventories, function($inventory) {
163 163
             if ($inventory['id'] !== null && $inventory['is_deleted']) {
164 164
                 Inventory::find($inventory['id'])->delete();
165 165
             }
166 166
 
167
-            return ! $inventory['is_deleted'];
167
+            return !$inventory['is_deleted'];
168 168
         });
169 169
     }
170 170
 
@@ -176,12 +176,12 @@  discard block
 block discarded – undo
176 176
      */
177 177
     protected function deleteRelatedOptions($options)
178 178
     {
179
-        return array_filter($options, function ($option) {
179
+        return array_filter($options, function($option) {
180 180
             if ($option['id'] !== null && $option['is_deleted']) {
181 181
                 Option::find($option['id'])->delete();
182 182
             }
183 183
 
184
-            return ! $option['is_deleted'];
184
+            return !$option['is_deleted'];
185 185
         });
186 186
     }
187 187
 
@@ -193,12 +193,12 @@  discard block
 block discarded – undo
193 193
      */
194 194
     protected function deleteRelatedOptionValues($optionValues)
195 195
     {
196
-        return array_filter($optionValues, function ($optionValue) {
196
+        return array_filter($optionValues, function($optionValue) {
197 197
             if ($optionValue['id'] !== null && $optionValue['is_deleted']) {
198 198
                 OptionValue::find($optionValue['id'])->delete();
199 199
             }
200 200
 
201
-            return ! $optionValue['is_deleted'];
201
+            return !$optionValue['is_deleted'];
202 202
         });
203 203
     }
204 204
 
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
      * @param  string $sessionKey
331 331
      * @return void
332 332
      */
333
-    protected function saveRelatedOptionValues(Option &$option, array $values, $sessionKey)
333
+    protected function saveRelatedOptionValues(Option & $option, array $values, $sessionKey)
334 334
     {
335 335
         foreach ($values as $index => $value) {
336 336
             $model = array_key_exists('id', $value) && $value['id'] !== null
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
      */
384 384
     public static function syncAllInheritedCategories()
385 385
     {
386
-        Queue::push(function ($job) {
386
+        Queue::push(function($job) {
387 387
             $data = [];
388 388
             $products = Product::with('categories')->get();
389 389
             $categoryTree = Category::getParentCategoryIds();
@@ -446,8 +446,8 @@  discard block
 block discarded – undo
446 446
      */
447 447
     protected function validateInventories()
448 448
     {
449
-        if (! is_array($this->optionsInventories) ||
450
-            ! is_array($this->optionsInventories['options'])) {
449
+        if (!is_array($this->optionsInventories) ||
450
+            !is_array($this->optionsInventories['options'])) {
451 451
             return;
452 452
         }
453 453
 
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
             sort($inventory['valueIds']);
462 462
             $valueCombination = json_encode($inventory['valueIds']);
463 463
 
464
-            if (in_array($valueCombination, $takenValueCombinations) && ! $inventory['is_deleted']) {
464
+            if (in_array($valueCombination, $takenValueCombinations) && !$inventory['is_deleted']) {
465 465
                 Flash::error(Lang::get('bedard.shop::lang.products.form.duplicate_inventories_error'));
466 466
                 throw new ModelException($this);
467 467
             }
@@ -478,8 +478,8 @@  discard block
 block discarded – undo
478 478
      */
479 479
     protected function validateOptions()
480 480
     {
481
-        if (! is_array($this->optionsInventories) ||
482
-            ! is_array($this->optionsInventories['options'])) {
481
+        if (!is_array($this->optionsInventories) ||
482
+            !is_array($this->optionsInventories['options'])) {
483 483
             return;
484 484
         }
485 485
 
Please login to merge, or discard this patch.
models/Inventory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,11 +91,11 @@
 block discarded – undo
91 91
      */
92 92
     public function scopeHasOptionValueIds($query, $ids)
93 93
     {
94
-        if (! is_array($ids)) {
94
+        if (!is_array($ids)) {
95 95
             $ids = [$ids];
96 96
         }
97 97
 
98
-        return $query->whereHas('optionValues', function ($optionValue) use ($ids) {
98
+        return $query->whereHas('optionValues', function($optionValue) use ($ids) {
99 99
             return $optionValue->whereIn('id', $ids);
100 100
         });
101 101
     }
Please login to merge, or discard this patch.
updates/1.0/create_filters_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 {
9 9
     public function up()
10 10
     {
11
-        Schema::create('bedard_shop_filters', function (Blueprint $table) {
11
+        Schema::create('bedard_shop_filters', function(Blueprint $table) {
12 12
             $table->engine = 'InnoDB';
13 13
             $table->increments('id');
14 14
             $table->integer('category_id')->unsigned()->index();
Please login to merge, or discard this patch.
controllers/Filters.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
     public function validate()
19 19
     {
20 20
         $data = input('option');
21
-        if (! $data || ! is_array($data)) {
21
+        if (!$data || !is_array($data)) {
22 22
             return Response::make('Error', 422);
23 23
         }
24 24
 
Please login to merge, or discard this patch.
models/Category.php 2 patches
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,6 @@  discard block
 block discarded – undo
141 141
     /**
142 142
      * Apply filters to a products query.
143 143
      *
144
-     * @param  \October\Rain\Database\Builder   $query
145 144
      * @return void
146 145
      */
147 146
     protected function applyProductFilters(Builder &$products)
@@ -239,6 +238,9 @@  discard block
 block discarded – undo
239 238
         return $children;
240 239
     }
241 240
 
241
+    /**
242
+     * @param integer $children
243
+     */
242 244
     public static function getParentIds($children, \October\Rain\Database\Collection $categories = null)
243 245
     {
244 246
         if (! is_array($children)) {
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
      * @param  \October\Rain\Database\Builder   $query
145 145
      * @return void
146 146
      */
147
-    protected function applyProductFilters(Builder &$products)
147
+    protected function applyProductFilters(Builder & $products)
148 148
     {
149
-        $products->where(function ($query) {
149
+        $products->where(function($query) {
150 150
             foreach ($this->filters as $filter) {
151 151
                 // price filters
152 152
                 if ($filter->left === 'base_price' || $filter->left === 'price') {
@@ -186,12 +186,12 @@  discard block
 block discarded – undo
186 186
      */
187 187
     protected function deleteRelatedFilters(array $filters)
188 188
     {
189
-        return array_filter($filters, function ($filter) {
189
+        return array_filter($filters, function($filter) {
190 190
             if ($filter['id'] !== null && $filter['is_deleted']) {
191 191
                 Filter::find($filter['id'])->delete();
192 192
             }
193 193
 
194
-            return ! $filter['is_deleted'];
194
+            return !$filter['is_deleted'];
195 195
         });
196 196
     }
197 197
 
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 
242 242
     public static function getParentIds($children, \October\Rain\Database\Collection $categories = null)
243 243
     {
244
-        if (! is_array($children)) {
244
+        if (!is_array($children)) {
245 245
             $children = [$children];
246 246
         }
247 247
 
@@ -251,13 +251,13 @@  discard block
 block discarded – undo
251 251
 
252 252
         $parents = [];
253 253
         foreach ($children as $child) {
254
-            $category = $categories->filter(function ($model) use ($child) {
254
+            $category = $categories->filter(function($model) use ($child) {
255 255
                 return $model->id == $child;
256 256
             })->first();
257 257
 
258 258
             while ($category && $category->parent_id) {
259 259
                 $parents[] = $category->parent_id;
260
-                $category = $categories->filter(function ($model) use ($category) {
260
+                $category = $categories->filter(function($model) use ($category) {
261 261
                     return $model->id == $category->parent_id;
262 262
                 })->first();
263 263
             }
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
      */
319 319
     public function isCustomSorted()
320 320
     {
321
-        return ! $this->product_sort_column && ! $this->product_sort_direction;
321
+        return !$this->product_sort_column && !$this->product_sort_direction;
322 322
     }
323 323
 
324 324
     /**
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
     {
341 341
         $filters = $this->getOriginalPurgeValue('category_filters');
342 342
 
343
-        if (is_array($filters) && ! empty($filters)) {
343
+        if (is_array($filters) && !empty($filters)) {
344 344
             $filters = $this->deleteRelatedFilters($filters);
345 345
             $this->saveRelatedFilters($filters);
346 346
         }
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
      */
443 443
     protected function setNullParentId()
444 444
     {
445
-        if (! $this->parent_id) {
445
+        if (!$this->parent_id) {
446 446
             $this->parent_id = null;
447 447
         }
448 448
     }
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
483 483
      */
484 484
     public function syncInheritedProductsAfterDelete()
485 485
     {
486
-        if (! $this->dontSyncAfterDelete) {
486
+        if (!$this->dontSyncAfterDelete) {
487 487
             Product::syncAllInheritedCategories();
488 488
         }
489 489
     }
Please login to merge, or discard this patch.
repositories/CategoryRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
     {
15 15
         $query = Category::isActive();
16 16
 
17
-        if (array_key_exists('select', $params) && is_array($params['select']) && ! empty($params['select'])) {
17
+        if (array_key_exists('select', $params) && is_array($params['select']) && !empty($params['select'])) {
18 18
             $query->select($params['select']);
19 19
         }
20 20
 
Please login to merge, or discard this patch.