@@ -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 | ); |
@@ -40,8 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | public static function fromName($class, $property) |
42 | 42 | { |
43 | - return new static(new PHPNativeReflectionProperty |
|
44 | - ( |
|
43 | + return new static(new PHPNativeReflectionProperty( |
|
45 | 44 | $class, $property |
46 | 45 | )); |
47 | 46 | } |
@@ -50,8 +49,7 @@ discard block |
||
50 | 49 | { |
51 | 50 | $this->accessor->setRawValue('owner', $parent); |
52 | 51 | $this->accessor->setRawValue('defaultValue', $default); |
53 | - $this->accessor->setRawValue |
|
54 | - ( |
|
52 | + $this->accessor->setRawValue( |
|
55 | 53 | 'name', |
56 | 54 | $this->reflector->getName() |
57 | 55 | ); |
@@ -138,50 +136,42 @@ discard block |
||
138 | 136 | switch ($value[0]) |
139 | 137 | { |
140 | 138 | case 'required': |
141 | - $this->accessor->setRawValue |
|
142 | - ( |
|
139 | + $this->accessor->setRawValue( |
|
143 | 140 | 'passedToConstructor', |
144 | 141 | true |
145 | 142 | ); |
146 | - $this->accessor->setRawValue |
|
147 | - ( |
|
143 | + $this->accessor->setRawValue( |
|
148 | 144 | 'requiredInConstructor', |
149 | 145 | true |
150 | 146 | ); |
151 | - $compositeAccessor->rawAddToValue |
|
152 | - ( |
|
147 | + $compositeAccessor->rawAddToValue( |
|
153 | 148 | 'requiredProperties', |
154 | 149 | $this->object |
155 | 150 | ); |
156 | 151 | break; |
157 | 152 | case 'new': |
158 | - $this->accessor->setRawValue |
|
159 | - ( |
|
153 | + $this->accessor->setRawValue( |
|
160 | 154 | 'builtInConstructor', |
161 | 155 | true |
162 | 156 | ); |
163 | - $compositeAccessor->rawAddToValue |
|
164 | - ( |
|
157 | + $compositeAccessor->rawAddToValue( |
|
165 | 158 | 'builtProperties', |
166 | 159 | $this->object |
167 | 160 | ); |
168 | 161 | break; |
169 | 162 | case 'optional': |
170 | - $this->accessor->setRawValue |
|
171 | - ( |
|
163 | + $this->accessor->setRawValue( |
|
172 | 164 | 'passedToConstructor', |
173 | 165 | true |
174 | 166 | ); |
175 | - $compositeAccessor->rawAddToValue |
|
176 | - ( |
|
167 | + $compositeAccessor->rawAddToValue( |
|
177 | 168 | 'optionalProperties', |
178 | 169 | $this->object |
179 | 170 | ); |
180 | 171 | |
181 | 172 | if (isset($value[1]) && $value[1] === 'new') |
182 | 173 | { |
183 | - $this->accessor->setRawValue |
|
184 | - ( |
|
174 | + $this->accessor->setRawValue( |
|
185 | 175 | 'builtInConstructor', |
186 | 176 | true |
187 | 177 | ); |