@@ -110,8 +110,7 @@ |
||
| 110 | 110 | $prop->setAccessible(true); |
| 111 | 111 | |
| 112 | 112 | return $prop; |
| 113 | - } |
|
| 114 | - catch (ReflectionException $e) |
|
| 113 | + } catch (ReflectionException $e) |
|
| 115 | 114 | { |
| 116 | 115 | throw new $class |
| 117 | 116 | ( |
@@ -93,8 +93,7 @@ discard block |
||
| 93 | 93 | { |
| 94 | 94 | $as .= $token[1]; |
| 95 | 95 | } |
| 96 | - } |
|
| 97 | - elseif ($matching) |
|
| 96 | + } elseif ($matching) |
|
| 98 | 97 | { |
| 99 | 98 | switch ($token[0]) |
| 100 | 99 | { |
@@ -105,8 +104,7 @@ discard block |
||
| 105 | 104 | case T_AS: |
| 106 | 105 | $matching = T_AS; |
| 107 | 106 | } |
| 108 | - } |
|
| 109 | - else |
|
| 107 | + } else |
|
| 110 | 108 | { |
| 111 | 109 | switch ($token[0]) |
| 112 | 110 | { |
@@ -12,8 +12,7 @@ discard block |
||
| 12 | 12 | if ($property->writable) |
| 13 | 13 | { |
| 14 | 14 | parent::setAnyValue($property, $value); |
| 15 | - } |
|
| 16 | - else |
|
| 15 | + } else |
|
| 17 | 16 | { |
| 18 | 17 | throw new PropertyNotWritableException |
| 19 | 18 | ( |
@@ -32,8 +31,7 @@ discard block |
||
| 32 | 31 | get_class($this->object), |
| 33 | 32 | $property |
| 34 | 33 | ); |
| 35 | - } |
|
| 36 | - elseif (!$this->reflect->properties[$property]->readable) |
|
| 34 | + } elseif (!$this->reflect->properties[$property]->readable) |
|
| 37 | 35 | { |
| 38 | 36 | throw new PropertyNotReadableException |
| 39 | 37 | ( |
@@ -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; |
@@ -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) |
@@ -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; |
@@ -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; |
@@ -46,8 +46,7 @@ |
||
| 46 | 46 | if (!$matches) |
| 47 | 47 | { |
| 48 | 48 | $this->classname = $classname; |
| 49 | - } |
|
| 50 | - else |
|
| 49 | + } else |
|
| 51 | 50 | { |
| 52 | 51 | $this->classname = $matches[2]; |
| 53 | 52 | $this->namespace = $matches[1]; |
@@ -17,11 +17,6 @@ |
||
| 17 | 17 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; |
| 18 | 18 | use Spaark\CompositeUtils\Model\Reflection\ReflectionProperty; |
| 19 | 19 | use Spaark\CompositeUtils\Model\Reflection\Type\ObjectType; |
| 20 | -use Spaark\CompositeUtils\Model\Reflection\Type\MixedType; |
|
| 21 | -use Spaark\CompositeUtils\Model\Reflection\Type\StringType; |
|
| 22 | -use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; |
|
| 23 | -use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType; |
|
| 24 | -use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; |
|
| 25 | 20 | use Spaark\CompositeUtils\Model\Reflection\Type\ScalarType; |
| 26 | 21 | use Spaark\CompositeUtils\Model\Reflection\Type\AbstractType; |
| 27 | 22 | use Spaark\CompositeUtils\Exception\CannotWritePropertyException; |
@@ -88,15 +88,13 @@ discard block |
||
| 88 | 88 | if ($building) |
| 89 | 89 | { |
| 90 | 90 | $this->buildProperty($property); |
| 91 | - } |
|
| 92 | - else |
|
| 91 | + } else |
|
| 93 | 92 | { |
| 94 | 93 | if (isset($args[$i])) |
| 95 | 94 | { |
| 96 | 95 | $this->setAnyValue($property, $args[$i]); |
| 97 | 96 | $i++; |
| 98 | - } |
|
| 99 | - else |
|
| 97 | + } else |
|
| 100 | 98 | { |
| 101 | 99 | $building = true; |
| 102 | 100 | $this->buildProperty($property); |
@@ -120,8 +118,7 @@ discard block |
||
| 120 | 118 | if (!$property->type instanceof ObjectType) |
| 121 | 119 | { |
| 122 | 120 | $this->setAnyValue($property, 0); |
| 123 | - } |
|
| 124 | - elseif ($property->builtInConstructor) |
|
| 121 | + } elseif ($property->builtInConstructor) |
|
| 125 | 122 | { |
| 126 | 123 | $class = (string)$property->type->classname; |
| 127 | 124 | $this->setRawValue($property->name, new $class()); |
@@ -175,8 +172,7 @@ discard block |
||
| 175 | 172 | if ($value instanceof Generic) |
| 176 | 173 | { |
| 177 | 174 | $valueType = $value->getObjectType(); |
| 178 | - } |
|
| 179 | - else |
|
| 175 | + } else |
|
| 180 | 176 | { |
| 181 | 177 | $valueType = (new TypeParser())->parseFromType($value); |
| 182 | 178 | } |
@@ -184,12 +180,10 @@ discard block |
||
| 184 | 180 | if ($comparator->compatible($property->type, $valueType)) |
| 185 | 181 | { |
| 186 | 182 | $this->setRawValue($property->name, $value); |
| 187 | - } |
|
| 188 | - elseif ($property->type instanceof ScalarType) |
|
| 183 | + } elseif ($property->type instanceof ScalarType) |
|
| 189 | 184 | { |
| 190 | 185 | $this->setScalarValue($property, $valueType, $value); |
| 191 | - } |
|
| 192 | - else |
|
| 186 | + } else |
|
| 193 | 187 | { |
| 194 | 188 | $this->throwError($property, $valueType); |
| 195 | 189 | } |
@@ -218,8 +212,7 @@ discard block |
||
| 218 | 212 | $property->name, |
| 219 | 213 | $property->type->cast($value) |
| 220 | 214 | ); |
| 221 | - } |
|
| 222 | - elseif (is_object($value) && method_exists([$value, $method])) |
|
| 215 | + } elseif (is_object($value) && method_exists([$value, $method])) |
|
| 223 | 216 | { |
| 224 | 217 | $this->setScalarValue |
| 225 | 218 | ( |
@@ -227,8 +220,7 @@ discard block |
||
| 227 | 220 | $valueType, |
| 228 | 221 | $value->$method() |
| 229 | 222 | ); |
| 230 | - } |
|
| 231 | - else |
|
| 223 | + } else |
|
| 232 | 224 | { |
| 233 | 225 | $this->throwError($property, $valueType); |
| 234 | 226 | } |
@@ -46,12 +46,10 @@ |
||
| 46 | 46 | ) |
| 47 | 47 | { |
| 48 | 48 | return true; |
| 49 | - } |
|
| 50 | - elseif ($parent instanceof ScalarType) |
|
| 49 | + } elseif ($parent instanceof ScalarType) |
|
| 51 | 50 | { |
| 52 | 51 | return get_class($parent) === get_class($child); |
| 53 | - } |
|
| 54 | - elseif ($parent instanceof ObjectType) |
|
| 52 | + } elseif ($parent instanceof ObjectType) |
|
| 55 | 53 | { |
| 56 | 54 | if |
| 57 | 55 | ( |