@@ -31,7 +31,7 @@ |
||
| 31 | 31 | |
| 32 | 32 | if (Request::input($this->getPath().'_remove')) { |
| 33 | 33 | $this->setValue($this->getModel(), $this->getAttribute(), null); |
| 34 | - } elseif (! is_null($value)) { |
|
| 34 | + } elseif (!is_null($value)) { |
|
| 35 | 35 | $this->setValue($this->getModel(), $this->getAttribute(), $value); |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | 'select' => \SleepingOwl\Admin\Display\Column\Filter\Select::class, |
| 28 | 28 | ]); |
| 29 | 29 | |
| 30 | - $this->app->singleton('sleeping_owl.column_filter', function () use ($alias) { |
|
| 30 | + $this->app->singleton('sleeping_owl.column_filter', function() use ($alias) { |
|
| 31 | 31 | return $alias; |
| 32 | 32 | }); |
| 33 | 33 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | 'tree' => \SleepingOwl\Admin\Display\DisplayTree::class, |
| 44 | 44 | ]); |
| 45 | 45 | |
| 46 | - $this->app->singleton('sleeping_owl.display', function () use ($alias) { |
|
| 46 | + $this->app->singleton('sleeping_owl.display', function() use ($alias) { |
|
| 47 | 47 | return $alias; |
| 48 | 48 | }); |
| 49 | 49 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | 'treeControl' => \SleepingOwl\Admin\Display\Column\TreeControl::class, |
| 69 | 69 | ]); |
| 70 | 70 | |
| 71 | - $this->app->singleton('sleeping_owl.table.column', function () use ($alias) { |
|
| 71 | + $this->app->singleton('sleeping_owl.table.column', function() use ($alias) { |
|
| 72 | 72 | return $alias; |
| 73 | 73 | }); |
| 74 | 74 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | 'checkbox' => \SleepingOwl\Admin\Display\Column\Editable\Checkbox::class, |
| 80 | 80 | ]); |
| 81 | 81 | |
| 82 | - $this->app->singleton('sleeping_owl.table.column.editable', function () use ($alias) { |
|
| 82 | + $this->app->singleton('sleeping_owl.table.column.editable', function() use ($alias) { |
|
| 83 | 83 | return $alias; |
| 84 | 84 | }); |
| 85 | 85 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | 'html' => \SleepingOwl\Admin\Form\Element\Html::class, |
| 112 | 112 | ]); |
| 113 | 113 | |
| 114 | - $this->app->singleton('sleeping_owl.form.element', function () use ($alias) { |
|
| 114 | + $this->app->singleton('sleeping_owl.form.element', function() use ($alias) { |
|
| 115 | 115 | return $alias; |
| 116 | 116 | }); |
| 117 | 117 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | 'panel' => \SleepingOwl\Admin\Form\FormPanel::class, |
| 125 | 125 | ]); |
| 126 | 126 | |
| 127 | - $this->app->singleton('sleeping_owl.form', function () use ($alias) { |
|
| 127 | + $this->app->singleton('sleeping_owl.form', function() use ($alias) { |
|
| 128 | 128 | return $alias; |
| 129 | 129 | }); |
| 130 | 130 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | 'related' => \SleepingOwl\Admin\Display\Filter\FilterRelated::class, |
| 139 | 139 | ]); |
| 140 | 140 | |
| 141 | - $this->app->singleton('sleeping_owl.display.filter', function () use ($alias) { |
|
| 141 | + $this->app->singleton('sleeping_owl.display.filter', function() use ($alias) { |
|
| 142 | 142 | return $alias; |
| 143 | 143 | }); |
| 144 | 144 | } |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | /** |
| 72 | 72 | * Get column value from instance. |
| 73 | 73 | * |
| 74 | - * @param Collection|Model|Closure $instance |
|
| 74 | + * @param Model $instance |
|
| 75 | 75 | * @param string $name |
| 76 | 76 | * |
| 77 | 77 | * @return mixed |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function setOrderable($orderable = true) |
| 75 | 75 | { |
| 76 | - if ($orderable !== false && ! $orderable instanceof OrderByClauseInterface) { |
|
| 77 | - if (! is_string($orderable) && ! $orderable instanceof Closure) { |
|
| 76 | + if ($orderable !== false && !$orderable instanceof OrderByClauseInterface) { |
|
| 77 | + if (!is_string($orderable) && !$orderable instanceof Closure) { |
|
| 78 | 78 | $orderable = $this->getName(); |
| 79 | 79 | } |
| 80 | 80 | |
@@ -118,11 +118,11 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | if ($instance instanceof Collection) { |
| 120 | 120 | $instance = $instance->pluck($part); |
| 121 | - } elseif (! is_null($instance)) { |
|
| 121 | + } elseif (!is_null($instance)) { |
|
| 122 | 122 | $instance = $instance->getAttribute($part); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - if (! empty($parts) && ! is_null($instance)) { |
|
| 125 | + if (!empty($parts) && !is_null($instance)) { |
|
| 126 | 126 | return $this->getValueFromObject($instance, implode('.', $parts)); |
| 127 | 127 | } |
| 128 | 128 | |
@@ -308,7 +308,7 @@ |
||
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | /** |
| 311 | - * @return \Illuminate\Foundation\Application|mixed |
|
| 311 | + * @return RepositoryInterface |
|
| 312 | 312 | * @throws \Exception |
| 313 | 313 | */ |
| 314 | 314 | protected function makeRepository() |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $this->repository = $this->makeRepository(); |
| 168 | 168 | $this->repository->with($this->with); |
| 169 | 169 | |
| 170 | - $this->extensions->each(function (DisplayExtensionInterface $extension) { |
|
| 170 | + $this->extensions->each(function(DisplayExtensionInterface $extension) { |
|
| 171 | 171 | if ($extension instanceof Initializable) { |
| 172 | 172 | $extension->initialize(); |
| 173 | 173 | } |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | $this->title, |
| 202 | 202 | ]; |
| 203 | 203 | |
| 204 | - $this->getExtensions()->each(function (DisplayExtensionInterface $extension) use (&$titles) { |
|
| 204 | + $this->getExtensions()->each(function(DisplayExtensionInterface $extension) use (&$titles) { |
|
| 205 | 205 | if (method_exists($extension, $method = 'getTitle')) { |
| 206 | 206 | $titles[] = call_user_func([$extension, $method]); |
| 207 | 207 | } |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | $blocks = []; |
| 269 | 269 | |
| 270 | - $placableExtensions = $this->getExtensions()->filter(function ($extension) { |
|
| 270 | + $placableExtensions = $this->getExtensions()->filter(function($extension) { |
|
| 271 | 271 | return $extension instanceof Placable; |
| 272 | 272 | }); |
| 273 | 273 | |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | |
| 281 | 281 | foreach ($blocks as $block => $data) { |
| 282 | 282 | foreach ($data as $html) { |
| 283 | - if (! empty($html)) { |
|
| 283 | + if (!empty($html)) { |
|
| 284 | 284 | $view->getFactory()->startSection($block); |
| 285 | 285 | echo $html; |
| 286 | 286 | $view->getFactory()->yieldSection(); |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | { |
| 339 | 339 | $repository = app($this->repositoryClass, [$this->modelClass]); |
| 340 | 340 | |
| 341 | - if (! ($repository instanceof RepositoryInterface)) { |
|
| 341 | + if (!($repository instanceof RepositoryInterface)) { |
|
| 342 | 342 | throw new \Exception('Repository class must be instanced of [RepositoryInterface]'); |
| 343 | 343 | } |
| 344 | 344 | |
@@ -145,7 +145,7 @@ |
||
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | /** |
| 148 | - * @param string|\Illuminate\View\View $view |
|
| 148 | + * @param string $view |
|
| 149 | 149 | * |
| 150 | 150 | * @return $this |
| 151 | 151 | */ |
@@ -88,10 +88,10 @@ discard block |
||
| 88 | 88 | $this->controlActive = false; |
| 89 | 89 | |
| 90 | 90 | if ($this->isInitialize()) { |
| 91 | - $this->columns = $this->columns->filter(function ($column) { |
|
| 91 | + $this->columns = $this->columns->filter(function($column) { |
|
| 92 | 92 | $class = get_class($this->getControlColumn()); |
| 93 | 93 | |
| 94 | - return ! ($column instanceof $class); |
|
| 94 | + return !($column instanceof $class); |
|
| 95 | 95 | }); |
| 96 | 96 | } |
| 97 | 97 | |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | */ |
| 114 | 114 | public function set($columns) |
| 115 | 115 | { |
| 116 | - if (! is_array($columns)) { |
|
| 116 | + if (!is_array($columns)) { |
|
| 117 | 117 | $columns = func_get_args(); |
| 118 | 118 | } |
| 119 | 119 | |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | |
| 180 | 180 | public function initialize() |
| 181 | 181 | { |
| 182 | - $this->all()->each(function (ColumnInterface $column) { |
|
| 182 | + $this->all()->each(function(ColumnInterface $column) { |
|
| 183 | 183 | $column->initialize(); |
| 184 | 184 | }); |
| 185 | 185 | |
@@ -83,7 +83,7 @@ |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
| 86 | - * @return Closure |
|
| 86 | + * @return \Closure |
|
| 87 | 87 | */ |
| 88 | 88 | public function getAccessLogic() |
| 89 | 89 | { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | public function getModelConfiguration() |
| 33 | 33 | { |
| 34 | - if (! $this->hasModel()) { |
|
| 34 | + if (!$this->hasModel()) { |
|
| 35 | 35 | return; |
| 36 | 36 | } |
| 37 | 37 | |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function hasModel() |
| 45 | 45 | { |
| 46 | - return ! is_null($this->model) and class_exists($this->model); |
|
| 46 | + return !is_null($this->model) and class_exists($this->model); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | */ |
| 88 | 88 | public function getAccessLogic() |
| 89 | 89 | { |
| 90 | - if (! is_callable($this->accessLogic)) { |
|
| 90 | + if (!is_callable($this->accessLogic)) { |
|
| 91 | 91 | if ($this->hasModel()) { |
| 92 | - return function () { |
|
| 92 | + return function() { |
|
| 93 | 93 | return $this->getModelConfiguration()->isDisplayable(); |
| 94 | 94 | }; |
| 95 | 95 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | { |
| 108 | 108 | $data = $this->toArray(); |
| 109 | 109 | |
| 110 | - if (! is_null($view)) { |
|
| 110 | + if (!is_null($view)) { |
|
| 111 | 111 | return view($view, $data)->render(); |
| 112 | 112 | } |
| 113 | 113 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | * |
| 204 | 204 | * @param $id |
| 205 | 205 | * @param $parentId |
| 206 | - * @param $left |
|
| 206 | + * @param integer $left |
|
| 207 | 207 | * @param $right |
| 208 | 208 | */ |
| 209 | 209 | protected function move($id, $parentId, $left, $right) |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | * Call several methods and get first result. |
| 301 | 301 | * |
| 302 | 302 | * @param $instance |
| 303 | - * @param $methods |
|
| 303 | + * @param string[] $methods |
|
| 304 | 304 | * |
| 305 | 305 | * @return mixed |
| 306 | 306 | * @throws Exception |
@@ -320,9 +320,9 @@ discard block |
||
| 320 | 320 | * |
| 321 | 321 | * @param $root |
| 322 | 322 | * @param $parentId |
| 323 | - * @param $left |
|
| 323 | + * @param integer $left |
|
| 324 | 324 | * |
| 325 | - * @return mixed |
|
| 325 | + * @return integer |
|
| 326 | 326 | */ |
| 327 | 327 | protected function recursiveReorder($root, $parentId, $left) |
| 328 | 328 | { |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | * Recursive reoder simple tree type. |
| 342 | 342 | * |
| 343 | 343 | * @param $data |
| 344 | - * @param $parentId |
|
| 344 | + * @param string|null $parentId |
|
| 345 | 345 | */ |
| 346 | 346 | protected function recursiveReorderSimple(array $data, $parentId) |
| 347 | 347 | { |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | * Get children for simple tree type structure. |
| 364 | 364 | * |
| 365 | 365 | * @param $collection |
| 366 | - * @param $id |
|
| 366 | + * @param string|null $id |
|
| 367 | 367 | * |
| 368 | 368 | * @return Collection |
| 369 | 369 | */ |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | |
| 386 | 386 | /** |
| 387 | 387 | * Create simple tree type structure. |
| 388 | - * @return static |
|
| 388 | + * @return Collection |
|
| 389 | 389 | */ |
| 390 | 390 | protected function createSimpleTree() |
| 391 | 391 | { |
@@ -214,7 +214,7 @@ |
||
| 214 | 214 | /** |
| 215 | 215 | * @param $object |
| 216 | 216 | * |
| 217 | - * @return mixed |
|
| 217 | + * @return Model |
|
| 218 | 218 | */ |
| 219 | 219 | protected function getElementContainer($object) |
| 220 | 220 | { |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public function initializeElements() |
| 25 | 25 | { |
| 26 | - $this->getElements()->each(function ($element) { |
|
| 26 | + $this->getElements()->each(function($element) { |
|
| 27 | 27 | if ($element instanceof Initializable) { |
| 28 | 28 | $element->initialize(); |
| 29 | 29 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | foreach ($this->getElements() as $element) { |
| 43 | 43 | if ($element instanceof ElementsInterface) { |
| 44 | - if (! is_null($found = $element->getElement($path))) { |
|
| 44 | + if (!is_null($found = $element->getElement($path))) { |
|
| 45 | 45 | return $found; |
| 46 | 46 | } |
| 47 | 47 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | protected function setModelForElements(Model $model) |
| 137 | 137 | { |
| 138 | - $this->getElements()->each(function ($element) use ($model) { |
|
| 138 | + $this->getElements()->each(function($element) use ($model) { |
|
| 139 | 139 | $element = $this->getElementContainer($element); |
| 140 | 140 | |
| 141 | 141 | if ($element instanceof WithModel) { |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | protected function getValidationRulesFromElements(array $rules = []) |
| 155 | 155 | { |
| 156 | - $this->getElements()->onlyActive()->each(function ($element) use (&$rules) { |
|
| 156 | + $this->getElements()->onlyActive()->each(function($element) use (&$rules) { |
|
| 157 | 157 | $element = $this->getElementContainer($element); |
| 158 | 158 | |
| 159 | 159 | if ($element instanceof Validable) { |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | */ |
| 172 | 172 | protected function getValidationMessagesForElements(array $messages = []) |
| 173 | 173 | { |
| 174 | - $this->getElements()->onlyActive()->each(function ($element) use (&$messages) { |
|
| 174 | + $this->getElements()->onlyActive()->each(function($element) use (&$messages) { |
|
| 175 | 175 | $element = $this->getElementContainer($element); |
| 176 | 176 | |
| 177 | 177 | if ($element instanceof Validable) { |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | */ |
| 190 | 190 | protected function getValidationLabelsForElements(array $labels = []) |
| 191 | 191 | { |
| 192 | - $this->getElements()->onlyActive()->each(function ($element) use (&$labels) { |
|
| 192 | + $this->getElements()->onlyActive()->each(function($element) use (&$labels) { |
|
| 193 | 193 | $element = $this->getElementContainer($element); |
| 194 | 194 | |
| 195 | 195 | if ($element instanceof Validable) { |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | |
| 203 | 203 | protected function saveElements() |
| 204 | 204 | { |
| 205 | - $this->getElements()->onlyActive()->each(function ($element) { |
|
| 205 | + $this->getElements()->onlyActive()->each(function($element) { |
|
| 206 | 206 | $element = $this->getElementContainer($element); |
| 207 | 207 | |
| 208 | 208 | if ($element instanceof FormElementInterface) { |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | |
| 214 | 214 | protected function afterSaveElements() |
| 215 | 215 | { |
| 216 | - $this->getElements()->onlyActive()->each(function ($element) { |
|
| 216 | + $this->getElements()->onlyActive()->each(function($element) { |
|
| 217 | 217 | $element = $this->getElementContainer($element); |
| 218 | 218 | |
| 219 | 219 | if ($element instanceof FormElementInterface) { |
@@ -38,8 +38,8 @@ |
||
| 38 | 38 | $relationName = implode('.', $parts); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - if (! is_null($relationName)) { |
|
| 42 | - $query->whereHas($relationName, function ($q) use ($name, $value) { |
|
| 41 | + if (!is_null($relationName)) { |
|
| 42 | + $query->whereHas($relationName, function($q) use ($name, $value) { |
|
| 43 | 43 | $this->buildQuery($q, $name, $value); |
| 44 | 44 | }); |
| 45 | 45 | } else { |