@@ -16,13 +16,6 @@ |
||
16 | 16 | |
17 | 17 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; |
18 | 18 | use Spaark\CompositeUtils\Model\Reflection\ReflectionProperty; |
19 | -use Spaark\CompositeUtils\Model\Reflection\ReflectionParameter; |
|
20 | -use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType; |
|
21 | -use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; |
|
22 | -use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; |
|
23 | -use Spaark\CompositeUtils\Model\Reflection\Type\MixedType; |
|
24 | -use Spaark\CompositeUtils\Model\Reflection\Type\ObjectType; |
|
25 | -use Spaark\CompositeUtils\Model\Reflection\Type\StringType; |
|
26 | 19 | use Spaark\CompositeUtils\Service\RawPropertyAccessor; |
27 | 20 | use \ReflectionProperty as PHPNativeReflectionProperty; |
28 | 21 |
@@ -53,8 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public static function fromName($class, $property) |
55 | 55 | { |
56 | - return new static(new PHPNativeReflectionProperty |
|
57 | - ( |
|
56 | + return new static(new PHPNativeReflectionProperty( |
|
58 | 57 | $class, $property |
59 | 58 | )); |
60 | 59 | } |
@@ -72,14 +71,12 @@ discard block |
||
72 | 71 | { |
73 | 72 | $this->accessor->setRawValue('owner', $parent); |
74 | 73 | $this->accessor->setRawValue('defaultValue', $default); |
75 | - $this->accessor->setRawValue |
|
76 | - ( |
|
74 | + $this->accessor->setRawValue( |
|
77 | 75 | 'name', |
78 | 76 | $this->reflector->getName() |
79 | 77 | ); |
80 | 78 | |
81 | - $this->parseDocComment |
|
82 | - ([ |
|
79 | + $this->parseDocComment([ |
|
83 | 80 | 'readable' => 'setBool', |
84 | 81 | 'writable' => 'setBool', |
85 | 82 | 'var' => 'setType', |
@@ -97,8 +94,7 @@ discard block |
||
97 | 94 | */ |
98 | 95 | protected function setType($name, $value) |
99 | 96 | { |
100 | - $this->accessor->setRawValue |
|
101 | - ( |
|
97 | + $this->accessor->setRawValue( |
|
102 | 98 | 'type', |
103 | 99 | (new TypeParser($this->object->owner))->parse($value) |
104 | 100 | ); |
@@ -120,50 +116,42 @@ discard block |
||
120 | 116 | switch ($value[0]) |
121 | 117 | { |
122 | 118 | case 'required': |
123 | - $this->accessor->setRawValue |
|
124 | - ( |
|
119 | + $this->accessor->setRawValue( |
|
125 | 120 | 'passedToConstructor', |
126 | 121 | true |
127 | 122 | ); |
128 | - $this->accessor->setRawValue |
|
129 | - ( |
|
123 | + $this->accessor->setRawValue( |
|
130 | 124 | 'requiredInConstructor', |
131 | 125 | true |
132 | 126 | ); |
133 | - $compositeAccessor->rawAddToValue |
|
134 | - ( |
|
127 | + $compositeAccessor->rawAddToValue( |
|
135 | 128 | 'requiredProperties', |
136 | 129 | $this->object |
137 | 130 | ); |
138 | 131 | break; |
139 | 132 | case 'new': |
140 | - $this->accessor->setRawValue |
|
141 | - ( |
|
133 | + $this->accessor->setRawValue( |
|
142 | 134 | 'builtInConstructor', |
143 | 135 | true |
144 | 136 | ); |
145 | - $compositeAccessor->rawAddToValue |
|
146 | - ( |
|
137 | + $compositeAccessor->rawAddToValue( |
|
147 | 138 | 'builtProperties', |
148 | 139 | $this->object |
149 | 140 | ); |
150 | 141 | break; |
151 | 142 | case 'optional': |
152 | - $this->accessor->setRawValue |
|
153 | - ( |
|
143 | + $this->accessor->setRawValue( |
|
154 | 144 | 'passedToConstructor', |
155 | 145 | true |
156 | 146 | ); |
157 | - $compositeAccessor->rawAddToValue |
|
158 | - ( |
|
147 | + $compositeAccessor->rawAddToValue( |
|
159 | 148 | 'optionalProperties', |
160 | 149 | $this->object |
161 | 150 | ); |
162 | 151 | |
163 | 152 | if (isset($value[1]) && $value[1] === 'new') |
164 | 153 | { |
165 | - $this->accessor->setRawValue |
|
166 | - ( |
|
154 | + $this->accessor->setRawValue( |
|
167 | 155 | 'builtInConstructor', |
168 | 156 | true |
169 | 157 | ); |
@@ -63,8 +63,7 @@ discard block |
||
63 | 63 | */ |
64 | 64 | protected function parseDocComment(array $acceptedParams) |
65 | 65 | { |
66 | - preg_match_all |
|
67 | - ( |
|
66 | + preg_match_all( |
|
68 | 67 | '/^' |
69 | 68 | . '[ \t]*\*[ \t]*' |
70 | 69 | . '@([a-zA-Z]+)' |
@@ -81,8 +80,7 @@ discard block |
||
81 | 80 | |
82 | 81 | if (isset($acceptedParams[$name])) |
83 | 82 | { |
84 | - call_user_func |
|
85 | - ( |
|
83 | + call_user_func( |
|
86 | 84 | array($this, $acceptedParams[$name]), |
87 | 85 | $name, $value |
88 | 86 | ); |
@@ -98,7 +96,7 @@ discard block |
||
98 | 96 | */ |
99 | 97 | protected function setBool($name, $value) |
100 | 98 | { |
101 | - switch(strtolower($value)) |
|
99 | + switch (strtolower($value)) |
|
102 | 100 | { |
103 | 101 | case '': |
104 | 102 | case 'true': |
@@ -20,10 +20,7 @@ |
||
20 | 20 | use Spaark\CompositeUtils\Model\Reflection\Type\FloatType; |
21 | 21 | use Spaark\CompositeUtils\Model\Reflection\Type\MixedType; |
22 | 22 | use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; |
23 | -use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; |
|
24 | 23 | use Spaark\CompositeUtils\Model\Reflection\Type\StringType; |
25 | -use Spaark\CompositeUtils\Exception\PropertyNotWritableException; |
|
26 | -use Spaark\CompositeUtils\Exception\PropertyNotReadableException; |
|
27 | 24 | |
28 | 25 | /** |
29 | 26 | * Used to retrieve the classname for an AbstractType |
@@ -68,8 +68,7 @@ |
||
68 | 68 | if ($reflect->generics->empty()) |
69 | 69 | { |
70 | 70 | return $reflect->classname; |
71 | - } |
|
72 | - else |
|
71 | + } else |
|
73 | 72 | { |
74 | 73 | $items = []; |
75 | 74 | foreach ($reflect->generics as $generic) |
@@ -78,8 +78,7 @@ discard block |
||
78 | 78 | * @param PHPNativeReflectionClass $reflect |
79 | 79 | * @param ReflectionCompositeProviderInterface $provider |
80 | 80 | */ |
81 | - public function __construct |
|
82 | - ( |
|
81 | + public function __construct( |
|
83 | 82 | PHPNativeReflectionClass $reflect, |
84 | 83 | ReflectionCompositeProviderInterface $provider |
85 | 84 | ) |
@@ -112,8 +111,7 @@ discard block |
||
112 | 111 | $this->addInheritance('interfaces', $interface); |
113 | 112 | } |
114 | 113 | |
115 | - $this->parseDocComment |
|
116 | - ([ |
|
114 | + $this->parseDocComment([ |
|
117 | 115 | 'generic' => 'addGeneric' |
118 | 116 | ]); |
119 | 117 | |
@@ -122,13 +120,11 @@ discard block |
||
122 | 120 | $file = (new ReflectionFileFactory($fileName))->build(); |
123 | 121 | $this->accessor->setRawValue('file', $file); |
124 | 122 | |
125 | - $this->accessor->setRawValue |
|
126 | - ( |
|
123 | + $this->accessor->setRawValue( |
|
127 | 124 | 'classname', |
128 | 125 | $this->reflector->name |
129 | 126 | ); |
130 | - $this->accessor->setRawValue |
|
131 | - ( |
|
127 | + $this->accessor->setRawValue( |
|
132 | 128 | 'namespace', |
133 | 129 | $file->namespaces[$this->reflector->getNamespaceName()] |
134 | 130 | ); |
@@ -151,8 +147,7 @@ discard block |
||
151 | 147 | $size = count($this->reflector->{'get' . $name}()); |
152 | 148 | foreach ($prefixes as $prefix) |
153 | 149 | { |
154 | - $this->accessor->setRawValue |
|
155 | - ( |
|
150 | + $this->accessor->setRawValue( |
|
156 | 151 | $prefix . $name, |
157 | 152 | new FixedList($size) |
158 | 153 | ); |
@@ -207,8 +202,7 @@ discard block |
||
207 | 202 | * @param bool $checkFile |
208 | 203 | * @param string $singular |
209 | 204 | */ |
210 | - protected function addItems |
|
211 | - ( |
|
205 | + protected function addItems( |
|
212 | 206 | string $name, |
213 | 207 | bool $checkFile, |
214 | 208 | string $signular |
@@ -239,8 +233,7 @@ discard block |
||
239 | 233 | new $factory($item), |
240 | 234 | $item |
241 | 235 | ); |
242 | - $this->accessor->rawAddToValue |
|
243 | - ( |
|
236 | + $this->accessor->rawAddToValue( |
|
244 | 237 | 'local' . ucfirst($name), |
245 | 238 | $item |
246 | 239 | ); |
@@ -257,8 +250,7 @@ discard block |
||
257 | 250 | * @param PHPNativeReflectionClass $reflect |
258 | 251 | * @param string $method |
259 | 252 | */ |
260 | - protected function addInheritance |
|
261 | - ( |
|
253 | + protected function addInheritance( |
|
262 | 254 | string $group, |
263 | 255 | PHPNativeReflectionClass $reflect, |
264 | 256 | string $method = 'rawAddToValue' |
@@ -283,15 +275,13 @@ discard block |
||
283 | 275 | * @param ReflectionPropertyFactory $factory |
284 | 276 | * @return ReflectionProperty |
285 | 277 | */ |
286 | - protected function buildProperty |
|
287 | - ( |
|
278 | + protected function buildProperty( |
|
288 | 279 | ReflectionPropertyFactory $factory, |
289 | 280 | PHPNativeReflectionProperty $reflect |
290 | 281 | ) |
291 | 282 | : ReflectionProperty |
292 | 283 | { |
293 | - return $factory->build |
|
294 | - ( |
|
284 | + return $factory->build( |
|
295 | 285 | $this->object, |
296 | 286 | $this->reflector |
297 | 287 | ->getDefaultProperties()[$reflect->getName()] |
@@ -174,8 +174,7 @@ |
||
174 | 174 | { |
175 | 175 | $key = $value; |
176 | 176 | $type = ''; |
177 | - } |
|
178 | - else |
|
177 | + } else |
|
179 | 178 | { |
180 | 179 | $key = substr($value, 0, $space); |
181 | 180 | $type = substr($value, $space); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | $item = $stack->pop(); |
101 | 101 | if ($value{$i - 1} !== '>') |
102 | 102 | { |
103 | - $item->generics[] =$this->resolveName(); |
|
103 | + $item->generics[] = $this->resolveName(); |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | if ($i + 1 !== strlen($value) && $value{$i + 1} === '[') |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | } |
149 | 149 | elseif ($i + 2 !== strlen($value)) |
150 | 150 | { |
151 | - if (!in_array($value{$i + 2}, ['>',','])) |
|
151 | + if (!in_array($value{$i + 2}, ['>', ','])) |
|
152 | 152 | { |
153 | 153 | throw new \Exception('Unexpected char after collection'); |
154 | 154 | } |
@@ -113,8 +113,7 @@ discard block |
||
113 | 113 | if ($stack->isEmpty()) |
114 | 114 | { |
115 | 115 | return $item; |
116 | - } |
|
117 | - else |
|
116 | + } else |
|
118 | 117 | { |
119 | 118 | $stack->top()->generics[] = $item; |
120 | 119 | } |
@@ -141,12 +140,10 @@ discard block |
||
141 | 140 | if ($i + 1 === strlen($value)) |
142 | 141 | { |
143 | 142 | throw new \Exception('Unexpected EOF'); |
144 | - } |
|
145 | - elseif ($value{$i + 1} !== ']') |
|
143 | + } elseif ($value{$i + 1} !== ']') |
|
146 | 144 | { |
147 | 145 | throw new \Exception('[ must be followed by ]'); |
148 | - } |
|
149 | - elseif ($i + 2 !== strlen($value)) |
|
146 | + } elseif ($i + 2 !== strlen($value)) |
|
150 | 147 | { |
151 | 148 | if (!in_array($value{$i + 2}, ['>',','])) |
152 | 149 | { |
@@ -245,12 +242,10 @@ discard block |
||
245 | 242 | if ($useStatements->containsKey($this->currentValue)) |
246 | 243 | { |
247 | 244 | return $useStatements[$this->currentValue]->classname; |
248 | - } |
|
249 | - elseif ($generics->containsKey($this->currentValue)) |
|
245 | + } elseif ($generics->containsKey($this->currentValue)) |
|
250 | 246 | { |
251 | 247 | return new GenericType($this->currentValue); |
252 | - } |
|
253 | - else |
|
248 | + } else |
|
254 | 249 | { |
255 | 250 | return $this->context->namespace->namespace |
256 | 251 | . '\\' . $this->currentValue; |
@@ -31,8 +31,7 @@ |
||
31 | 31 | * @param AbstractType $child |
32 | 32 | * @return boolean |
33 | 33 | */ |
34 | - public function compatible |
|
35 | - ( |
|
34 | + public function compatible( |
|
36 | 35 | AbstractType $parent, |
37 | 36 | AbstractType $child |
38 | 37 | ) |
@@ -41,12 +41,10 @@ |
||
41 | 41 | if ($parent instanceof MixedType) |
42 | 42 | { |
43 | 43 | return true; |
44 | - } |
|
45 | - elseif ($parent instanceof ScalarType) |
|
44 | + } elseif ($parent instanceof ScalarType) |
|
46 | 45 | { |
47 | 46 | return get_class($parent) === get_class($child); |
48 | - } |
|
49 | - elseif ($parent instanceof ObjectType) |
|
47 | + } elseif ($parent instanceof ObjectType) |
|
50 | 48 | { |
51 | 49 | return |
52 | 50 | $child instanceof ObjectType && |
@@ -97,7 +97,7 @@ |
||
97 | 97 | $this->initParams(); |
98 | 98 | |
99 | 99 | $this->accessor->setRawValue('visibility', |
100 | - ($this->reflector->isPublic() ? 'public' |
|
100 | + ($this->reflector->isPublic() ? 'public' |
|
101 | 101 | : ($this->reflector->isProtected() ? 'protected' |
102 | 102 | : ($this->reflector->isPrivate() ? 'private' |
103 | 103 | : ('')))) |
@@ -63,8 +63,7 @@ discard block |
||
63 | 63 | */ |
64 | 64 | public static function fromName(string $class, string $method) |
65 | 65 | { |
66 | - return new static(new PHPNativeReflectionMethod |
|
67 | - ( |
|
66 | + return new static(new PHPNativeReflectionMethod( |
|
68 | 67 | $class, $method |
69 | 68 | )); |
70 | 69 | } |
@@ -84,12 +83,11 @@ discard block |
||
84 | 83 | * this method belongs to |
85 | 84 | * @return ReflectionMethod |
86 | 85 | */ |
87 | - public function build(?ReflectionComposite $parent = null) |
|
86 | + public function build(? ReflectionComposite $parent = null) |
|
88 | 87 | { |
89 | 88 | $this->typeParser = new TypeParser($parent); |
90 | 89 | $this->accessor->setRawValue('owner', $parent); |
91 | - $this->accessor->setRawValue |
|
92 | - ( |
|
90 | + $this->accessor->setRawValue( |
|
93 | 91 | 'name', |
94 | 92 | $this->reflector->getName() |
95 | 93 | ); |
@@ -125,13 +123,11 @@ discard block |
||
125 | 123 | */ |
126 | 124 | protected function initParams() |
127 | 125 | { |
128 | - $this->accessor->setRawValue |
|
129 | - ( |
|
126 | + $this->accessor->setRawValue( |
|
130 | 127 | 'parameters', |
131 | 128 | new FixedList(count($this->reflector->getParameters())) |
132 | 129 | ); |
133 | - $this->accessor->setRawValue |
|
134 | - ( |
|
130 | + $this->accessor->setRawValue( |
|
135 | 131 | 'nativeParameters', |
136 | 132 | new FixedList(count($this->reflector->getParameters())) |
137 | 133 | ); |
@@ -174,8 +170,7 @@ discard block |
||
174 | 170 | * |
175 | 171 | * @param PHPNativeReflectionParameter $reflect |
176 | 172 | */ |
177 | - protected function addParameter |
|
178 | - ( |
|
173 | + protected function addParameter( |
|
179 | 174 | PHPNativeReflectionParameter $reflect |
180 | 175 | ) |
181 | 176 | : void |
@@ -44,8 +44,7 @@ |
||
44 | 44 | { |
45 | 45 | if (!$pair instanceof OrderedPair) |
46 | 46 | { |
47 | - $pair = new OrderedPair |
|
48 | - ( |
|
47 | + $pair = new OrderedPair( |
|
49 | 48 | $this->size(), |
50 | 49 | $pair->key, |
51 | 50 | $pair->value |
@@ -37,8 +37,6 @@ discard block |
||
37 | 37 | /** |
38 | 38 | * Adds an element to the Map |
39 | 39 | * |
40 | - * @param KeyType $key The key to add |
|
41 | - * @param ValueType $value The value to add |
|
42 | 40 | */ |
43 | 41 | public function insert(Pair $pair) |
44 | 42 | { |
@@ -59,7 +57,7 @@ discard block |
||
59 | 57 | /** |
60 | 58 | * Checks if a key exists |
61 | 59 | * |
62 | - * @param KeyType $key The key to search for |
|
60 | + * @param string $key The key to search for |
|
63 | 61 | * @return boolean |
64 | 62 | */ |
65 | 63 | public function containsKey($key) : bool |
@@ -103,6 +101,9 @@ discard block |
||
103 | 101 | return $this->list->size(); |
104 | 102 | } |
105 | 103 | |
104 | + /** |
|
105 | + * @param string $key |
|
106 | + */ |
|
106 | 107 | public function indexOfKey($key) |
107 | 108 | { |
108 | 109 | return $this->getPair($key)->index; |
@@ -41,8 +41,7 @@ discard block |
||
41 | 41 | if (!static::$reflectionComposite) |
42 | 42 | { |
43 | 43 | static::$reflectionComposite = |
44 | - ReflectionCompositeFactory::fromClassName |
|
45 | - ( |
|
44 | + ReflectionCompositeFactory::fromClassName( |
|
46 | 45 | get_called_class() |
47 | 46 | ) |
48 | 47 | ->build(); |
@@ -54,8 +53,7 @@ discard block |
||
54 | 53 | /** |
55 | 54 | * Set the default ReflectionComposite for this class |
56 | 55 | */ |
57 | - protected static function setDefaultReflectionComposite |
|
58 | - ( |
|
56 | + protected static function setDefaultReflectionComposite( |
|
59 | 57 | ReflectionComposite $defaultReflectionComposite |
60 | 58 | ) |
61 | 59 | { |