@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; |
| 6 | 6 | use Spaark\CompositeUtils\Model\Reflection\ReflectionProperty; |
| 7 | -use Spaark\CompositeUtils\Model\Reflection\ReflectionParameter; |
|
| 8 | 7 | use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType; |
| 9 | 8 | use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; |
| 10 | 9 | use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; |
@@ -66,8 +66,7 @@ discard block |
||
| 66 | 66 | if ($value{0} !== '?') |
| 67 | 67 | { |
| 68 | 68 | $nullable = false; |
| 69 | - } |
|
| 70 | - else |
|
| 69 | + } else |
|
| 71 | 70 | { |
| 72 | 71 | $nullable = true; |
| 73 | 72 | $value = substr($value, 1); |
@@ -76,8 +75,7 @@ discard block |
||
| 76 | 75 | if (substr($value, -2) !== '[]') |
| 77 | 76 | { |
| 78 | 77 | $collection = false; |
| 79 | - } |
|
| 80 | - else |
|
| 78 | + } else |
|
| 81 | 79 | { |
| 82 | 80 | $collection = true; |
| 83 | 81 | $value = substr($value, 0, -2); |
@@ -110,8 +108,7 @@ discard block |
||
| 110 | 108 | if ($useStatements->contains($value)) |
| 111 | 109 | { |
| 112 | 110 | $value = $useStatements[$value]->classname; |
| 113 | - } |
|
| 114 | - else |
|
| 111 | + } else |
|
| 115 | 112 | { |
| 116 | 113 | $value = $this->object->owner->namespace->namespace |
| 117 | 114 | . '\\' . $value; |
@@ -23,8 +23,7 @@ |
||
| 23 | 23 | if ($this->locked) |
| 24 | 24 | { |
| 25 | 25 | return parent::__set($var, $val); |
| 26 | - } |
|
| 27 | - else |
|
| 26 | + } else |
|
| 28 | 27 | { |
| 29 | 28 | $this->$var = $val; |
| 30 | 29 | } |
@@ -43,7 +43,9 @@ |
||
| 43 | 43 | */ |
| 44 | 44 | public function popMultiple($i = 1) |
| 45 | 45 | { |
| 46 | - if ($i < 1) return NULL; |
|
| 46 | + if ($i < 1) { |
|
| 47 | + return NULL; |
|
| 48 | + } |
|
| 47 | 49 | |
| 48 | 50 | $ret = array_slice($this->data, -1 * $i); |
| 49 | 51 | $this->data = array_slice($this->data, 0, -1 * $i); |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Spaark\CompositeUtils\Factory\Reflection; |
| 4 | 4 | |
| 5 | -use Spaark\CompositeUtils\Factory\BaseFactory; |
|
| 6 | 5 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; |
| 7 | 6 | use \ReflectionClass as PHPNativeReflectionClass; |
| 8 | 7 | |
@@ -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 | { |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use Spaark\CompositeUtils\Model\Reflection\Type\StringType; |
| 9 | 9 | use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; |
| 10 | 10 | use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType; |
| 11 | -use Spaark\CompositeUtils\Model\Reflection\Type\FloatType; |
|
| 12 | 11 | use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; |
| 13 | 12 | use Spaark\CompositeUtils\Exception\CannotWritePropertyException; |
| 14 | 13 | use Spaark\CompositeUtils\Exception\IllegalPropertyTypeException; |
@@ -65,15 +65,13 @@ discard block |
||
| 65 | 65 | if ($building) |
| 66 | 66 | { |
| 67 | 67 | $this->buildProperty($property); |
| 68 | - } |
|
| 69 | - else |
|
| 68 | + } else |
|
| 70 | 69 | { |
| 71 | 70 | if (isset($args[$i])) |
| 72 | 71 | { |
| 73 | 72 | $this->setAnyValue($property, $args[$i]); |
| 74 | 73 | $i++; |
| 75 | - } |
|
| 76 | - else |
|
| 74 | + } else |
|
| 77 | 75 | { |
| 78 | 76 | $building = true; |
| 79 | 77 | $this->buildProperty($property); |
@@ -93,8 +91,7 @@ discard block |
||
| 93 | 91 | { |
| 94 | 92 | $class = $property->type->classname; |
| 95 | 93 | $this->setRawValue($property->name, new $class()); |
| 96 | - } |
|
| 97 | - else |
|
| 94 | + } else |
|
| 98 | 95 | { |
| 99 | 96 | $this->setAnyValue($property, 0); |
| 100 | 97 | } |
@@ -127,8 +124,7 @@ discard block |
||
| 127 | 124 | if (is_null($value)) |
| 128 | 125 | { |
| 129 | 126 | $this->setNullValue($property->name, $property->type); |
| 130 | - } |
|
| 131 | - else |
|
| 127 | + } else |
|
| 132 | 128 | { |
| 133 | 129 | $this->setNonNullValue |
| 134 | 130 | ( |
@@ -144,8 +140,7 @@ discard block |
||
| 144 | 140 | if ($type->nullable) |
| 145 | 141 | { |
| 146 | 142 | $this->setRawValue($property, null); |
| 147 | - } |
|
| 148 | - else |
|
| 143 | + } else |
|
| 149 | 144 | { |
| 150 | 145 | $this->throwError($property, 'NonNull', null); |
| 151 | 146 | } |
@@ -195,8 +190,7 @@ discard block |
||
| 195 | 190 | if (is_scalar($value)) |
| 196 | 191 | { |
| 197 | 192 | $this->setRawValue($property, $cast($value)); |
| 198 | - } |
|
| 199 | - elseif (is_object($value) && method_exists([$value, $method])) |
|
| 193 | + } elseif (is_object($value) && method_exists([$value, $method])) |
|
| 200 | 194 | { |
| 201 | 195 | $this->setScalarValue |
| 202 | 196 | ( |
@@ -205,8 +199,7 @@ discard block |
||
| 205 | 199 | $method, |
| 206 | 200 | $cast |
| 207 | 201 | ); |
| 208 | - } |
|
| 209 | - else |
|
| 202 | + } else |
|
| 210 | 203 | { |
| 211 | 204 | $this->throwError($property, $name, $value); |
| 212 | 205 | } |
@@ -217,8 +210,7 @@ discard block |
||
| 217 | 210 | if (is_a($value, $type->classname)) |
| 218 | 211 | { |
| 219 | 212 | $this->setRawValue($property, $value); |
| 220 | - } |
|
| 221 | - else |
|
| 213 | + } else |
|
| 222 | 214 | { |
| 223 | 215 | $this->throwError($property, $type->classname, $value); |
| 224 | 216 | } |
@@ -229,8 +221,7 @@ discard block |
||
| 229 | 221 | if (is_a($value, \ArrayAccess::class) || is_array($value)) |
| 230 | 222 | { |
| 231 | 223 | $this->setRawValue($property, $value); |
| 232 | - } |
|
| 233 | - else |
|
| 224 | + } else |
|
| 234 | 225 | { |
| 235 | 226 | $this->throwError($property, 'Collection', $value); |
| 236 | 227 | } |
@@ -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 | ( |