@@ -14,8 +14,6 @@ |
||
| 14 | 14 | |
| 15 | 15 | namespace Spaark\CompositeUtils\Model\Collection; |
| 16 | 16 | |
| 17 | -use Spaark\CompositeUtils\Traits\AutoConstructTrait; |
|
| 18 | - |
|
| 19 | 17 | /** |
| 20 | 18 | * Abstract Iterator for Map datatypes |
| 21 | 19 | * |
@@ -65,8 +65,7 @@ discard block |
||
| 65 | 65 | { |
| 66 | 66 | if (!isset($args[$i])) |
| 67 | 67 | { |
| 68 | - throw new MissingRequiredParameterException |
|
| 69 | - ( |
|
| 68 | + throw new MissingRequiredParameterException( |
|
| 70 | 69 | get_class($this->object), |
| 71 | 70 | $property->name |
| 72 | 71 | ); |
@@ -144,14 +143,12 @@ discard block |
||
| 144 | 143 | { |
| 145 | 144 | if (!$this->reflect->properties->containsKey($property)) |
| 146 | 145 | { |
| 147 | - throw new CannotWritePropertyException |
|
| 148 | - ( |
|
| 146 | + throw new CannotWritePropertyException( |
|
| 149 | 147 | get_class($this->object), $property |
| 150 | 148 | ); |
| 151 | 149 | } |
| 152 | 150 | |
| 153 | - $this->setAnyValue |
|
| 154 | - ( |
|
| 151 | + $this->setAnyValue( |
|
| 155 | 152 | $this->reflect->properties[$property], |
| 156 | 153 | $value |
| 157 | 154 | ); |
@@ -198,8 +195,7 @@ discard block |
||
| 198 | 195 | * @param ReflectionProperty $property The property to set |
| 199 | 196 | * @param mixed $value The value to set |
| 200 | 197 | */ |
| 201 | - private function setNonNullValue |
|
| 202 | - ( |
|
| 198 | + private function setNonNullValue( |
|
| 203 | 199 | ReflectionProperty $property, |
| 204 | 200 | $value |
| 205 | 201 | ) |
@@ -248,8 +244,7 @@ discard block |
||
| 248 | 244 | * @param callable $cast Method to cast a value to the scalar data |
| 249 | 245 | * type |
| 250 | 246 | */ |
| 251 | - private function setScalarValue |
|
| 252 | - ( |
|
| 247 | + private function setScalarValue( |
|
| 253 | 248 | ReflectionProperty $property, |
| 254 | 249 | $value, |
| 255 | 250 | string $name, |
@@ -264,8 +259,7 @@ discard block |
||
| 264 | 259 | } |
| 265 | 260 | elseif (is_object($value) && method_exists([$value, $method])) |
| 266 | 261 | { |
| 267 | - $this->setScalarValue |
|
| 268 | - ( |
|
| 262 | + $this->setScalarValue( |
|
| 269 | 263 | $property, |
| 270 | 264 | $value->$method(), |
| 271 | 265 | $method, |
@@ -284,8 +278,7 @@ discard block |
||
| 284 | 278 | * @param ReflectionProperty $property The property to set |
| 285 | 279 | * @param mixed $value The value to set |
| 286 | 280 | */ |
| 287 | - private function setObjectValue |
|
| 288 | - ( |
|
| 281 | + private function setObjectValue( |
|
| 289 | 282 | ReflectionProperty $property, |
| 290 | 283 | $value |
| 291 | 284 | ) |
@@ -296,8 +289,7 @@ discard block |
||
| 296 | 289 | } |
| 297 | 290 | else |
| 298 | 291 | { |
| 299 | - $this->throwError |
|
| 300 | - ( |
|
| 292 | + $this->throwError( |
|
| 301 | 293 | $property, |
| 302 | 294 | $property->type->classname, |
| 303 | 295 | $value |
@@ -311,8 +303,7 @@ discard block |
||
| 311 | 303 | * @param ReflectionProperty $property The property to set |
| 312 | 304 | * @param mixed The value to set |
| 313 | 305 | */ |
| 314 | - private function setCollectionValue |
|
| 315 | - ( |
|
| 306 | + private function setCollectionValue( |
|
| 316 | 307 | ReflectionProperty $property, |
| 317 | 308 | $value |
| 318 | 309 | ) |
@@ -334,15 +325,13 @@ discard block |
||
| 334 | 325 | * @param string $expected The expected datatype |
| 335 | 326 | * @param string $value The value being set |
| 336 | 327 | */ |
| 337 | - private function throwError |
|
| 338 | - ( |
|
| 328 | + private function throwError( |
|
| 339 | 329 | ReflectionProperty $property, |
| 340 | 330 | string $expected, |
| 341 | 331 | $value |
| 342 | 332 | ) |
| 343 | 333 | { |
| 344 | - throw new IllegalPropertyTypeException |
|
| 345 | - ( |
|
| 334 | + throw new IllegalPropertyTypeException( |
|
| 346 | 335 | get_class($this->object), |
| 347 | 336 | $property->name, |
| 348 | 337 | $expected, |
@@ -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 = $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 | } |
@@ -45,10 +45,9 @@ |
||
| 45 | 45 | /** |
| 46 | 46 | * {@inheritDoc} |
| 47 | 47 | */ |
| 48 | - public function splice |
|
| 49 | - ( |
|
| 48 | + public function splice( |
|
| 50 | 49 | int $offset, |
| 51 | - ?int $length = null, |
|
| 50 | + ? int $length = null, |
|
| 52 | 51 | array $replacement = [] |
| 53 | 52 | ) |
| 54 | 53 | { |
@@ -33,10 +33,9 @@ |
||
| 33 | 33 | * @param int $length The number of elements to remove |
| 34 | 34 | * @param array $items Items to add |
| 35 | 35 | */ |
| 36 | - public function splice |
|
| 37 | - ( |
|
| 36 | + public function splice( |
|
| 38 | 37 | int $offset, |
| 39 | - ?int$length = null, |
|
| 38 | + ? int$length = null, |
|
| 40 | 39 | array $items = [] |
| 41 | 40 | ); |
| 42 | 41 | |
@@ -41,8 +41,7 @@ discard block |
||
| 41 | 41 | return static::$defaultHashProducer; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - public static function setDefaultHashProducer |
|
| 45 | - ( |
|
| 44 | + public static function setDefaultHashProducer( |
|
| 46 | 45 | HashProducerInterface $hashProducer |
| 47 | 46 | ) |
| 48 | 47 | : HashProducerInterface |
@@ -60,9 +59,8 @@ discard block |
||
| 60 | 59 | */ |
| 61 | 60 | protected $hashProducer; |
| 62 | 61 | |
| 63 | - public function __construct |
|
| 64 | - ( |
|
| 65 | - ?HashProducerInterface $hashProducer = null |
|
| 62 | + public function __construct( |
|
| 63 | + ? HashProducerInterface $hashProducer = null |
|
| 66 | 64 | ) |
| 67 | 65 | { |
| 68 | 66 | $this->hashProducer = |
@@ -45,10 +45,9 @@ |
||
| 45 | 45 | /** |
| 46 | 46 | * {@inheritDoc} |
| 47 | 47 | */ |
| 48 | - public function splice |
|
| 49 | - ( |
|
| 48 | + public function splice( |
|
| 50 | 49 | int $offset, |
| 51 | - ?int $length = null, |
|
| 50 | + ? int $length = null, |
|
| 52 | 51 | array $replacement = [] |
| 53 | 52 | ) |
| 54 | 53 | { |
@@ -39,8 +39,7 @@ discard block |
||
| 39 | 39 | return static::$default; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - public static function setDefault |
|
| 43 | - ( |
|
| 42 | + public static function setDefault( |
|
| 44 | 43 | ReflectionCompositeProviderInterface $default |
| 45 | 44 | ) |
| 46 | 45 | { |
@@ -60,8 +59,7 @@ discard block |
||
| 60 | 59 | { |
| 61 | 60 | $this->cache[$classname] = |
| 62 | 61 | ( |
| 63 | - ReflectionCompositeFactory::fromClassName |
|
| 64 | - ( |
|
| 62 | + ReflectionCompositeFactory::fromClassName( |
|
| 65 | 63 | $classname |
| 66 | 64 | ) |
| 67 | 65 | ) |
@@ -29,8 +29,7 @@ |
||
| 29 | 29 | if ($offset === null) |
| 30 | 30 | { |
| 31 | 31 | $this->add($value); |
| 32 | - } |
|
| 33 | - else |
|
| 32 | + } else |
|
| 34 | 33 | { |
| 35 | 34 | $this->set($offset, $value); |
| 36 | 35 | } |
@@ -130,7 +130,7 @@ |
||
| 130 | 130 | * |
| 131 | 131 | * @param string $name |
| 132 | 132 | * @param bool $checkFile |
| 133 | - * @param string $singular |
|
| 133 | + * @param string $signular |
|
| 134 | 134 | */ |
| 135 | 135 | protected function addItems |
| 136 | 136 | ( |
@@ -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; |
@@ -157,7 +157,7 @@ |
||
| 157 | 157 | else |
| 158 | 158 | { |
| 159 | 159 | $factory = |
| 160 | - '\Spaark\CompositeUtils\Factory\Reflection' |
|
| 160 | + '\Spaark\CompositeUtils\Factory\Reflection' |
|
| 161 | 161 | . '\Reflection' . $signular . 'Factory'; |
| 162 | 162 | $item = $this->{'build' . $signular} |
| 163 | 163 | ( |
@@ -78,8 +78,7 @@ discard block |
||
| 78 | 78 | * @param PHPNativeReflectionClass $reflect |
| 79 | 79 | * @param ReflectionCompositeProviderInterface $provider |
| 80 | 80 | */ |
| 81 | - public function __construct |
|
| 82 | - ( |
|
| 81 | + public function __construct( |
|
| 83 | 82 | PHPNativeReflectionClass $reflect, |
| 84 | 83 | ReflectionCompositeProviderInterface $provider |
| 85 | 84 | ) |
@@ -112,8 +111,7 @@ discard block |
||
| 112 | 111 | $this->addInheritance('interfaces', $interface); |
| 113 | 112 | } |
| 114 | 113 | |
| 115 | - $this->parseDocComment |
|
| 116 | - ([ |
|
| 114 | + $this->parseDocComment([ |
|
| 117 | 115 | 'generic' => 'addGeneric' |
| 118 | 116 | ]); |
| 119 | 117 | |
@@ -122,13 +120,11 @@ discard block |
||
| 122 | 120 | $file = (new ReflectionFileFactory($fileName))->build(); |
| 123 | 121 | $this->accessor->setRawValue('file', $file); |
| 124 | 122 | |
| 125 | - $this->accessor->setRawValue |
|
| 126 | - ( |
|
| 123 | + $this->accessor->setRawValue( |
|
| 127 | 124 | 'classname', |
| 128 | 125 | $this->reflector->name |
| 129 | 126 | ); |
| 130 | - $this->accessor->setRawValue |
|
| 131 | - ( |
|
| 127 | + $this->accessor->setRawValue( |
|
| 132 | 128 | 'namespace', |
| 133 | 129 | $file->namespaces[$this->reflector->getNamespaceName()] |
| 134 | 130 | ); |
@@ -151,8 +147,7 @@ discard block |
||
| 151 | 147 | $size = count($this->reflector->{'get' . $name}()); |
| 152 | 148 | foreach ($prefixes as $prefix) |
| 153 | 149 | { |
| 154 | - $this->accessor->setRawValue |
|
| 155 | - ( |
|
| 150 | + $this->accessor->setRawValue( |
|
| 156 | 151 | $prefix . $name, |
| 157 | 152 | new FixedList($size) |
| 158 | 153 | ); |
@@ -207,8 +202,7 @@ discard block |
||
| 207 | 202 | * @param bool $checkFile |
| 208 | 203 | * @param string $singular |
| 209 | 204 | */ |
| 210 | - protected function addItems |
|
| 211 | - ( |
|
| 205 | + protected function addItems( |
|
| 212 | 206 | string $name, |
| 213 | 207 | bool $checkFile, |
| 214 | 208 | string $signular |
@@ -239,8 +233,7 @@ discard block |
||
| 239 | 233 | new $factory($item), |
| 240 | 234 | $item |
| 241 | 235 | ); |
| 242 | - $this->accessor->rawAddToValue |
|
| 243 | - ( |
|
| 236 | + $this->accessor->rawAddToValue( |
|
| 244 | 237 | 'local' . ucfirst($name), |
| 245 | 238 | $item |
| 246 | 239 | ); |
@@ -257,8 +250,7 @@ discard block |
||
| 257 | 250 | * @param PHPNativeReflectionClass $reflect |
| 258 | 251 | * @param string $method |
| 259 | 252 | */ |
| 260 | - protected function addInheritance |
|
| 261 | - ( |
|
| 253 | + protected function addInheritance( |
|
| 262 | 254 | string $group, |
| 263 | 255 | PHPNativeReflectionClass $reflect, |
| 264 | 256 | string $method = 'rawAddToValue' |
@@ -283,15 +275,13 @@ discard block |
||
| 283 | 275 | * @param ReflectionPropertyFactory $factory |
| 284 | 276 | * @return ReflectionProperty |
| 285 | 277 | */ |
| 286 | - protected function buildProperty |
|
| 287 | - ( |
|
| 278 | + protected function buildProperty( |
|
| 288 | 279 | ReflectionPropertyFactory $factory, |
| 289 | 280 | PHPNativeReflectionProperty $reflect |
| 290 | 281 | ) |
| 291 | 282 | : ReflectionProperty |
| 292 | 283 | { |
| 293 | - return $factory->build |
|
| 294 | - ( |
|
| 284 | + return $factory->build( |
|
| 295 | 285 | $this->object, |
| 296 | 286 | $this->reflector |
| 297 | 287 | ->getDefaultProperties()[$reflect->getName()] |
@@ -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); |