@@ -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); |
@@ -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) |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $item = $stack->pop(); |
| 101 | 101 | if ($value{$i - 1} !== '>') |
| 102 | 102 | { |
| 103 | - $item->generics[] =$this->resolveName(); |
|
| 103 | + $item->generics[] = $this->resolveName(); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | if ($i + 1 !== strlen($value) && $value{$i + 1} === '[') |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | } |
| 149 | 149 | elseif ($i + 2 !== strlen($value)) |
| 150 | 150 | { |
| 151 | - if (!in_array($value{$i + 2}, ['>',','])) |
|
| 151 | + if (!in_array($value{$i + 2}, ['>', ','])) |
|
| 152 | 152 | { |
| 153 | 153 | throw new \Exception('Unexpected char after collection'); |
| 154 | 154 | } |
@@ -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; |