@@ -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 | { |
@@ -15,14 +15,8 @@ |
||
15 | 15 | namespace Spaark\CompositeUtils\Factory\Reflection; |
16 | 16 | |
17 | 17 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; |
18 | -use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType; |
|
19 | -use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; |
|
20 | -use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; |
|
21 | -use Spaark\CompositeUtils\Model\Reflection\Type\MixedType; |
|
22 | 18 | use Spaark\CompositeUtils\Model\Reflection\Type\ObjectType; |
23 | -use Spaark\CompositeUtils\Model\Reflection\Type\StringType; |
|
24 | 19 | use Spaark\CompositeUtils\Model\Reflection\Type\GenericType; |
25 | -use Spaark\CompositeUtils\Service\RawPropertyAccessor; |
|
26 | 20 | use Spaark\CompositeUtils\Service\GenericNameProvider; |
27 | 21 | |
28 | 22 | /** |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $i = 0; |
66 | 66 | |
67 | 67 | $code = |
68 | - '<?php namespace ' . $namespace . ';' |
|
68 | + '<?php namespace ' . $namespace . ';' |
|
69 | 69 | . 'class ' . $baseClass . ' extends ' . $originalClass |
70 | 70 | . '{'; |
71 | 71 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | return |
110 | - ($method->scope === 'static' ? 'static ' : '') |
|
110 | + ($method->scope === 'static' ? 'static ' : '') |
|
111 | 111 | . 'function ' . $method->name |
112 | 112 | . '(' . implode(',', $params) . '){' |
113 | 113 | . '__generic_' . $method->name |
@@ -92,8 +92,7 @@ |
||
92 | 92 | } |
93 | 93 | else |
94 | 94 | { |
95 | - $index = $this->reflect->generics->indexOfKey |
|
96 | - ( |
|
95 | + $index = $this->reflect->generics->indexOfKey( |
|
97 | 96 | $param->type->name |
98 | 97 | ); |
99 | 98 |
@@ -89,8 +89,7 @@ |
||
89 | 89 | if (!$param->type instanceof GenericType) |
90 | 90 | { |
91 | 91 | $type = $param->type; |
92 | - } |
|
93 | - else |
|
92 | + } else |
|
94 | 93 | { |
95 | 94 | $index = $this->reflect->generics->indexOfKey |
96 | 95 | ( |