@@ -89,10 +89,10 @@ |
||
89 | 89 | { |
90 | 90 | $config = $this->config; |
91 | 91 | foreach ($this->columns() as $column) { |
92 | - $key = camel_case($config->get('id') . '_' . $column->name); |
|
92 | + $key = camel_case($config->get('id').'_'.$column->name); |
|
93 | 93 | |
94 | 94 | if (isset($params[$key]) && $params[$key] != '') { |
95 | - $query = $query->where($key, 'like', '%' . $params[$key] . '%'); |
|
95 | + $query = $query->where($key, 'like', '%'.$params[$key].'%'); |
|
96 | 96 | } |
97 | 97 | } |
98 | 98 |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | public static function getThumbnail(Media $media, $type, $dimension, $defaultSelf = true) |
65 | 65 | { |
66 | 66 | $image = static::derives($media) //->where('type', $type)->where('code', $dimension)->first(); |
67 | - ->whereHas('meta', function ($query) use ($type, $dimension) { |
|
67 | + ->whereHas('meta', function($query) use ($type, $dimension) { |
|
68 | 68 | $query->where('type', $type)->where('code', $dimension); |
69 | 69 | })->with('meta')->first(); |
70 | 70 | |
@@ -98,13 +98,13 @@ discard block |
||
98 | 98 | public function render(array $option = []) |
99 | 99 | { |
100 | 100 | if (isset($option['responsive']) && $option['responsive'] === true) { |
101 | - return '<img src="' . $this->url() . '" style="max-width: 100%" />'; |
|
101 | + return '<img src="'.$this->url().'" style="max-width: 100%" />'; |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | $width = Arr::get($option, 'width') ?: $this->width; |
105 | 105 | $height = Arr::get($option, 'height') ?: $this->height; |
106 | 106 | |
107 | - return '<img src="' . $this->url() . '" width="' . $width . '" height="' . $height . '" />'; |
|
107 | + return '<img src="'.$this->url().'" width="'.$width.'" height="'.$height.'" />'; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -44,8 +44,8 @@ discard block |
||
44 | 44 | $descendant = $item->getDescendantName(); |
45 | 45 | $depth = $item->getDepthName(); |
46 | 46 | |
47 | - $select = $conn->table($table . ' as a') |
|
48 | - ->joinWhere($table . ' as d', "d.{$ancestor}", '=', $item->getKey()) |
|
47 | + $select = $conn->table($table.' as a') |
|
48 | + ->joinWhere($table.' as d', "d.{$ancestor}", '=', $item->getKey()) |
|
49 | 49 | ->where("a.{$descendant}", '=', $parent->getKey()) |
50 | 50 | ->select([ |
51 | 51 | "a.{$ancestor}", |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | $bindings = $select->getBindings(); |
57 | 57 | |
58 | - $insertQuery = sprintf("insert into %s (`{$ancestor}`, `{$descendant}`, `{$depth}`) ", $prefix . $table) |
|
58 | + $insertQuery = sprintf("insert into %s (`{$ancestor}`, `{$descendant}`, `{$depth}`) ", $prefix.$table) |
|
59 | 59 | . $select->toSql(); |
60 | 60 | |
61 | 61 | return $conn->insert($insertQuery, $bindings); |
@@ -75,12 +75,12 @@ discard block |
||
75 | 75 | $ancestor = $item->getAncestorName(); |
76 | 76 | $descendant = $item->getDescendantName(); |
77 | 77 | |
78 | - $rows = $conn->table($table . ' as a') |
|
79 | - ->join($table . ' as rel', "a.{$ancestor}", '=', "rel.{$ancestor}") |
|
80 | - ->join($table . ' as d', "d.{$descendant}", '=', "rel.{$descendant}") |
|
78 | + $rows = $conn->table($table.' as a') |
|
79 | + ->join($table.' as rel', "a.{$ancestor}", '=', "rel.{$ancestor}") |
|
80 | + ->join($table.' as d', "d.{$descendant}", '=', "rel.{$descendant}") |
|
81 | 81 | ->where("a.{$descendant}", $parent->getKey()) |
82 | 82 | ->where("d.{$ancestor}", $item->getKey()) |
83 | - ->get(['rel.' . $item->getKeyName()]); |
|
83 | + ->get(['rel.'.$item->getKeyName()]); |
|
84 | 84 | |
85 | 85 | $ids = array_column($rows, $item->getKeyName()); |
86 | 86 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $position = $position !== null ? $position : count($children); |
107 | 107 | |
108 | 108 | /** @var Collection $children */ |
109 | - $children = $children->filter(function (Node $model) use ($item) { |
|
109 | + $children = $children->filter(function(Node $model) use ($item) { |
|
110 | 110 | return $model->getKey() != $item->getKey(); |
111 | 111 | }); |
112 | 112 | |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | ->merge([$item]) |
115 | 115 | ->merge($children->slice($position)); |
116 | 116 | |
117 | - $children->each(function (Node $model, $idx) { |
|
117 | + $children->each(function(Node $model, $idx) { |
|
118 | 118 | $model->{$model->getOrderKeyName()} = $idx; |
119 | 119 | $model->save(); |
120 | 120 | }); |
@@ -628,12 +628,12 @@ discard block |
||
628 | 628 | protected function menuKeyString($value) |
629 | 629 | { |
630 | 630 | if ($value instanceof MenuItem) { |
631 | - $string = $value->menu->getKey() . '.' . implode('.', $value->getBreadcrumbs()); |
|
631 | + $string = $value->menu->getKey().'.'.implode('.', $value->getBreadcrumbs()); |
|
632 | 632 | } else { |
633 | 633 | $string = $value; |
634 | 634 | } |
635 | 635 | |
636 | - return $this->menuKeyword . '.' . $string; |
|
636 | + return $this->menuKeyword.'.'.$string; |
|
637 | 637 | } |
638 | 638 | |
639 | 639 | /** |
@@ -749,7 +749,7 @@ discard block |
||
749 | 749 | */ |
750 | 750 | protected function permKeyString(MenuItem $item) |
751 | 751 | { |
752 | - return $item->menu->getKey() . '.' . implode('.', $item->getBreadcrumbs()); |
|
752 | + return $item->menu->getKey().'.'.implode('.', $item->getBreadcrumbs()); |
|
753 | 753 | } |
754 | 754 | |
755 | 755 | /** |
@@ -782,7 +782,7 @@ discard block |
||
782 | 782 | */ |
783 | 783 | public function setModel($model) |
784 | 784 | { |
785 | - $this->model = '\\' . ltrim($model, '\\'); |
|
785 | + $this->model = '\\'.ltrim($model, '\\'); |
|
786 | 786 | } |
787 | 787 | |
788 | 788 | /** |
@@ -75,7 +75,7 @@ |
||
75 | 75 | * |
76 | 76 | * @var array |
77 | 77 | */ |
78 | - protected $fillable = ['parentId', 'title', 'url', 'description', 'target', 'type' , 'ordering', 'activated']; |
|
78 | + protected $fillable = ['parentId', 'title', 'url', 'description', 'target', 'type', 'ordering', 'activated']; |
|
79 | 79 | |
80 | 80 | /** |
81 | 81 | * Indicates if the model selected. |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public static function setItemModel($model) |
78 | 78 | { |
79 | - static::$itemModel = '\\' . ltrim($model, '\\'); |
|
79 | + static::$itemModel = '\\'.ltrim($model, '\\'); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -96,6 +96,6 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public function getCountName() |
98 | 98 | { |
99 | - return 'count' ; |
|
99 | + return 'count'; |
|
100 | 100 | } |
101 | 101 | } |
@@ -333,6 +333,6 @@ |
||
333 | 333 | */ |
334 | 334 | public function setModel($model) |
335 | 335 | { |
336 | - $this->model = '\\' . ltrim($model, '\\'); |
|
336 | + $this->model = '\\'.ltrim($model, '\\'); |
|
337 | 337 | } |
338 | 338 | } |
@@ -13,8 +13,8 @@ discard block |
||
13 | 13 | |
14 | 14 | public function testCreate() |
15 | 15 | { |
16 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
17 | - $instance = $this->getMock(MenuHandler::class, ['createModel', 'generateNewId', 'registerDefaultPermission'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
16 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
17 | + $instance = $this->getMock(MenuHandler::class, ['createModel', 'generateNewId', 'registerDefaultPermission'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
18 | 18 | |
19 | 19 | $mockMenu = m::mock('Xpressengine\Menu\Models\Menu'); |
20 | 20 | $mockMenu->shouldReceive('fill')->once()->with([ |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | |
39 | 39 | public function testPut() |
40 | 40 | { |
41 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
42 | - $instance = new MenuHandler($keygen, $configs, $permissoins, $modules, $routes); |
|
41 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
42 | + $instance = new MenuHandler($keygen, $configs, $permissoins, $modules, $routes); |
|
43 | 43 | |
44 | 44 | $mockMenu = m::mock('Xpressengine\Menu\Models\Menu'); |
45 | 45 | $mockMenu->shouldReceive('isDirty')->andReturn(true); |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | |
51 | 51 | public function testRemove() |
52 | 52 | { |
53 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
54 | - $instance = $this->getMock(MenuHandler::class, ['deleteMenuTheme', 'deleteMenuPermission'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
53 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
54 | + $instance = $this->getMock(MenuHandler::class, ['deleteMenuTheme', 'deleteMenuPermission'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
55 | 55 | |
56 | 56 | $collection = m::mock('stdClass'); |
57 | 57 | $collection->shouldReceive('count')->andReturn(0); |
@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | |
70 | 70 | public function testRemoveThrowsExceptionWhenHasItem() |
71 | 71 | { |
72 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
73 | - $instance = $this->getMock(MenuHandler::class, ['deleteMenuTheme', 'deleteMenuPermission'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
72 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
73 | + $instance = $this->getMock(MenuHandler::class, ['deleteMenuTheme', 'deleteMenuPermission'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
74 | 74 | |
75 | 75 | $collection = m::mock('stdClass'); |
76 | 76 | $collection->shouldReceive('count')->andReturn(1); |
@@ -89,11 +89,11 @@ discard block |
||
89 | 89 | |
90 | 90 | public function testCreateItem() |
91 | 91 | { |
92 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
92 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
93 | 93 | $instance = $this->getMock( |
94 | 94 | MenuHandler::class, |
95 | 95 | ['createItemModel', 'generateNewId', 'setHierarchy', 'setOrder', 'registerItemPermission', 'storeMenuType'], |
96 | - [$keygen, $configs, $permissoins, $modules, $routes] |
|
96 | + [$keygen, $configs, $permissoins, $modules, $routes] |
|
97 | 97 | ); |
98 | 98 | |
99 | 99 | $mockMenu = m::mock('Xpressengine\Menu\Models\Menu')->shouldAllowMockingProtectedMethods(); |
@@ -150,11 +150,11 @@ discard block |
||
150 | 150 | |
151 | 151 | public function testPutItem() |
152 | 152 | { |
153 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
153 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
154 | 154 | $instance = $this->getMock( |
155 | 155 | MenuHandler::class, |
156 | 156 | ['updateMenuType'], |
157 | - [$keygen, $configs, $permissoins, $modules, $routes] |
|
157 | + [$keygen, $configs, $permissoins, $modules, $routes] |
|
158 | 158 | ); |
159 | 159 | |
160 | 160 | $mockMenuItem = m::mock('Xpressengine\Menu\Models\MenuItem'); |
@@ -171,11 +171,11 @@ discard block |
||
171 | 171 | |
172 | 172 | public function testRemoveItem() |
173 | 173 | { |
174 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
174 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
175 | 175 | $instance = $this->getMock( |
176 | 176 | MenuHandler::class, |
177 | 177 | ['deleteItemPermission', 'destroyMenuType'], |
178 | - [$keygen, $configs, $permissoins, $modules, $routes] |
|
178 | + [$keygen, $configs, $permissoins, $modules, $routes] |
|
179 | 179 | ); |
180 | 180 | |
181 | 181 | $mockMenuItem = m::mock('Xpressengine\Menu\Models\MenuItem'); |
@@ -196,8 +196,8 @@ discard block |
||
196 | 196 | |
197 | 197 | public function testRemoveItemThrowsExceptionWhenHasItem() |
198 | 198 | { |
199 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
200 | - $instance = $this->getMock(MenuHandler::class, ['deleteItemPermission'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
199 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
200 | + $instance = $this->getMock(MenuHandler::class, ['deleteItemPermission'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
201 | 201 | |
202 | 202 | $mockMenuItem = m::mock('Xpressengine\Menu\Models\MenuItem'); |
203 | 203 | $mockMenuItem->shouldReceive('getDescendantCount')->andReturn(1); |
@@ -213,8 +213,8 @@ discard block |
||
213 | 213 | |
214 | 214 | public function testSetOrder() |
215 | 215 | { |
216 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
217 | - $instance = new MenuHandler($keygen, $configs, $permissoins, $modules, $routes); |
|
216 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
217 | + $instance = new MenuHandler($keygen, $configs, $permissoins, $modules, $routes); |
|
218 | 218 | |
219 | 219 | $collection = m::mock('stdClass'); |
220 | 220 | $collection->shouldReceive('filter')->andReturn($collection); |
@@ -238,8 +238,8 @@ discard block |
||
238 | 238 | |
239 | 239 | public function testMoveItem() |
240 | 240 | { |
241 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
242 | - $instance = $this->getMock(MenuHandler::class, ['createItemModel', 'unlinkHierarchy', 'linkHierarchy'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
241 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
242 | + $instance = $this->getMock(MenuHandler::class, ['createItemModel', 'unlinkHierarchy', 'linkHierarchy'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
243 | 243 | |
244 | 244 | $mockMenu = m::mock('Xpressengine\Menu\Models\Menu'); |
245 | 245 | $mockMenu->shouldReceive('getKey')->andReturn('menuKey'); |
@@ -282,8 +282,8 @@ discard block |
||
282 | 282 | |
283 | 283 | public function testSetMenuTheme() |
284 | 284 | { |
285 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
286 | - $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
285 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
286 | + $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
287 | 287 | |
288 | 288 | $mockMenu = m::mock('Xpressengine\Menu\Models\Menu'); |
289 | 289 | $mockMenu->shouldReceive('getKey')->andReturn('menuKey'); |
@@ -300,8 +300,8 @@ discard block |
||
300 | 300 | |
301 | 301 | public function testGetMenuTheme() |
302 | 302 | { |
303 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
304 | - $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
303 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
304 | + $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
305 | 305 | |
306 | 306 | $mockMenu = m::mock('Xpressengine\Menu\Models\Menu'); |
307 | 307 | $mockMenu->shouldReceive('getKey')->andReturn('menuKey'); |
@@ -317,8 +317,8 @@ discard block |
||
317 | 317 | |
318 | 318 | public function testUpdateMenuTheme() |
319 | 319 | { |
320 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
321 | - $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
320 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
321 | + $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
322 | 322 | |
323 | 323 | $mockMenu = m::mock('Xpressengine\Menu\Models\Menu'); |
324 | 324 | $mockMenu->shouldReceive('getKey')->andReturn('menuKey'); |
@@ -338,8 +338,8 @@ discard block |
||
338 | 338 | |
339 | 339 | public function testDeleteMenuTheme() |
340 | 340 | { |
341 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
342 | - $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
341 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
342 | + $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
343 | 343 | |
344 | 344 | $mockMenu = m::mock('Xpressengine\Menu\Models\Menu'); |
345 | 345 | $mockMenu->shouldReceive('getKey')->andReturn('menuKey'); |
@@ -353,8 +353,8 @@ discard block |
||
353 | 353 | |
354 | 354 | public function testSetMenuItemTheme() |
355 | 355 | { |
356 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
357 | - $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
356 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
357 | + $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
358 | 358 | |
359 | 359 | $mockMenuItem = m::mock('Xpressengine\Menu\Models\MenuItem'); |
360 | 360 | |
@@ -370,8 +370,8 @@ discard block |
||
370 | 370 | |
371 | 371 | public function testGetMenuItemTheme() |
372 | 372 | { |
373 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
374 | - $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
373 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
374 | + $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
375 | 375 | |
376 | 376 | $mockMenuItem = m::mock('Xpressengine\Menu\Models\MenuItem'); |
377 | 377 | |
@@ -386,8 +386,8 @@ discard block |
||
386 | 386 | |
387 | 387 | public function testUpdateMenuItemTheme() |
388 | 388 | { |
389 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
390 | - $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
389 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
390 | + $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
391 | 391 | |
392 | 392 | $mockMenuItem = m::mock('Xpressengine\Menu\Models\MenuItem'); |
393 | 393 | |
@@ -406,8 +406,8 @@ discard block |
||
406 | 406 | |
407 | 407 | public function testDeleteMenuItemTheme() |
408 | 408 | { |
409 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
410 | - $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
409 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
410 | + $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
411 | 411 | |
412 | 412 | $mockMenuItem = m::mock('Xpressengine\Menu\Models\MenuItem'); |
413 | 413 | |
@@ -420,8 +420,8 @@ discard block |
||
420 | 420 | |
421 | 421 | public function testMoveItemConfig() |
422 | 422 | { |
423 | - list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
424 | - $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
423 | + list($keygen, $configs, $permissoins, $modules, $routes) = $this->getMocks(); |
|
424 | + $instance = $this->getMock(MenuHandler::class, ['menuKeyString'], [$keygen, $configs, $permissoins, $modules, $routes]); |
|
425 | 425 | |
426 | 426 | $mockBefore = m::mock('Xpressengine\Menu\Models\MenuItem'); |
427 | 427 | $mockAfter = m::mock('Xpressengine\Menu\Models\MenuItem'); |