@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | - $activeTabs = $this->getTabs()->filter(function (TabInterface $tab) { |
|
70 | + $activeTabs = $this->getTabs()->filter(function(TabInterface $tab) { |
|
71 | 71 | return $tab->isActive(); |
72 | 72 | })->count(); |
73 | 73 | |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | */ |
96 | 96 | public function setModelClass($class) |
97 | 97 | { |
98 | - $this->getTabs()->each(function (TabInterface $tab) use ($class) { |
|
98 | + $this->getTabs()->each(function(TabInterface $tab) use ($class) { |
|
99 | 99 | if ($tab instanceof DisplayInterface) { |
100 | 100 | $tab->setModelClass($class); |
101 | 101 | } |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | */ |
180 | 180 | public function setAction($action) |
181 | 181 | { |
182 | - $this->getTabs()->each(function (TabInterface $tab) use ($action) { |
|
182 | + $this->getTabs()->each(function(TabInterface $tab) use ($action) { |
|
183 | 183 | if ($tab instanceof FormInterface) { |
184 | 184 | $tab->setAction($action); |
185 | 185 | } |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | */ |
196 | 196 | public function setId($id) |
197 | 197 | { |
198 | - $this->getTabs()->each(function (TabInterface $tab) use ($id) { |
|
198 | + $this->getTabs()->each(function(TabInterface $tab) use ($id) { |
|
199 | 199 | if ($tab instanceof FormInterface) { |
200 | 200 | $tab->setId($id); |
201 | 201 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | */ |
213 | 213 | public function validateForm(\Illuminate\Http\Request $request, ModelConfigurationInterface $model = null) |
214 | 214 | { |
215 | - $this->getTabs()->each(function ($tab) use ($request, $model) { |
|
215 | + $this->getTabs()->each(function($tab) use ($request, $model) { |
|
216 | 216 | $tabId = $request->get('sleeping_owl_tab_id'); |
217 | 217 | |
218 | 218 | if ($tab instanceof FormInterface && $tab->getName() == $tabId) { |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | */ |
230 | 230 | public function saveForm(\Illuminate\Http\Request $request, ModelConfigurationInterface $model = null) |
231 | 231 | { |
232 | - $this->getTabs()->each(function (TabInterface $tab) use ($request, $model) { |
|
232 | + $this->getTabs()->each(function(TabInterface $tab) use ($request, $model) { |
|
233 | 233 | $tabId = $request->get('sleeping_owl_tab_id'); |
234 | 234 | |
235 | 235 | if ($tab instanceof FormInterface && $tab->getName() == $tabId) { |
@@ -40,9 +40,8 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
43 | - * @param bool $sortable |
|
44 | 43 | * |
45 | - * @return $this |
|
44 | + * @return string |
|
46 | 45 | */ |
47 | 46 | public function getTitle() |
48 | 47 | { |
@@ -54,7 +53,6 @@ discard block |
||
54 | 53 | } |
55 | 54 | |
56 | 55 | /** |
57 | - * @param bool $sortable |
|
58 | 56 | * |
59 | 57 | * @return $this |
60 | 58 | */ |
@@ -79,7 +77,7 @@ discard block |
||
79 | 77 | |
80 | 78 | /** |
81 | 79 | * @param $url |
82 | - * @return string |
|
80 | + * @return EditableColumn |
|
83 | 81 | */ |
84 | 82 | public function setUrl($url) |
85 | 83 | { |
@@ -98,7 +96,7 @@ discard block |
||
98 | 96 | |
99 | 97 | /** |
100 | 98 | * @param $url |
101 | - * @return string |
|
99 | + * @return EditableColumn |
|
102 | 100 | */ |
103 | 101 | public function setEditableMode($mode) |
104 | 102 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace SleepingOwl\Admin\Display\Column\Editable; |
4 | 4 | |
5 | -use Illuminate\Http\Request; |
|
6 | 5 | use SleepingOwl\Admin\Display\Column\NamedColumn; |
7 | 6 | |
8 | 7 | class EditableColumn extends NamedColumn |
@@ -70,7 +70,7 @@ |
||
70 | 70 | */ |
71 | 71 | public function getUrl() |
72 | 72 | { |
73 | - if (! $this->url) { |
|
73 | + if (!$this->url) { |
|
74 | 74 | return request()->url(); |
75 | 75 | } |
76 | 76 |
@@ -99,7 +99,7 @@ |
||
99 | 99 | /** |
100 | 100 | * Get column value from instance. |
101 | 101 | * |
102 | - * @param Collection|Model|Closure $instance |
|
102 | + * @param Model $instance |
|
103 | 103 | * @param string $name |
104 | 104 | * |
105 | 105 | * @return mixed |
@@ -75,8 +75,8 @@ discard block |
||
75 | 75 | */ |
76 | 76 | public function setOrderable($orderable = true) |
77 | 77 | { |
78 | - if ($orderable !== false && ! $orderable instanceof OrderByClauseInterface) { |
|
79 | - if (! is_string($orderable) && ! $orderable instanceof Closure) { |
|
78 | + if ($orderable !== false && !$orderable instanceof OrderByClauseInterface) { |
|
79 | + if (!is_string($orderable) && !$orderable instanceof Closure) { |
|
80 | 80 | $orderable = $this->getName(); |
81 | 81 | } |
82 | 82 | } |
@@ -144,11 +144,11 @@ discard block |
||
144 | 144 | if ($instance === null) { |
145 | 145 | $instance = collect(); |
146 | 146 | } |
147 | - } elseif (! is_null($instance)) { |
|
147 | + } elseif (!is_null($instance)) { |
|
148 | 148 | $instance = $instance->getAttribute($part); |
149 | 149 | } |
150 | 150 | |
151 | - if (! empty($parts) && ! is_null($instance)) { |
|
151 | + if (!empty($parts) && !is_null($instance)) { |
|
152 | 152 | return $this->getValueFromObject($instance, implode('.', $parts)); |
153 | 153 | } |
154 | 154 |
@@ -192,7 +192,7 @@ |
||
192 | 192 | * @deprecated 4.5.0 |
193 | 193 | * @see getElements() |
194 | 194 | * |
195 | - * @return Collection[] |
|
195 | + * @return FormElementsCollection |
|
196 | 196 | */ |
197 | 197 | public function getItems() |
198 | 198 | { |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | |
101 | 101 | parent::initialize(); |
102 | 102 | |
103 | - if (! $this->hasHtmlAttribute('enctype')) { |
|
103 | + if (!$this->hasHtmlAttribute('enctype')) { |
|
104 | 104 | // Try to find upload element |
105 | - $this->getElements()->each(function ($element) { |
|
105 | + $this->getElements()->each(function($element) { |
|
106 | 106 | // Try to get nested - will be implemented |
107 | - if ($element instanceof Upload && ! $this->hasHtmlAttribute('enctype')) { |
|
107 | + if ($element instanceof Upload && !$this->hasHtmlAttribute('enctype')) { |
|
108 | 108 | $this->setHtmlAttribute('enctype', 'multipart/form-data'); |
109 | 109 | } |
110 | 110 | }); |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | */ |
210 | 210 | public function setItems($items) |
211 | 211 | { |
212 | - if (! is_array($items)) { |
|
212 | + if (!is_array($items)) { |
|
213 | 213 | $items = func_get_args(); |
214 | 214 | } |
215 | 215 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | */ |
237 | 237 | public function setId($id) |
238 | 238 | { |
239 | - if (is_null($this->id) && ! is_null($id) && ($model = $this->getRepository()->find($id))) { |
|
239 | + if (is_null($this->id) && !is_null($id) && ($model = $this->getRepository()->find($id))) { |
|
240 | 240 | $this->id = $id; |
241 | 241 | |
242 | 242 | parent::setModel($model); |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | */ |
298 | 298 | public function saveForm(\Illuminate\Http\Request $request, ModelConfigurationInterface $modelConfiguration = null) |
299 | 299 | { |
300 | - if (! $this->validModelConfiguration($modelConfiguration)) { |
|
300 | + if (!$this->validModelConfiguration($modelConfiguration)) { |
|
301 | 301 | return false; |
302 | 302 | } |
303 | 303 | |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | protected function saveBelongsToRelations(Model $model) |
338 | 338 | { |
339 | 339 | foreach ($model->getRelations() as $name => $relation) { |
340 | - if ($model->{$name}() instanceof BelongsTo && ! is_null($relation)) { |
|
340 | + if ($model->{$name}() instanceof BelongsTo && !is_null($relation)) { |
|
341 | 341 | $relation->save(); |
342 | 342 | $model->{$name}()->associate($relation); |
343 | 343 | } |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | protected function saveHasOneRelations(Model $model) |
353 | 353 | { |
354 | 354 | foreach ($model->getRelations() as $name => $relation) { |
355 | - if ($model->{$name}() instanceof HasOneOrMany && ! is_null($relation)) { |
|
355 | + if ($model->{$name}() instanceof HasOneOrMany && !is_null($relation)) { |
|
356 | 356 | if (is_array($relation) || $relation instanceof \Traversable) { |
357 | 357 | $model->{$name}()->saveMany($relation); |
358 | 358 | } else { |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | */ |
371 | 371 | public function validateForm(\Illuminate\Http\Request $request, ModelConfigurationInterface $modelConfiguration = null) |
372 | 372 | { |
373 | - if (! $this->validModelConfiguration($modelConfiguration)) { |
|
373 | + if (!$this->validModelConfiguration($modelConfiguration)) { |
|
374 | 374 | return; |
375 | 375 | } |
376 | 376 |
@@ -13,7 +13,7 @@ |
||
13 | 13 | { |
14 | 14 | /** |
15 | 15 | * @param ModelConfigurationInterface $model |
16 | - * @param null $id |
|
16 | + * @param integer|null $id |
|
17 | 17 | * @return JsonResponse|mixed |
18 | 18 | */ |
19 | 19 | public function getModelLogic(ModelConfigurationInterface $model, $id = null) |
@@ -18,9 +18,9 @@ discard block |
||
18 | 18 | */ |
19 | 19 | public function getModelLogic(ModelConfigurationInterface $model, $id = null) |
20 | 20 | { |
21 | - if (! is_null($id)) { |
|
21 | + if (!is_null($id)) { |
|
22 | 22 | $item = $model->getRepository()->find($id); |
23 | - if (is_null($item) || ! $model->isEditable($item)) { |
|
23 | + if (is_null($item) || !$model->isEditable($item)) { |
|
24 | 24 | return new JsonResponse([ |
25 | 25 | 'message' => trans('lang.message.access_denied'), |
26 | 26 | ], 403); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | return $model->fireEdit($id); |
30 | 30 | } |
31 | 31 | |
32 | - if (! $model->isCreatable()) { |
|
32 | + if (!$model->isCreatable()) { |
|
33 | 33 | return new JsonResponse([ |
34 | 34 | 'message' => trans('lang.message.access_denied'), |
35 | 35 | ], 403); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | return new JsonResponse([ |
77 | - 'output' => collect($options)->map(function ($value, $key) { |
|
77 | + 'output' => collect($options)->map(function($value, $key) { |
|
78 | 78 | return ['id' => $key, 'name' => $value]; |
79 | 79 | }), |
80 | 80 | 'selected' => $element->getValueFromModel(), |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | return new JsonResponse( |
127 | 127 | $model::where($request->search, 'like', "%{$request->q}%") |
128 | 128 | ->get() |
129 | - ->map(function (Model $item) use ($field) { |
|
129 | + ->map(function(Model $item) use ($field) { |
|
130 | 130 | return [ |
131 | 131 | 'tag_name' => $item->{$field}, |
132 | 132 | 'id' => $item->id, |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Overload current page. |
17 | - * @return \KodiComponents\Navigation\Contracts\PageInterface|null |
|
17 | + * @return PageInterface |
|
18 | 18 | */ |
19 | 19 | public function getCurrentPage() |
20 | 20 | { |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | /** |
52 | 52 | * @param Collection $pages |
53 | - * @param $url |
|
53 | + * @param string $url |
|
54 | 54 | */ |
55 | 55 | protected function findPageByAliasId(Collection $pages, $url) |
56 | 56 | { |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function setAliasesId(Collection $pages) |
32 | 32 | { |
33 | - $pages->each(function (PageInterface $page) { |
|
33 | + $pages->each(function(PageInterface $page) { |
|
34 | 34 | $page->setAliasId(); |
35 | 35 | |
36 | 36 | if ($page->getPages()->count()) { |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | protected function findPageByAliasId(Collection $pages, $url) |
56 | 56 | { |
57 | - $pages->each(function (PageInterface $page) use ($url) { |
|
57 | + $pages->each(function(PageInterface $page) use ($url) { |
|
58 | 58 | $urlPath = parse_url($url, PHP_URL_PATH); |
59 | 59 | |
60 | 60 | if (Route::current()) { |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | protected function findActivePage() |
88 | 88 | { |
89 | - if (! is_null($this->currentPage)) { |
|
89 | + if (!is_null($this->currentPage)) { |
|
90 | 90 | return true; |
91 | 91 | } |
92 | 92 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | $this->findActive($url, $foundPages); |
98 | 98 | |
99 | - if (! is_null($this->currentPage)) { |
|
99 | + if (!is_null($this->currentPage)) { |
|
100 | 100 | $this->currentPage->setActive(); |
101 | 101 | } |
102 | 102 |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function getModelConfiguration() |
59 | 59 | { |
60 | - if (! $this->hasModel()) { |
|
60 | + if (!$this->hasModel()) { |
|
61 | 61 | return; |
62 | 62 | } |
63 | 63 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function hasModel() |
71 | 71 | { |
72 | - return ! is_null($this->model) && class_exists($this->model); |
|
72 | + return !is_null($this->model) && class_exists($this->model); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -113,9 +113,9 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function getAccessLogic() |
115 | 115 | { |
116 | - if (! is_callable($this->accessLogic)) { |
|
116 | + if (!is_callable($this->accessLogic)) { |
|
117 | 117 | if ($this->hasModel()) { |
118 | - return function () { |
|
118 | + return function() { |
|
119 | 119 | return $this->getModelConfiguration()->isDisplayable(); |
120 | 120 | }; |
121 | 121 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | { |
134 | 134 | $data = $this->toArray(); |
135 | 135 | |
136 | - if (! is_null($view)) { |
|
136 | + if (!is_null($view)) { |
|
137 | 137 | return view($view, $data)->render(); |
138 | 138 | } |
139 | 139 |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | */ |
60 | 60 | protected function registerModelBindings(Collection $aliases) |
61 | 61 | { |
62 | - $this->router->bind('adminModel', function ($model, Route $route) use ($aliases) { |
|
62 | + $this->router->bind('adminModel', function($model, Route $route) use ($aliases) { |
|
63 | 63 | if (is_null($model = $aliases->get($model))) { |
64 | 64 | throw new ModelNotFoundException(); |
65 | 65 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | protected function runCustomController(Route $route, $controller, $action) |
87 | 87 | { |
88 | - $route->uses(function () use ($route, $controller, $action) { |
|
88 | + $route->uses(function() use ($route, $controller, $action) { |
|
89 | 89 | return (new ControllerDispatcher($this->app))->dispatch( |
90 | 90 | $route, $this->app->make($controller), $action |
91 | 91 | ); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $modelForOptions = app($modelForOptions); |
65 | 65 | } |
66 | 66 | |
67 | - if (! ($modelForOptions instanceof Model)) { |
|
67 | + if (!($modelForOptions instanceof Model)) { |
|
68 | 68 | throw new SelectException('Class must be instanced of Illuminate\Database\Eloquent\Model'); |
69 | 69 | } |
70 | 70 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public function setFetchColumns($columns) |
123 | 123 | { |
124 | - if (! is_array($columns)) { |
|
124 | + if (!is_array($columns)) { |
|
125 | 125 | $columns = func_get_args(); |
126 | 126 | } |
127 | 127 | |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | |
217 | 217 | $options = $repository->getQuery(); |
218 | 218 | |
219 | - if ($this->isEmptyRelation() && ! is_null($foreignKey = $this->getForeignKey())) { |
|
219 | + if ($this->isEmptyRelation() && !is_null($foreignKey = $this->getForeignKey())) { |
|
220 | 220 | $relation = $this->getModelAttributeKey(); |
221 | 221 | $model = $this->getModel(); |
222 | 222 | |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | } |
233 | 233 | |
234 | 234 | // call the pre load options query preparer if has be set |
235 | - if (! is_null($preparer = $this->getLoadOptionsQueryPreparer())) { |
|
235 | + if (!is_null($preparer = $this->getLoadOptionsQueryPreparer())) { |
|
236 | 236 | $options = $preparer($this, $options); |
237 | 237 | } |
238 | 238 | |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | |
247 | 247 | // iterate for all options and redefine it as |
248 | 248 | // list of KEY and TEXT pair |
249 | - $options = array_map(function ($opt) use ($key, $makeDisplay) { |
|
249 | + $options = array_map(function($opt) use ($key, $makeDisplay) { |
|
250 | 250 | // get the KEY and make the display text |
251 | 251 | return [data_get($opt, $key), $makeDisplay($opt)]; |
252 | 252 | }, $options); |