| @@ -16,15 +16,8 @@ | ||
| 16 | 16 | |
| 17 | 17 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; | 
| 18 | 18 | use Spaark\CompositeUtils\Model\Reflection\ReflectionMethod; | 
| 19 | -use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType; | |
| 20 | -use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; | |
| 21 | -use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; | |
| 22 | -use Spaark\CompositeUtils\Model\Reflection\Type\MixedType; | |
| 23 | 19 | use Spaark\CompositeUtils\Model\Reflection\Type\ObjectType; | 
| 24 | -use Spaark\CompositeUtils\Model\Reflection\Type\StringType; | |
| 25 | -use Spaark\CompositeUtils\Model\Reflection\Type\GenericType; | |
| 26 | 20 | use Spaark\CompositeUtils\Model\Generic\GenericContext; | 
| 27 | -use Spaark\CompositeUtils\Service\RawPropertyAccessor; | |
| 28 | 21 | use Spaark\CompositeUtils\Service\GenericNameProvider; | 
| 29 | 22 | use Spaark\CompositeUtils\Traits\AutoConstructTrait; | 
| 30 | 23 | |
| @@ -17,7 +17,6 @@ | ||
| 17 | 17 | use Spaark\CompositeUtils\Model\Reflection\Type\AbstractType; | 
| 18 | 18 | use Spaark\CompositeUtils\Model\Reflection\Type\ObjectType; | 
| 19 | 19 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; | 
| 20 | -use Spaark\CompositeUtils\Traits\AllReadableTrait; | |
| 21 | 20 | use Spaark\CompositeUtils\Traits\AutoConstructTrait; | 
| 22 | 21 | |
| 23 | 22 | /** | 
| @@ -20,7 +20,6 @@ | ||
| 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 | 25 | use Spaark\CompositeUtils\Model\Generic\GenericContext; | 
| @@ -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]; | 
| @@ -83,15 +83,13 @@ discard block | ||
| 83 | 83 | if ($building) | 
| 84 | 84 |              { | 
| 85 | 85 | $this->buildProperty($property); | 
| 86 | - } | |
| 87 | - else | |
| 86 | + } else | |
| 88 | 87 |              { | 
| 89 | 88 | if (isset($args[$i])) | 
| 90 | 89 |                  { | 
| 91 | 90 | $this->setAnyValue($property, $args[$i]); | 
| 92 | 91 | $i++; | 
| 93 | - } | |
| 94 | - else | |
| 92 | + } else | |
| 95 | 93 |                  { | 
| 96 | 94 | $building = true; | 
| 97 | 95 | $this->buildProperty($property); | 
| @@ -115,8 +113,7 @@ discard block | ||
| 115 | 113 | if (!$property->type instanceof ObjectType) | 
| 116 | 114 |          { | 
| 117 | 115 | $this->setAnyValue($property, 0); | 
| 118 | - } | |
| 119 | - elseif ($property->builtInConstructor) | |
| 116 | + } elseif ($property->builtInConstructor) | |
| 120 | 117 |          { | 
| 121 | 118 | $class = (string)$property->type->classname; | 
| 122 | 119 | $this->setRawValue($property->name, new $class()); | 
| @@ -168,8 +165,7 @@ discard block | ||
| 168 | 165 | if (is_null($value)) | 
| 169 | 166 |          { | 
| 170 | 167 | $this->setNullValue($property); | 
| 171 | - } | |
| 172 | - else | |
| 168 | + } else | |
| 173 | 169 |          { | 
| 174 | 170 | $this->setNonNullValue($property, $value); | 
| 175 | 171 | } | 
| @@ -185,8 +181,7 @@ discard block | ||
| 185 | 181 | if ($property->type->nullable) | 
| 186 | 182 |          { | 
| 187 | 183 | $this->setRawValue($property->name, null); | 
| 188 | - } | |
| 189 | - else | |
| 184 | + } else | |
| 190 | 185 |          { | 
| 191 | 186 | $this->throwError($property, 'NonNull', null); | 
| 192 | 187 | } | 
| @@ -261,8 +256,7 @@ discard block | ||
| 261 | 256 | if (is_scalar($value)) | 
| 262 | 257 |          { | 
| 263 | 258 | $this->setRawValue($property->name, $cast($value)); | 
| 264 | - } | |
| 265 | - elseif (is_object($value) && method_exists([$value, $method])) | |
| 259 | + } elseif (is_object($value) && method_exists([$value, $method])) | |
| 266 | 260 |          { | 
| 267 | 261 | $this->setScalarValue | 
| 268 | 262 | ( | 
| @@ -271,8 +265,7 @@ discard block | ||
| 271 | 265 | $method, | 
| 272 | 266 | $cast | 
| 273 | 267 | ); | 
| 274 | - } | |
| 275 | - else | |
| 268 | + } else | |
| 276 | 269 |          { | 
| 277 | 270 | $this->throwError($property, $name, $value); | 
| 278 | 271 | } | 
| @@ -293,8 +286,7 @@ discard block | ||
| 293 | 286 | if (is_a($value, $property->type->classname)) | 
| 294 | 287 |          { | 
| 295 | 288 | $this->setRawValue($property->name, $value); | 
| 296 | - } | |
| 297 | - else | |
| 289 | + } else | |
| 298 | 290 |          { | 
| 299 | 291 | $this->throwError | 
| 300 | 292 | ( | 
| @@ -320,8 +312,7 @@ discard block | ||
| 320 | 312 | if (is_a($value, \ArrayAccess::class) || is_array($value)) | 
| 321 | 313 |          { | 
| 322 | 314 | $this->setRawValue($property->name, $value); | 
| 323 | - } | |
| 324 | - else | |
| 315 | + } else | |
| 325 | 316 |          { | 
| 326 | 317 | $this->throwError($property, 'Collection', $value); | 
| 327 | 318 | } |