@@ -14,7 +14,6 @@ |
||
14 | 14 | |
15 | 15 | namespace Spaark\CompositeUtils\Factory\Reflection; |
16 | 16 | |
17 | -use Spaark\CompositeUtils\Factory\BaseFactory; |
|
18 | 17 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; |
19 | 18 | use \ReflectionClass as PHPNativeReflectionClass; |
20 | 19 | use \ReflectionProperty as PHPNativeReflectionProperty; |
@@ -61,13 +61,11 @@ discard block |
||
61 | 61 | (new ReflectionFileFactory($this->reflector->getFileName())) |
62 | 62 | ->build(); |
63 | 63 | $this->accessor->setRawValue('file', $file); |
64 | - $this->accessor->setRawValue |
|
65 | - ( |
|
64 | + $this->accessor->setRawValue( |
|
66 | 65 | 'classname', |
67 | 66 | $this->reflector->name |
68 | 67 | ); |
69 | - $this->accessor->setRawValue |
|
70 | - ( |
|
68 | + $this->accessor->setRawValue( |
|
71 | 69 | 'namespace', |
72 | 70 | $file->namespaces[$this->reflector->getNamespaceName()] |
73 | 71 | ); |
@@ -97,8 +95,7 @@ discard block |
||
97 | 95 | * |
98 | 96 | * @param PHPNativeReflectionProperty |
99 | 97 | */ |
100 | - protected function buildProperty |
|
101 | - ( |
|
98 | + protected function buildProperty( |
|
102 | 99 | PHPNativeReflectionProperty $reflect |
103 | 100 | ) |
104 | 101 | { |
@@ -106,8 +103,7 @@ discard block |
||
106 | 103 | |
107 | 104 | $properties[$reflect->getName()] = |
108 | 105 | (new ReflectionPropertyFactory($reflect)) |
109 | - ->build |
|
110 | - ( |
|
106 | + ->build( |
|
111 | 107 | $this->object, |
112 | 108 | $this->reflector |
113 | 109 | ->getDefaultProperties()[$reflect->getName()] |
@@ -32,7 +32,7 @@ |
||
32 | 32 | /** |
33 | 33 | * Creates this ObjectType with the given classname |
34 | 34 | * |
35 | - * @param string $class The name of the class this must be an |
|
35 | + * @param string $classname The name of the class this must be an |
|
36 | 36 | * instance of |
37 | 37 | */ |
38 | 38 | public function __construct(string $classname) |
@@ -56,7 +56,7 @@ |
||
56 | 56 | { |
57 | 57 | parent::__construct |
58 | 58 | ( |
59 | - 'Cannot ' . static::ACCESS_TYPE . ' property: ' |
|
59 | + 'Cannot ' . static::ACCESS_TYPE . ' property: ' |
|
60 | 60 | . $class . '::$' . $property . '. ' . static::ERROR_REASON, |
61 | 61 | 0, |
62 | 62 | $previous |
@@ -47,15 +47,13 @@ |
||
47 | 47 | * @param string $property The property accessed |
48 | 48 | * @param Throwable $previous The exception which caused this |
49 | 49 | */ |
50 | - public function __construct |
|
51 | - ( |
|
50 | + public function __construct( |
|
52 | 51 | string $class, |
53 | 52 | string $property, |
54 | 53 | Throwable $previous = null |
55 | 54 | ) |
56 | 55 | { |
57 | - parent::__construct |
|
58 | - ( |
|
56 | + parent::__construct( |
|
59 | 57 | 'Cannot ' . static::ACCESS_TYPE . ' property: ' |
60 | 58 | . $class . '::$' . $property . '. ' . static::ERROR_REASON, |
61 | 59 | 0, |
@@ -39,7 +39,7 @@ |
||
39 | 39 | { |
40 | 40 | parent::__construct |
41 | 41 | ( |
42 | - 'Missing required parameter in constructor. ' |
|
42 | + 'Missing required parameter in constructor. ' |
|
43 | 43 | . $class . ' requires a value for ' . $parameter, |
44 | 44 | 0, |
45 | 45 | $previous |
@@ -30,15 +30,13 @@ |
||
30 | 30 | * @param string $parameter The name of the missing parameter |
31 | 31 | * @param Throwable The exception which caused this |
32 | 32 | */ |
33 | - public function __construct |
|
34 | - ( |
|
33 | + public function __construct( |
|
35 | 34 | string $class, |
36 | 35 | string $parameter, |
37 | 36 | Throwable $previous = null |
38 | 37 | ) |
39 | 38 | { |
40 | - parent::__construct |
|
41 | - ( |
|
39 | + parent::__construct( |
|
42 | 40 | 'Missing required parameter in constructor. ' |
43 | 41 | . $class . ' requires a value for ' . $parameter, |
44 | 42 | 0, |
@@ -46,8 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public static function fromName(string $class, string $method) |
48 | 48 | { |
49 | - return new static(new PHPNativeReflectionMethod |
|
50 | - ( |
|
49 | + return new static(new PHPNativeReflectionMethod( |
|
51 | 50 | $class, $method |
52 | 51 | )); |
53 | 52 | } |
@@ -60,11 +59,10 @@ discard block |
||
60 | 59 | * this method belongs to |
61 | 60 | * @return ReflectionMethod |
62 | 61 | */ |
63 | - public function build(?ReflectionComposite $parent = null) |
|
62 | + public function build(? ReflectionComposite $parent = null) |
|
64 | 63 | { |
65 | 64 | $this->accessor->setRawValue('owner', $parent); |
66 | - $this->accessor->setRawValue |
|
67 | - ( |
|
65 | + $this->accessor->setRawValue( |
|
68 | 66 | 'name', |
69 | 67 | $this->reflector->getName() |
70 | 68 | ); |
@@ -14,8 +14,6 @@ |
||
14 | 14 | |
15 | 15 | namespace Spaark\CompositeUtils\Model\Collection; |
16 | 16 | |
17 | -use Spaark\CompositeUtils\Traits\AutoConstructTrait; |
|
18 | - |
|
19 | 17 | /** |
20 | 18 | * Abstract Iterator for Map datatypes |
21 | 19 | * |
@@ -65,8 +65,7 @@ discard block |
||
65 | 65 | { |
66 | 66 | if (!isset($args[$i])) |
67 | 67 | { |
68 | - throw new MissingRequiredParameterException |
|
69 | - ( |
|
68 | + throw new MissingRequiredParameterException( |
|
70 | 69 | get_class($this->object), |
71 | 70 | $property->name |
72 | 71 | ); |
@@ -144,14 +143,12 @@ discard block |
||
144 | 143 | { |
145 | 144 | if (!$this->reflect->properties->containsKey($property)) |
146 | 145 | { |
147 | - throw new CannotWritePropertyException |
|
148 | - ( |
|
146 | + throw new CannotWritePropertyException( |
|
149 | 147 | get_class($this->object), $property |
150 | 148 | ); |
151 | 149 | } |
152 | 150 | |
153 | - $this->setAnyValue |
|
154 | - ( |
|
151 | + $this->setAnyValue( |
|
155 | 152 | $this->reflect->properties[$property], |
156 | 153 | $value |
157 | 154 | ); |
@@ -198,8 +195,7 @@ discard block |
||
198 | 195 | * @param ReflectionProperty $property The property to set |
199 | 196 | * @param mixed $value The value to set |
200 | 197 | */ |
201 | - private function setNonNullValue |
|
202 | - ( |
|
198 | + private function setNonNullValue( |
|
203 | 199 | ReflectionProperty $property, |
204 | 200 | $value |
205 | 201 | ) |
@@ -248,8 +244,7 @@ discard block |
||
248 | 244 | * @param callable $cast Method to cast a value to the scalar data |
249 | 245 | * type |
250 | 246 | */ |
251 | - private function setScalarValue |
|
252 | - ( |
|
247 | + private function setScalarValue( |
|
253 | 248 | ReflectionProperty $property, |
254 | 249 | $value, |
255 | 250 | string $name, |
@@ -264,8 +259,7 @@ discard block |
||
264 | 259 | } |
265 | 260 | elseif (is_object($value) && method_exists([$value, $method])) |
266 | 261 | { |
267 | - $this->setScalarValue |
|
268 | - ( |
|
262 | + $this->setScalarValue( |
|
269 | 263 | $property, |
270 | 264 | $value->$method(), |
271 | 265 | $method, |
@@ -284,8 +278,7 @@ discard block |
||
284 | 278 | * @param ReflectionProperty $property The property to set |
285 | 279 | * @param mixed $value The value to set |
286 | 280 | */ |
287 | - private function setObjectValue |
|
288 | - ( |
|
281 | + private function setObjectValue( |
|
289 | 282 | ReflectionProperty $property, |
290 | 283 | $value |
291 | 284 | ) |
@@ -296,8 +289,7 @@ discard block |
||
296 | 289 | } |
297 | 290 | else |
298 | 291 | { |
299 | - $this->throwError |
|
300 | - ( |
|
292 | + $this->throwError( |
|
301 | 293 | $property, |
302 | 294 | $property->type->classname, |
303 | 295 | $value |
@@ -311,8 +303,7 @@ discard block |
||
311 | 303 | * @param ReflectionProperty $property The property to set |
312 | 304 | * @param mixed The value to set |
313 | 305 | */ |
314 | - private function setCollectionValue |
|
315 | - ( |
|
306 | + private function setCollectionValue( |
|
316 | 307 | ReflectionProperty $property, |
317 | 308 | $value |
318 | 309 | ) |
@@ -334,15 +325,13 @@ discard block |
||
334 | 325 | * @param string $expected The expected datatype |
335 | 326 | * @param string $value The value being set |
336 | 327 | */ |
337 | - private function throwError |
|
338 | - ( |
|
328 | + private function throwError( |
|
339 | 329 | ReflectionProperty $property, |
340 | 330 | string $expected, |
341 | 331 | $value |
342 | 332 | ) |
343 | 333 | { |
344 | - throw new IllegalPropertyTypeException |
|
345 | - ( |
|
334 | + throw new IllegalPropertyTypeException( |
|
346 | 335 | get_class($this->object), |
347 | 336 | $property->name, |
348 | 337 | $expected, |
@@ -83,15 +83,13 @@ discard block |
||
83 | 83 | if ($building) |
84 | 84 | { |
85 | 85 | $this->buildProperty($property); |
86 | - } |
|
87 | - else |
|
86 | + } else |
|
88 | 87 | { |
89 | 88 | if (isset($args[$i])) |
90 | 89 | { |
91 | 90 | $this->setAnyValue($property, $args[$i]); |
92 | 91 | $i++; |
93 | - } |
|
94 | - else |
|
92 | + } else |
|
95 | 93 | { |
96 | 94 | $building = true; |
97 | 95 | $this->buildProperty($property); |
@@ -116,8 +114,7 @@ discard block |
||
116 | 114 | { |
117 | 115 | $class = $property->type->classname; |
118 | 116 | $this->setRawValue($property->name, new $class()); |
119 | - } |
|
120 | - else |
|
117 | + } else |
|
121 | 118 | { |
122 | 119 | $this->setAnyValue($property, 0); |
123 | 120 | } |
@@ -168,8 +165,7 @@ discard block |
||
168 | 165 | if (is_null($value)) |
169 | 166 | { |
170 | 167 | $this->setNullValue($property); |
171 | - } |
|
172 | - else |
|
168 | + } else |
|
173 | 169 | { |
174 | 170 | $this->setNonNullValue($property, $value); |
175 | 171 | } |
@@ -185,8 +181,7 @@ discard block |
||
185 | 181 | if ($property->type->nullable) |
186 | 182 | { |
187 | 183 | $this->setRawValue($property->name, null); |
188 | - } |
|
189 | - else |
|
184 | + } else |
|
190 | 185 | { |
191 | 186 | $this->throwError($property, 'NonNull', null); |
192 | 187 | } |
@@ -261,8 +256,7 @@ discard block |
||
261 | 256 | if (is_scalar($value)) |
262 | 257 | { |
263 | 258 | $this->setRawValue($property->name, $cast($value)); |
264 | - } |
|
265 | - elseif (is_object($value) && method_exists([$value, $method])) |
|
259 | + } elseif (is_object($value) && method_exists([$value, $method])) |
|
266 | 260 | { |
267 | 261 | $this->setScalarValue |
268 | 262 | ( |
@@ -271,8 +265,7 @@ discard block |
||
271 | 265 | $method, |
272 | 266 | $cast |
273 | 267 | ); |
274 | - } |
|
275 | - else |
|
268 | + } else |
|
276 | 269 | { |
277 | 270 | $this->throwError($property, $name, $value); |
278 | 271 | } |
@@ -293,8 +286,7 @@ discard block |
||
293 | 286 | if (is_a($value, $property->type->classname)) |
294 | 287 | { |
295 | 288 | $this->setRawValue($property->name, $value); |
296 | - } |
|
297 | - else |
|
289 | + } else |
|
298 | 290 | { |
299 | 291 | $this->throwError |
300 | 292 | ( |
@@ -320,8 +312,7 @@ discard block |
||
320 | 312 | if (is_a($value, \ArrayAccess::class) || is_array($value)) |
321 | 313 | { |
322 | 314 | $this->setRawValue($property->name, $value); |
323 | - } |
|
324 | - else |
|
315 | + } else |
|
325 | 316 | { |
326 | 317 | $this->throwError($property, 'Collection', $value); |
327 | 318 | } |
@@ -45,10 +45,9 @@ |
||
45 | 45 | /** |
46 | 46 | * {@inheritDoc} |
47 | 47 | */ |
48 | - public function splice |
|
49 | - ( |
|
48 | + public function splice( |
|
50 | 49 | int $offset, |
51 | - ?int $length = null, |
|
50 | + ? int $length = null, |
|
52 | 51 | array $replacement = [] |
53 | 52 | ) |
54 | 53 | { |
@@ -33,10 +33,9 @@ |
||
33 | 33 | * @param int $length The number of elements to remove |
34 | 34 | * @param array $items Items to add |
35 | 35 | */ |
36 | - public function splice |
|
37 | - ( |
|
36 | + public function splice( |
|
38 | 37 | int $offset, |
39 | - ?int$length = null, |
|
38 | + ? int$length = null, |
|
40 | 39 | array $items = [] |
41 | 40 | ); |
42 | 41 |