@@ -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 |
@@ -41,8 +41,7 @@ discard block |
||
41 | 41 | return static::$defaultHashProducer; |
42 | 42 | } |
43 | 43 | |
44 | - public static function setDefaultHashProducer |
|
45 | - ( |
|
44 | + public static function setDefaultHashProducer( |
|
46 | 45 | HashProducerInterface $hashProducer |
47 | 46 | ) |
48 | 47 | : HashProducerInterface |
@@ -60,9 +59,8 @@ discard block |
||
60 | 59 | */ |
61 | 60 | protected $hashProducer; |
62 | 61 | |
63 | - public function __construct |
|
64 | - ( |
|
65 | - ?HashProducerInterface $hashProducer = null |
|
62 | + public function __construct( |
|
63 | + ? HashProducerInterface $hashProducer = null |
|
66 | 64 | ) |
67 | 65 | { |
68 | 66 | $this->hashProducer = |
@@ -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 | { |
@@ -29,8 +29,7 @@ |
||
29 | 29 | if ($offset === null) |
30 | 30 | { |
31 | 31 | $this->add($value); |
32 | - } |
|
33 | - else |
|
32 | + } else |
|
34 | 33 | { |
35 | 34 | $this->set($offset, $value); |
36 | 35 | } |
@@ -130,7 +130,7 @@ |
||
130 | 130 | * |
131 | 131 | * @param string $name |
132 | 132 | * @param bool $checkFile |
133 | - * @param string $singular |
|
133 | + * @param string $signular |
|
134 | 134 | */ |
135 | 135 | protected function addItems |
136 | 136 | ( |
@@ -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 Spaark\CompositeUtils\Model\Reflection\ReflectionProperty; |
20 | 19 | use Spaark\CompositeUtils\Model\Reflection\ReflectionMethod; |
@@ -157,7 +157,7 @@ |
||
157 | 157 | else |
158 | 158 | { |
159 | 159 | $factory = |
160 | - '\Spaark\CompositeUtils\Factory\Reflection' |
|
160 | + '\Spaark\CompositeUtils\Factory\Reflection' |
|
161 | 161 | . '\Reflection' . $signular . 'Factory'; |
162 | 162 | $item = $this->{'build' . $signular} |
163 | 163 | ( |
@@ -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); |
@@ -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) |
@@ -99,7 +99,7 @@ |
||
99 | 99 | * Infers the serialized name of the given ObjectType |
100 | 100 | * |
101 | 101 | * @param ObjectType $reflect |
102 | - * @return string |
|
102 | + * @return ClassName |
|
103 | 103 | */ |
104 | 104 | protected function inferObjectName(ObjectType $reflect) |
105 | 105 | { |
@@ -117,7 +117,7 @@ |
||
117 | 117 | |
118 | 118 | return new ClassName |
119 | 119 | ( |
120 | - self::BASE . $reflect->classname |
|
120 | + self::BASE . $reflect->classname |
|
121 | 121 | . '_g' . implode('_c', $items) . '_e' |
122 | 122 | ); |
123 | 123 | } |
@@ -20,10 +20,8 @@ |
||
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 | 24 | use Spaark\CompositeUtils\Model\Reflection\Type\GenericType; |
26 | -use Spaark\CompositeUtils\Model\Generic\GenericContext; |
|
27 | 25 | use Spaark\CompositeUtils\Exception\MissingContextException; |
28 | 26 | use Spaark\CompositeUtils\Traits\HasGenericContextTrait; |
29 | 27 | use Spaark\CompositeUtils\Model\ClassName; |
@@ -63,8 +63,7 @@ discard block |
||
63 | 63 | return $this->inferGenericName($reflect); |
64 | 64 | } |
65 | 65 | |
66 | - throw new \DomainException |
|
67 | - ( |
|
66 | + throw new \DomainException( |
|
68 | 67 | 'Unknown type: ' . get_class($reflect) |
69 | 68 | ); |
70 | 69 | } |
@@ -101,8 +100,7 @@ discard block |
||
101 | 100 | $items[] = $this->inferName($generic); |
102 | 101 | } |
103 | 102 | |
104 | - return new ClassName |
|
105 | - ( |
|
103 | + return new ClassName( |
|
106 | 104 | self::BASE . $reflect->classname |
107 | 105 | . '_g' . implode('_c', $items) . '_e' |
108 | 106 | ); |
@@ -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; |
@@ -225,6 +225,9 @@ |
||
225 | 225 | : new ObjectType($context); |
226 | 226 | } |
227 | 227 | |
228 | + /** |
|
229 | + * @param string $var |
|
230 | + */ |
|
228 | 231 | public function scalarToType($var) : ?AbstractType |
229 | 232 | { |
230 | 233 | switch (strtolower($var)) |
@@ -89,8 +89,7 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function parseObjectName($var) : ObjectType |
91 | 91 | { |
92 | - return $this->parse(str_replace |
|
93 | - ( |
|
92 | + return $this->parse(str_replace( |
|
94 | 93 | [GenericNameProvider::BASE, '_g', '_e', '_c'], |
95 | 94 | ['', '<', '>', ','], |
96 | 95 | get_class($var) |
@@ -135,7 +134,7 @@ discard block |
||
135 | 134 | $item = $stack->pop(); |
136 | 135 | if ($value{$i - 1} !== '>') |
137 | 136 | { |
138 | - $item->generics[] =$this->resolveName(); |
|
137 | + $item->generics[] = $this->resolveName(); |
|
139 | 138 | } |
140 | 139 | |
141 | 140 | if ($i + 1 !== strlen($value) && $value{$i + 1} === '[') |
@@ -183,7 +182,7 @@ discard block |
||
183 | 182 | } |
184 | 183 | elseif ($i + 2 !== strlen($value)) |
185 | 184 | { |
186 | - if (!in_array($value{$i + 2}, ['>',','])) |
|
185 | + if (!in_array($value{$i + 2}, ['>', ','])) |
|
187 | 186 | { |
188 | 187 | throw new \Exception('Unexpected char after collection'); |
189 | 188 | } |
@@ -226,7 +225,7 @@ discard block |
||
226 | 225 | : new ObjectType($context); |
227 | 226 | } |
228 | 227 | |
229 | - public function scalarToType($var) : ?AbstractType |
|
228 | + public function scalarToType($var) : ? AbstractType |
|
230 | 229 | { |
231 | 230 | switch (strtolower($var)) |
232 | 231 | { |
@@ -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; |