@@ -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) |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | * Infers the serialized name of the given ObjectType |
| 100 | 100 | * |
| 101 | 101 | * @param ObjectType $reflect |
| 102 | - * @return string |
|
| 102 | + * @return ClassName |
|
| 103 | 103 | */ |
| 104 | 104 | protected function inferObjectName(ObjectType $reflect) |
| 105 | 105 | { |
@@ -117,7 +117,7 @@ |
||
| 117 | 117 | |
| 118 | 118 | return new ClassName |
| 119 | 119 | ( |
| 120 | - self::BASE . $reflect->classname |
|
| 120 | + self::BASE . $reflect->classname |
|
| 121 | 121 | . '_g' . implode('_c', $items) . '_e' |
| 122 | 122 | ); |
| 123 | 123 | } |
@@ -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; |
@@ -63,8 +63,7 @@ discard block |
||
| 63 | 63 | return $this->inferGenericName($reflect); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - throw new \DomainException |
|
| 67 | - ( |
|
| 66 | + throw new \DomainException( |
|
| 68 | 67 | 'Unknown type: ' . get_class($reflect) |
| 69 | 68 | ); |
| 70 | 69 | } |
@@ -101,8 +100,7 @@ discard block |
||
| 101 | 100 | $items[] = $this->inferName($generic); |
| 102 | 101 | } |
| 103 | 102 | |
| 104 | - return new ClassName |
|
| 105 | - ( |
|
| 103 | + return new ClassName( |
|
| 106 | 104 | self::BASE . $reflect->classname |
| 107 | 105 | . '_g' . implode('_c', $items) . '_e' |
| 108 | 106 | ); |
@@ -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; |
@@ -225,6 +225,9 @@ |
||
| 225 | 225 | : new ObjectType($context); |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | + /** |
|
| 229 | + * @param string $var |
|
| 230 | + */ |
|
| 228 | 231 | public function scalarToType($var) : ?AbstractType |
| 229 | 232 | { |
| 230 | 233 | switch (strtolower($var)) |
@@ -89,8 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | public function parseObjectName($var) : ObjectType |
| 91 | 91 | { |
| 92 | - return $this->parse(str_replace |
|
| 93 | - ( |
|
| 92 | + return $this->parse(str_replace( |
|
| 94 | 93 | [GenericNameProvider::BASE, '_g', '_e', '_c'], |
| 95 | 94 | ['', '<', '>', ','], |
| 96 | 95 | get_class($var) |
@@ -135,7 +134,7 @@ discard block |
||
| 135 | 134 | $item = $stack->pop(); |
| 136 | 135 | if ($value{$i - 1} !== '>') |
| 137 | 136 | { |
| 138 | - $item->generics[] =$this->resolveName(); |
|
| 137 | + $item->generics[] = $this->resolveName(); |
|
| 139 | 138 | } |
| 140 | 139 | |
| 141 | 140 | if ($i + 1 !== strlen($value) && $value{$i + 1} === '[') |
@@ -183,7 +182,7 @@ discard block |
||
| 183 | 182 | } |
| 184 | 183 | elseif ($i + 2 !== strlen($value)) |
| 185 | 184 | { |
| 186 | - if (!in_array($value{$i + 2}, ['>',','])) |
|
| 185 | + if (!in_array($value{$i + 2}, ['>', ','])) |
|
| 187 | 186 | { |
| 188 | 187 | throw new \Exception('Unexpected char after collection'); |
| 189 | 188 | } |
@@ -226,7 +225,7 @@ discard block |
||
| 226 | 225 | : new ObjectType($context); |
| 227 | 226 | } |
| 228 | 227 | |
| 229 | - public function scalarToType($var) : ?AbstractType |
|
| 228 | + public function scalarToType($var) : ? AbstractType |
|
| 230 | 229 | { |
| 231 | 230 | switch (strtolower($var)) |
| 232 | 231 | { |
@@ -41,8 +41,7 @@ discard block |
||
| 41 | 41 | if (!static::$reflectionComposite) |
| 42 | 42 | { |
| 43 | 43 | static::$reflectionComposite = |
| 44 | - ReflectionCompositeFactory::fromClassName |
|
| 45 | - ( |
|
| 44 | + ReflectionCompositeFactory::fromClassName( |
|
| 46 | 45 | get_called_class() |
| 47 | 46 | ) |
| 48 | 47 | ->build(); |
@@ -54,8 +53,7 @@ discard block |
||
| 54 | 53 | /** |
| 55 | 54 | * Set the default ReflectionComposite for this class |
| 56 | 55 | */ |
| 57 | - protected static function setDefaultReflectionComposite |
|
| 58 | - ( |
|
| 56 | + protected static function setDefaultReflectionComposite( |
|
| 59 | 57 | ReflectionComposite $defaultReflectionComposite |
| 60 | 58 | ) |
| 61 | 59 | { |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | /** |
| 26 | 26 | * Checks if the given class is equal to this one |
| 27 | 27 | * |
| 28 | - * @param Type $oject |
|
| 28 | + * @param Type $object |
|
| 29 | 29 | * @return boolean |
| 30 | 30 | */ |
| 31 | 31 | public function equals($object) : bool; |
@@ -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 | /** |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | { |
| 36 | 36 | parent::__construct |
| 37 | 37 | ( |
| 38 | - 'Cannot serialize object containing generics without ' |
|
| 38 | + 'Cannot serialize object containing generics without ' |
|
| 39 | 39 | . 'context', |
| 40 | 40 | 0, |
| 41 | 41 | $previous |
@@ -28,13 +28,11 @@ |
||
| 28 | 28 | * |
| 29 | 29 | * @param Throwable $previous The exception which caused this |
| 30 | 30 | */ |
| 31 | - public function __construct |
|
| 32 | - ( |
|
| 31 | + public function __construct( |
|
| 33 | 32 | Throwable $previous = null |
| 34 | 33 | ) |
| 35 | 34 | { |
| 36 | - parent::__construct |
|
| 37 | - ( |
|
| 35 | + parent::__construct( |
|
| 38 | 36 | 'Cannot serialize object containing generics without ' |
| 39 | 37 | . 'context', |
| 40 | 38 | 0, |
@@ -54,8 +54,7 @@ discard block |
||
| 54 | 54 | * |
| 55 | 55 | * @param ReflectionCompositeProviderInterface $default |
| 56 | 56 | */ |
| 57 | - public static function setDefault |
|
| 58 | - ( |
|
| 57 | + public static function setDefault( |
|
| 59 | 58 | ReflectionCompositeProviderInterface $default |
| 60 | 59 | ) |
| 61 | 60 | { |
@@ -90,8 +89,7 @@ discard block |
||
| 90 | 89 | { |
| 91 | 90 | $this->cache[$classname] = |
| 92 | 91 | ( |
| 93 | - ReflectionCompositeFactory::fromClassName |
|
| 94 | - ( |
|
| 92 | + ReflectionCompositeFactory::fromClassName( |
|
| 95 | 93 | $classname |
| 96 | 94 | ) |
| 97 | 95 | ) |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | /** |
| 44 | 44 | * Creates this ObjectType with the given classname |
| 45 | 45 | * |
| 46 | - * @param mixed $class The name of the class this must be an |
|
| 46 | + * @param string $classname The name of the class this must be an |
|
| 47 | 47 | * instance of |
| 48 | 48 | */ |
| 49 | 49 | public function __construct($classname) |
@@ -59,8 +59,7 @@ |
||
| 59 | 59 | */ |
| 60 | 60 | public function equals($type) : bool |
| 61 | 61 | { |
| 62 | - if |
|
| 63 | - ( |
|
| 62 | + if ( |
|
| 64 | 63 | $type instanceof ObjectType && |
| 65 | 64 | $type->classname->equals($this->classname) && |
| 66 | 65 | $type->generics->size() === $this->generics->size() |
@@ -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]; |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | public function __toString() |
| 63 | 63 | { |
| 64 | 64 | return |
| 65 | - ($this->namespace ? $this->namespace . '\\' : '') |
|
| 65 | + ($this->namespace ? $this->namespace . '\\' : '') |
|
| 66 | 66 | . $this->classname; |
| 67 | 67 | } |
| 68 | 68 | |