@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; |
6 | 6 | use Spaark\CompositeUtils\Model\Reflection\ReflectionProperty; |
7 | -use Spaark\CompositeUtils\Model\Reflection\ReflectionParameter; |
|
8 | 7 | use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType; |
9 | 8 | use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; |
10 | 9 | use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; |
@@ -64,8 +64,7 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public static function fromName($class, $property) |
66 | 66 | { |
67 | - return new static(new PHPNativeReflectionProperty |
|
68 | - ( |
|
67 | + return new static(new PHPNativeReflectionProperty( |
|
69 | 68 | $class, $property |
70 | 69 | )); |
71 | 70 | } |
@@ -83,8 +82,7 @@ discard block |
||
83 | 82 | { |
84 | 83 | $this->accessor->setRawValue('owner', $parent); |
85 | 84 | $this->accessor->setRawValue('defaultValue', $default); |
86 | - $this->accessor->setRawValue |
|
87 | - ( |
|
85 | + $this->accessor->setRawValue( |
|
88 | 86 | 'name', |
89 | 87 | $this->reflector->getName() |
90 | 88 | ); |
@@ -189,50 +187,42 @@ discard block |
||
189 | 187 | switch ($value[0]) |
190 | 188 | { |
191 | 189 | case 'required': |
192 | - $this->accessor->setRawValue |
|
193 | - ( |
|
190 | + $this->accessor->setRawValue( |
|
194 | 191 | 'passedToConstructor', |
195 | 192 | true |
196 | 193 | ); |
197 | - $this->accessor->setRawValue |
|
198 | - ( |
|
194 | + $this->accessor->setRawValue( |
|
199 | 195 | 'requiredInConstructor', |
200 | 196 | true |
201 | 197 | ); |
202 | - $compositeAccessor->rawAddToValue |
|
203 | - ( |
|
198 | + $compositeAccessor->rawAddToValue( |
|
204 | 199 | 'requiredProperties', |
205 | 200 | $this->object |
206 | 201 | ); |
207 | 202 | break; |
208 | 203 | case 'new': |
209 | - $this->accessor->setRawValue |
|
210 | - ( |
|
204 | + $this->accessor->setRawValue( |
|
211 | 205 | 'builtInConstructor', |
212 | 206 | true |
213 | 207 | ); |
214 | - $compositeAccessor->rawAddToValue |
|
215 | - ( |
|
208 | + $compositeAccessor->rawAddToValue( |
|
216 | 209 | 'builtProperties', |
217 | 210 | $this->object |
218 | 211 | ); |
219 | 212 | break; |
220 | 213 | case 'optional': |
221 | - $this->accessor->setRawValue |
|
222 | - ( |
|
214 | + $this->accessor->setRawValue( |
|
223 | 215 | 'passedToConstructor', |
224 | 216 | true |
225 | 217 | ); |
226 | - $compositeAccessor->rawAddToValue |
|
227 | - ( |
|
218 | + $compositeAccessor->rawAddToValue( |
|
228 | 219 | 'optionalProperties', |
229 | 220 | $this->object |
230 | 221 | ); |
231 | 222 | |
232 | 223 | if (isset($value[1]) && $value[1] === 'new') |
233 | 224 | { |
234 | - $this->accessor->setRawValue |
|
235 | - ( |
|
225 | + $this->accessor->setRawValue( |
|
236 | 226 | 'builtInConstructor', |
237 | 227 | true |
238 | 228 | ); |
@@ -28,8 +28,8 @@ |
||
28 | 28 | { |
29 | 29 | return |
30 | 30 | (is_object($value) ? spl_object_hash($value) |
31 | - : (is_array($value) ? implode($value) |
|
32 | - : ( (string)$value))); |
|
31 | + : (is_array($value) ? implode($value) |
|
32 | + : ((string)$value))); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | /** |
@@ -48,8 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function setRawValue($key, $value) |
50 | 50 | { |
51 | - $this->getPropertyOrFail |
|
52 | - ( |
|
51 | + $this->getPropertyOrFail( |
|
53 | 52 | $key, |
54 | 53 | CannotWritePropertyException::class |
55 | 54 | ) |
@@ -68,8 +67,7 @@ discard block |
||
68 | 67 | public function getRawValue($key) |
69 | 68 | { |
70 | 69 | return |
71 | - $this->getPropertyOrFail |
|
72 | - ( |
|
70 | + $this->getPropertyOrFail( |
|
73 | 71 | $key, |
74 | 72 | CannotReadPropertyException::class |
75 | 73 | ) |
@@ -86,8 +84,7 @@ discard block |
||
86 | 84 | */ |
87 | 85 | public function rawAddToValue($key, $value) |
88 | 86 | { |
89 | - $property = $this->getPropertyOrFail |
|
90 | - ( |
|
87 | + $property = $this->getPropertyOrFail( |
|
91 | 88 | $key, |
92 | 89 | CannotWritePropertyException::class |
93 | 90 | ); |
@@ -113,8 +110,7 @@ discard block |
||
113 | 110 | } |
114 | 111 | catch (ReflectionException $e) |
115 | 112 | { |
116 | - throw new $class |
|
117 | - ( |
|
113 | + throw new $class( |
|
118 | 114 | get_class($this->object), |
119 | 115 | $key, |
120 | 116 | $e |
@@ -60,8 +60,7 @@ discard block |
||
60 | 60 | case T_NAMESPACE: |
61 | 61 | $ns = new NamespaceBlock($classname); |
62 | 62 | $currentNS = new RawPropertyAccessor($ns); |
63 | - $this->accessor->getRawValue |
|
64 | - ( |
|
63 | + $this->accessor->getRawValue( |
|
65 | 64 | 'namespaces' |
66 | 65 | ) |
67 | 66 | ->add($classname, $ns); |
@@ -76,8 +75,7 @@ discard block |
||
76 | 75 | $as = end($as); |
77 | 76 | } |
78 | 77 | |
79 | - $currentNS->getRawValue |
|
80 | - ( |
|
78 | + $currentNS->getRawValue( |
|
81 | 79 | 'useStatements' |
82 | 80 | ) |
83 | 81 | ->add($as, new UseStatement($classname, $as)); |
@@ -25,8 +25,7 @@ |
||
25 | 25 | if (!static::$reflectionComposite) |
26 | 26 | { |
27 | 27 | static::$reflectionComposite = |
28 | - ReflectionCompositeFactory::fromClassName |
|
29 | - ( |
|
28 | + ReflectionCompositeFactory::fromClassName( |
|
30 | 29 | get_called_class() |
31 | 30 | ) |
32 | 31 | ->build(); |
@@ -29,8 +29,7 @@ |
||
29 | 29 | { |
30 | 30 | if (!$this->accessor) |
31 | 31 | { |
32 | - $this->accessor = new ConditionalPropertyAccessor |
|
33 | - ( |
|
32 | + $this->accessor = new ConditionalPropertyAccessor( |
|
34 | 33 | $this, |
35 | 34 | self::getReflectionComposite() |
36 | 35 | ); |
@@ -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()] |
@@ -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, |
@@ -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, |