@@ -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 | |
@@ -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) |
@@ -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); |
@@ -110,8 +110,7 @@ discard block |
||
| 110 | 110 | if ($stack->isEmpty()) |
| 111 | 111 | { |
| 112 | 112 | return $item; |
| 113 | - } |
|
| 114 | - else |
|
| 113 | + } else |
|
| 115 | 114 | { |
| 116 | 115 | $stack->top()->generics[] = $item; |
| 117 | 116 | } |
@@ -129,12 +128,10 @@ discard block |
||
| 129 | 128 | if ($i + 1 === strlen($value)) |
| 130 | 129 | { |
| 131 | 130 | throw new \Exception('Unexpected EOF'); |
| 132 | - } |
|
| 133 | - elseif ($value{$i + 1} !== ']') |
|
| 131 | + } elseif ($value{$i + 1} !== ']') |
|
| 134 | 132 | { |
| 135 | 133 | throw new \Exception('[ must be followed by ]'); |
| 136 | - } |
|
| 137 | - elseif ($i + 2 !== strlen($value)) |
|
| 134 | + } elseif ($i + 2 !== strlen($value)) |
|
| 138 | 135 | { |
| 139 | 136 | if (!in_array($value{$i + 2}, ['>',','])) |
| 140 | 137 | { |
@@ -194,12 +191,10 @@ discard block |
||
| 194 | 191 | if ($useStatements->containsKey($value)) |
| 195 | 192 | { |
| 196 | 193 | $value = $useStatements[$value]->classname; |
| 197 | - } |
|
| 198 | - elseif ($generics->containsKey($value)) |
|
| 194 | + } elseif ($generics->containsKey($value)) |
|
| 199 | 195 | { |
| 200 | 196 | $value = new GenericType($value); |
| 201 | - } |
|
| 202 | - else |
|
| 197 | + } else |
|
| 203 | 198 | { |
| 204 | 199 | $value = $this->context->namespace->namespace |
| 205 | 200 | . '\\' . $value; |