@@ -65,7 +65,7 @@ |
||
65 | 65 | } |
66 | 66 | |
67 | 67 | /** |
68 | - * @return TabInterface[]|DisplayTabsCollection |
|
68 | + * @return \SleepingOwl\Admin\Form\FormElementsCollection |
|
69 | 69 | */ |
70 | 70 | public function getTabs() |
71 | 71 | { |
@@ -86,7 +86,7 @@ |
||
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
89 | - * @return $this|Custom|mixed |
|
89 | + * @return string |
|
90 | 90 | */ |
91 | 91 | public function render() |
92 | 92 | { |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | * @deprecated 4.5.0 |
214 | 214 | * @see getElements() |
215 | 215 | * |
216 | - * @return Collection[] |
|
216 | + * @return FormElementsCollection |
|
217 | 217 | */ |
218 | 218 | public function getItems() |
219 | 219 | { |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | * |
302 | 302 | * @param ModelConfigurationInterface $modelConfiguration |
303 | 303 | * |
304 | - * @return bool |
|
304 | + * @return null|boolean |
|
305 | 305 | */ |
306 | 306 | public function saveForm(ModelConfigurationInterface $modelConfiguration) |
307 | 307 | { |
@@ -9,7 +9,7 @@ |
||
9 | 9 | * @param string $path |
10 | 10 | * @param string|null $label |
11 | 11 | * |
12 | - * @return NamedFormElement |
|
12 | + * @return PHPUnit_Framework_MockObject_MockObject |
|
13 | 13 | */ |
14 | 14 | protected function getElement($path = 'path', $label = null) |
15 | 15 | { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $element = $this->getElement('key'); |
98 | 98 | |
99 | 99 | $element->required(); |
100 | - $this->assertEquals(['key' => ['required']], $element->getValidationRules()); |
|
100 | + $this->assertEquals([ 'key' => [ 'required' ] ], $element->getValidationRules()); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | /** |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | |
111 | 111 | $element->required('required field'); |
112 | 112 | |
113 | - $this->assertEquals(['key.required' => 'required field'], $element->getValidationMessages()); |
|
113 | + $this->assertEquals([ 'key.required' => 'required field' ], $element->getValidationMessages()); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | /** |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | $model->shouldReceive('getTable')->once()->andReturn('test_table'); |
128 | 128 | |
129 | 129 | $element->unique(); |
130 | - $this->assertEquals(['key' => ['unique:test_table,key']], $element->getValidationRules()); |
|
130 | + $this->assertEquals([ 'key' => [ 'unique:test_table,key' ] ], $element->getValidationRules()); |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | /** |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $element = $this->getElement('key'); |
140 | 140 | |
141 | 141 | $element->unique('must be unique'); |
142 | - $this->assertEquals(['key.unique' => 'must be unique'], $element->getValidationMessages()); |
|
142 | + $this->assertEquals([ 'key.unique' => 'must be unique' ], $element->getValidationMessages()); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | $element->addValidationMessage('test', 'test message'); |
154 | 154 | $element->addValidationMessage('hello', 'hello message'); |
155 | - $this->assertEquals(['key.test' => 'test message', 'key.hello' => 'hello message'], $element->getValidationMessages()); |
|
155 | + $this->assertEquals([ 'key.test' => 'test message', 'key.hello' => 'hello message' ], $element->getValidationMessages()); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | /** |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | { |
163 | 163 | $element = $this->getElement('key.subkey', 'Label'); |
164 | 164 | |
165 | - $this->assertEquals(['key.subkey' => 'Label'], $element->getValidationLabels()); |
|
165 | + $this->assertEquals([ 'key.subkey' => 'Label' ], $element->getValidationLabels()); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | /** |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | */ |
171 | 171 | public function test_gets_session_value_from_request() |
172 | 172 | { |
173 | - $request = $this->app['request']; |
|
173 | + $request = $this->app[ 'request' ]; |
|
174 | 174 | $session = $request->getSession(); |
175 | 175 | |
176 | 176 | $element = $this->getElement('key.subkey', 'Label'); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | public function test_gets_value_from_request() |
186 | 186 | { |
187 | 187 | /** @var \Illuminate\Http\Request $request */ |
188 | - $request = $this->app['request']; |
|
188 | + $request = $this->app[ 'request' ]; |
|
189 | 189 | $request->offsetSet('key', [ |
190 | 190 | 'subkey1' => 'hello world', |
191 | 191 | ]); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | */ |
203 | 203 | public function test_gets_value_with_request() |
204 | 204 | { |
205 | - $request = $this->app['request']; |
|
205 | + $request = $this->app[ 'request' ]; |
|
206 | 206 | |
207 | 207 | $session = $request->getSession(); |
208 | 208 | $session->shouldReceive('getOldInput')->andReturn(null); |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | public function test_gets_value() |
222 | 222 | { |
223 | - $request = $this->app['request']; |
|
223 | + $request = $this->app[ 'request' ]; |
|
224 | 224 | $session = $request->getSession(); |
225 | 225 | $session->shouldReceive('getOldInput')->andReturn(null); |
226 | 226 | |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | { |
287 | 287 | $element = $this->getElement('key2.subkey', 'Label'); |
288 | 288 | |
289 | - $request = $this->app['request']; |
|
289 | + $request = $this->app[ 'request' ]; |
|
290 | 290 | $session = $request->getSession(); |
291 | 291 | $session->shouldReceive('getOldInput')->andReturn(null); |
292 | 292 |
@@ -6,7 +6,7 @@ |
||
6 | 6 | class FormElementTest extends TestCase |
7 | 7 | { |
8 | 8 | /** |
9 | - * @return FormElement |
|
9 | + * @return PHPUnit_Framework_MockObject_MockObject |
|
10 | 10 | */ |
11 | 11 | protected function getElement() |
12 | 12 | { |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | $rule = 'some_rule'; |
37 | 37 | $element->addValidationRule($rule); |
38 | - $this->assertEquals([$rule], $element->getValidationRules()); |
|
38 | + $this->assertEquals([ $rule ], $element->getValidationRules()); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | $message = 'my custom message' |
57 | 57 | ); |
58 | 58 | |
59 | - $this->assertEquals([$rule], $element->getValidationRules()); |
|
60 | - $this->assertEquals([$rule => $message], $element->getValidationMessages()); |
|
59 | + $this->assertEquals([ $rule ], $element->getValidationRules()); |
|
60 | + $this->assertEquals([ $rule => $message ], $element->getValidationMessages()); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $message1 = 'my custom message 1' |
80 | 80 | ); |
81 | 81 | |
82 | - $this->assertEquals(['min' => $message, $rule1 => $message1], $element->getValidationMessages()); |
|
82 | + $this->assertEquals([ 'min' => $message, $rule1 => $message1 ], $element->getValidationMessages()); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
@@ -96,13 +96,13 @@ discard block |
||
96 | 96 | 'max' => 'test', |
97 | 97 | ]); |
98 | 98 | |
99 | - $this->assertEquals(['min' => 'test', 'max' => 'test'], $element->getValidationMessages()); |
|
99 | + $this->assertEquals([ 'min' => 'test', 'max' => 'test' ], $element->getValidationMessages()); |
|
100 | 100 | |
101 | 101 | $element->setValidationMessages([ |
102 | 102 | 'max' => 'test', |
103 | 103 | ]); |
104 | 104 | |
105 | - $this->assertEquals(['max' => 'test'], $element->getValidationMessages()); |
|
105 | + $this->assertEquals([ 'max' => 'test' ], $element->getValidationMessages()); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | { |
185 | 185 | $array = $this->getElement()->toArray(); |
186 | 186 | $this->assertTrue(is_array($array)); |
187 | - $this->assertEquals(['value', 'readonly', 'model'], array_keys($array)); |
|
187 | + $this->assertEquals([ 'value', 'readonly', 'model' ], array_keys($array)); |
|
188 | 188 | } |
189 | 189 | |
190 | 190 | /** |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | |
234 | 234 | $element->setModel($model); |
235 | 235 | |
236 | - $element->setReadonly(function ($model) { |
|
236 | + $element->setReadonly(function($model) { |
|
237 | 237 | return $model->isAuthor(); |
238 | 238 | }); |
239 | 239 | |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | $model->shouldReceive('isAuthor')->andReturn(true)->once(); |
252 | 252 | $element->setModel($model); |
253 | 253 | |
254 | - $element->setVisibilityCondition(function ($model) { |
|
254 | + $element->setVisibilityCondition(function($model) { |
|
255 | 255 | return $model->isAuthor(); |
256 | 256 | }); |
257 | 257 |
@@ -30,12 +30,12 @@ discard block |
||
30 | 30 | /** |
31 | 31 | * @var array |
32 | 32 | */ |
33 | - protected $validationRules = []; |
|
33 | + protected $validationRules = [ ]; |
|
34 | 34 | |
35 | 35 | /** |
36 | 36 | * @var array |
37 | 37 | */ |
38 | - protected $validationMessages = []; |
|
38 | + protected $validationMessages = [ ]; |
|
39 | 39 | |
40 | 40 | /** |
41 | 41 | * @var bool |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $rule = substr($rule, 0, $pos); |
73 | 73 | } |
74 | 74 | |
75 | - $this->validationMessages[$rule] = $message; |
|
75 | + $this->validationMessages[ $rule ] = $message; |
|
76 | 76 | |
77 | 77 | return $this; |
78 | 78 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | */ |
95 | 95 | public function getValidationLabels() |
96 | 96 | { |
97 | - return []; |
|
97 | + return [ ]; |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function addValidationRule($rule, $message = null) |
115 | 115 | { |
116 | - $this->validationRules[] = $rule; |
|
116 | + $this->validationRules[ ] = $rule; |
|
117 | 117 | |
118 | 118 | if (is_null($message)) { |
119 | 119 | return $this; |
@@ -129,11 +129,11 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public function setValidationRules($validationRules) |
131 | 131 | { |
132 | - if (! is_array($validationRules)) { |
|
132 | + if (!is_array($validationRules)) { |
|
133 | 133 | $validationRules = func_get_args(); |
134 | 134 | } |
135 | 135 | |
136 | - $this->validationRules = []; |
|
136 | + $this->validationRules = [ ]; |
|
137 | 137 | foreach ($validationRules as $rule) { |
138 | 138 | $rules = explode('|', $rule); |
139 | 139 |
@@ -17,16 +17,16 @@ discard block |
||
17 | 17 | { |
18 | 18 | $routeName = 'admin.form.element.dependent-select'; |
19 | 19 | |
20 | - if (! $router->has($routeName)) { |
|
21 | - $router->post('{adminModel}/dependent-select/{field}/{id?}', ['as' => $routeName, function ( |
|
20 | + if (!$router->has($routeName)) { |
|
21 | + $router->post('{adminModel}/dependent-select/{field}/{id?}', [ 'as' => $routeName, function( |
|
22 | 22 | Request $request, |
23 | 23 | ModelConfigurationInterface $model, |
24 | 24 | $field, |
25 | 25 | $id = null |
26 | 26 | ) { |
27 | - if (! is_null($id)) { |
|
27 | + if (!is_null($id)) { |
|
28 | 28 | $item = $model->getRepository()->find($id); |
29 | - if (is_null($item) || ! $model->isEditable($item)) { |
|
29 | + if (is_null($item) || !$model->isEditable($item)) { |
|
30 | 30 | return new JsonResponse([ |
31 | 31 | 'message' => trans('lang.message.access_denied'), |
32 | 32 | ], 403); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | $form = $model->fireEdit($id); |
36 | 36 | } else { |
37 | - if (! $model->isCreatable()) { |
|
37 | + if (!$model->isCreatable()) { |
|
38 | 38 | return new JsonResponse([ |
39 | 39 | 'message' => trans('lang.message.access_denied'), |
40 | 40 | ], 403); |
@@ -50,24 +50,24 @@ discard block |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | $element->setAjaxParameters( |
53 | - $request->input('depdrop_all_params', []) |
|
53 | + $request->input('depdrop_all_params', [ ]) |
|
54 | 54 | ); |
55 | 55 | |
56 | 56 | $options = $element->getOptions(); |
57 | 57 | |
58 | 58 | if ($element->isNullable()) { |
59 | - $options = [null => trans('sleeping_owl::lang.select.nothing')] + $options; |
|
59 | + $options = [ null => trans('sleeping_owl::lang.select.nothing') ] + $options; |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $options = array_except($options, $element->exclude); |
63 | 63 | |
64 | 64 | return new JsonResponse([ |
65 | - 'output' => collect($options)->map(function ($value, $key) { |
|
66 | - return ['id' => $key, 'name' => $value]; |
|
65 | + 'output' => collect($options)->map(function($value, $key) { |
|
66 | + return [ 'id' => $key, 'name' => $value ]; |
|
67 | 67 | }), |
68 | 68 | 'selected' => $element->getValue(), |
69 | 69 | ]); |
70 | - }]); |
|
70 | + } ]); |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | /** |
80 | 80 | * @var array |
81 | 81 | */ |
82 | - protected $dataDepends = []; |
|
82 | + protected $dataDepends = [ ]; |
|
83 | 83 | |
84 | 84 | /** |
85 | 85 | * @var array |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | * @param null $label |
94 | 94 | * @param array $depends |
95 | 95 | */ |
96 | - public function __construct($path, $label = null, array $depends = []) |
|
96 | + public function __construct($path, $label = null, array $depends = [ ]) |
|
97 | 97 | { |
98 | - parent::__construct($path, $label, []); |
|
98 | + parent::__construct($path, $label, [ ]); |
|
99 | 99 | |
100 | 100 | $this->setDataDepends($depends); |
101 | 101 | } |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | ]; |
180 | 180 | |
181 | 181 | if ($this->isReadonly()) { |
182 | - $attributes['disabled'] = 'disabled'; |
|
182 | + $attributes[ 'disabled' ] = 'disabled'; |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | return [ |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | { |
84 | 84 | $name = array_shift($parts); |
85 | 85 | |
86 | - while (! empty($parts)) { |
|
86 | + while (!empty($parts)) { |
|
87 | 87 | $part = array_shift($parts); |
88 | 88 | $name .= "[$part]"; |
89 | 89 | } |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | { |
237 | 237 | $this->addValidationRule('_unique'); |
238 | 238 | |
239 | - if (! is_null($message)) { |
|
239 | + if (!is_null($message)) { |
|
240 | 240 | $this->addValidationMessage('unique', $message); |
241 | 241 | } |
242 | 242 | |
@@ -251,8 +251,8 @@ discard block |
||
251 | 251 | $messages = parent::getValidationMessages(); |
252 | 252 | |
253 | 253 | foreach ($messages as $rule => $message) { |
254 | - $messages[$this->getName().'.'.$rule] = $message; |
|
255 | - unset($messages[$rule]); |
|
254 | + $messages[ $this->getName().'.'.$rule ] = $message; |
|
255 | + unset($messages[ $rule ]); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | return $messages; |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | */ |
264 | 264 | public function getValidationLabels() |
265 | 265 | { |
266 | - return [$this->getPath() => $this->getLabel()]; |
|
266 | + return [ $this->getPath() => $this->getLabel() ]; |
|
267 | 267 | } |
268 | 268 | |
269 | 269 | /** |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | */ |
272 | 272 | public function getValueFromRequest() |
273 | 273 | { |
274 | - if (Request::hasSession() && ! is_null($value = Request::old($this->getPath()))) { |
|
274 | + if (Request::hasSession() && !is_null($value = Request::old($this->getPath()))) { |
|
275 | 275 | return $value; |
276 | 276 | } |
277 | 277 | |
@@ -284,14 +284,14 @@ discard block |
||
284 | 284 | */ |
285 | 285 | public function getValue() |
286 | 286 | { |
287 | - if (! is_null($value = $this->getValueFromRequest())) { |
|
287 | + if (!is_null($value = $this->getValueFromRequest())) { |
|
288 | 288 | return $value; |
289 | 289 | } |
290 | 290 | |
291 | 291 | $model = $this->getModel(); |
292 | 292 | $value = $this->getDefaultValue(); |
293 | 293 | |
294 | - if (is_null($model) or ! $model->exists) { |
|
294 | + if (is_null($model) or !$model->exists) { |
|
295 | 295 | return $value; |
296 | 296 | } |
297 | 297 | |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | } |
344 | 344 | unset($rule); |
345 | 345 | |
346 | - return [$this->getPath() => $rules]; |
|
346 | + return [ $this->getPath() => $rules ]; |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | /** |
@@ -12,9 +12,9 @@ discard block |
||
12 | 12 | */ |
13 | 13 | public function onlyActive() |
14 | 14 | { |
15 | - return $this->filter(function ($element) { |
|
15 | + return $this->filter(function($element) { |
|
16 | 16 | if ($element instanceof FormElementInterface) { |
17 | - return ! $element->isReadonly(); |
|
17 | + return !$element->isReadonly(); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | return true; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public function onlyVisible() |
28 | 28 | { |
29 | - return $this->filter(function ($element) { |
|
29 | + return $this->filter(function($element) { |
|
30 | 30 | if ($element instanceof FormElementInterface) { |
31 | 31 | return $element->isVisible(); |
32 | 32 | } |