@@ -112,7 +112,7 @@ |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
115 | - * @param string|Model $class |
|
115 | + * @param string|null $class |
|
116 | 116 | * @return ModelConfigurationInterface |
117 | 117 | */ |
118 | 118 | public function getModel($class) |
@@ -121,7 +121,7 @@ |
||
121 | 121 | $class = get_class($class); |
122 | 122 | } |
123 | 123 | |
124 | - if (! $this->hasModel($class)) { |
|
124 | + if (!$this->hasModel($class)) { |
|
125 | 125 | $this->registerModel($class); |
126 | 126 | } |
127 | 127 |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function fromField(Request $request, ModelConfigurationInterface $model, $field, $id = null) |
24 | 24 | { |
25 | - if (! is_null($id)) { |
|
25 | + if (!is_null($id)) { |
|
26 | 26 | $item = $model->getRepository()->find($id); |
27 | - if (is_null($item) || ! $model->isEditable($item)) { |
|
27 | + if (is_null($item) || !$model->isEditable($item)) { |
|
28 | 28 | return new JsonResponse([ |
29 | 29 | 'message' => trans('lang.message.access_denied'), |
30 | 30 | ], 403); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | $form = $model->fireEdit($id); |
34 | 34 | } else { |
35 | - if (! $model->isCreatable()) { |
|
35 | + if (!$model->isCreatable()) { |
|
36 | 36 | return new JsonResponse([ |
37 | 37 | 'message' => trans('lang.message.access_denied'), |
38 | 38 | ], 403); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | */ |
13 | 13 | public function aliases() |
14 | 14 | { |
15 | - return $this->map(function (ModelConfigurationInterface $model) { |
|
15 | + return $this->map(function(ModelConfigurationInterface $model) { |
|
16 | 16 | return $model->getAlias(); |
17 | 17 | }); |
18 | 18 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function keyByAlias() |
24 | 24 | { |
25 | - return $this->keyBy(function (ModelConfigurationInterface $model) { |
|
25 | + return $this->keyBy(function(ModelConfigurationInterface $model) { |
|
26 | 26 | return $model->getAlias(); |
27 | 27 | }); |
28 | 28 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function getOptions() |
56 | 56 | { |
57 | - if (! is_null($this->getModelForOptions()) && ! is_null($this->getDisplay())) { |
|
57 | + if (!is_null($this->getModelForOptions()) && !is_null($this->getDisplay())) { |
|
58 | 58 | $this->setOptions( |
59 | 59 | $this->loadOptions() |
60 | 60 | ); |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | */ |
136 | 136 | public function exclude($keys) |
137 | 137 | { |
138 | - if (! is_array($keys)) { |
|
138 | + if (!is_array($keys)) { |
|
139 | 139 | $keys = func_get_args(); |
140 | 140 | } |
141 | 141 |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | public static function registerRoutes(Router $router) |
29 | 29 | { |
30 | 30 | $routeName = 'admin.display.column.move-up'; |
31 | - if (! $router->has($routeName)) { |
|
31 | + if (!$router->has($routeName)) { |
|
32 | 32 | $router->post('{adminModel}/{adminModelId}/up', [ |
33 | 33 | 'as' => $routeName, |
34 | 34 | 'uses' => 'SleepingOwl\Admin\Http\Controllers\DisplayColumnController@orderUp', |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | $routeName = 'admin.display.column.move-down'; |
39 | - if (! $router->has($routeName)) { |
|
39 | + if (!$router->has($routeName)) { |
|
40 | 40 | $router->post('{adminModel}/{adminModelId}/down', [ |
41 | 41 | 'as' => $routeName, |
42 | 42 | 'uses' => 'SleepingOwl\Admin\Http\Controllers\DisplayColumnController@orderDown', |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function getModel() |
58 | 58 | { |
59 | - if (! in_array(OrderableModel::class, trait_uses_recursive($class = get_class($this->model)))) { |
|
59 | + if (!in_array(OrderableModel::class, trait_uses_recursive($class = get_class($this->model)))) { |
|
60 | 60 | throw new \Exception("Model [$class] should uses trait [SleepingOwl\\Admin\\Traits\\OrderableModel]"); |
61 | 61 | } |
62 | 62 |
@@ -104,15 +104,15 @@ |
||
104 | 104 | $from = $this->from->parseValue($from); |
105 | 105 | $to = $this->to->parseValue($to); |
106 | 106 | |
107 | - if (! empty($from) && ! empty($to)) { |
|
107 | + if (!empty($from) && !empty($to)) { |
|
108 | 108 | $this->setOperator('between'); |
109 | 109 | |
110 | 110 | return [$from, $to]; |
111 | - } elseif (! empty($from)) { |
|
111 | + } elseif (!empty($from)) { |
|
112 | 112 | $this->setOperator('greater_or_equal'); |
113 | 113 | |
114 | 114 | return $from; |
115 | - } elseif (! empty($to)) { |
|
115 | + } elseif (!empty($to)) { |
|
116 | 116 | $this->setOperator('less_or_equal'); |
117 | 117 | |
118 | 118 | return $to; |
@@ -119,7 +119,7 @@ |
||
119 | 119 | $fieldName = array_pop($parts); |
120 | 120 | $relationName = implode('.', $parts); |
121 | 121 | |
122 | - $query->whereHas($relationName, function ($q) use ($queryString, $fieldName) { |
|
122 | + $query->whereHas($relationName, function($q) use ($queryString, $fieldName) { |
|
123 | 123 | $this->buildQuery($q, $fieldName, $queryString); |
124 | 124 | }); |
125 | 125 | } else { |
@@ -60,7 +60,7 @@ |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
63 | - * @param mixed $value |
|
63 | + * @param string $value |
|
64 | 64 | * |
65 | 65 | * @return mixed |
66 | 66 | */ |
@@ -74,8 +74,8 @@ |
||
74 | 74 | */ |
75 | 75 | protected function getFormatedDate($date) |
76 | 76 | { |
77 | - if (! is_null($date)) { |
|
78 | - if (! $date instanceof Carbon) { |
|
77 | + if (!is_null($date)) { |
|
78 | + if (!$date instanceof Carbon) { |
|
79 | 79 | $date = Carbon::parse($date); |
80 | 80 | } |
81 | 81 |
@@ -91,10 +91,10 @@ discard block |
||
91 | 91 | $this->controlActive = false; |
92 | 92 | |
93 | 93 | if ($this->isInitialize()) { |
94 | - $this->columns = $this->columns->filter(function ($column) { |
|
94 | + $this->columns = $this->columns->filter(function($column) { |
|
95 | 95 | $class = get_class($this->getControlColumn()); |
96 | 96 | |
97 | - return ! ($column instanceof $class); |
|
97 | + return !($column instanceof $class); |
|
98 | 98 | }); |
99 | 99 | } |
100 | 100 | |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | */ |
117 | 117 | public function set($columns) |
118 | 118 | { |
119 | - if (! is_array($columns)) { |
|
119 | + if (!is_array($columns)) { |
|
120 | 120 | $columns = func_get_args(); |
121 | 121 | } |
122 | 122 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | public function initialize() |
164 | 164 | { |
165 | - $this->all()->each(function (ColumnInterface $column) { |
|
165 | + $this->all()->each(function(ColumnInterface $column) { |
|
166 | 166 | $column->initialize(); |
167 | 167 | }); |
168 | 168 | |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | |
205 | 205 | $columns = $this->all(); |
206 | 206 | |
207 | - if (! is_int(key($orders))) { |
|
207 | + if (!is_int(key($orders))) { |
|
208 | 208 | $orders = [$orders]; |
209 | 209 | } |
210 | 210 | |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $columnIndex = array_get($order, 'column'); |
213 | 213 | $direction = array_get($order, 'dir', 'asc'); |
214 | 214 | |
215 | - if (! $columnIndex && $columnIndex !== '0') { |
|
215 | + if (!$columnIndex && $columnIndex !== '0') { |
|
216 | 216 | continue; |
217 | 217 | } |
218 | 218 |