@@ -44,8 +44,7 @@ |
||
| 44 | 44 | { |
| 45 | 45 | if (!$pair instanceof OrderedPair) |
| 46 | 46 | { |
| 47 | - $pair = new OrderedPair |
|
| 48 | - ( |
|
| 47 | + $pair = new OrderedPair( |
|
| 49 | 48 | $this->size(), |
| 50 | 49 | $pair->key, |
| 51 | 50 | $pair->value |
@@ -37,8 +37,6 @@ discard block |
||
| 37 | 37 | /** |
| 38 | 38 | * Adds an element to the Map |
| 39 | 39 | * |
| 40 | - * @param KeyType $key The key to add |
|
| 41 | - * @param ValueType $value The value to add |
|
| 42 | 40 | */ |
| 43 | 41 | public function insert(Pair $pair) |
| 44 | 42 | { |
@@ -59,7 +57,7 @@ discard block |
||
| 59 | 57 | /** |
| 60 | 58 | * Checks if a key exists |
| 61 | 59 | * |
| 62 | - * @param KeyType $key The key to search for |
|
| 60 | + * @param string $key The key to search for |
|
| 63 | 61 | * @return boolean |
| 64 | 62 | */ |
| 65 | 63 | public function containsKey($key) : bool |
@@ -103,6 +101,9 @@ discard block |
||
| 103 | 101 | return $this->list->size(); |
| 104 | 102 | } |
| 105 | 103 | |
| 104 | + /** |
|
| 105 | + * @param string $key |
|
| 106 | + */ |
|
| 106 | 107 | public function indexOfKey($key) |
| 107 | 108 | { |
| 108 | 109 | return $this->getPair($key)->index; |
@@ -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; |
@@ -67,8 +67,7 @@ |
||
| 67 | 67 | */ |
| 68 | 68 | public function compare($type) : int |
| 69 | 69 | { |
| 70 | - if |
|
| 71 | - ( |
|
| 70 | + if ( |
|
| 72 | 71 | $type instanceof ObjectType && |
| 73 | 72 | $type->classname === $this->classname && |
| 74 | 73 | $type->generics->size() <= $this->generics->size() |
@@ -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) |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $this->initParams(); |
| 98 | 98 | |
| 99 | 99 | $this->accessor->setRawValue('visibility', |
| 100 | - ($this->reflector->isPublic() ? 'public' |
|
| 100 | + ($this->reflector->isPublic() ? 'public' |
|
| 101 | 101 | : ($this->reflector->isProtected() ? 'protected' |
| 102 | 102 | : ($this->reflector->isPrivate() ? 'private' |
| 103 | 103 | : ('')))) |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | { |
| 155 | 155 | throw new \Exception |
| 156 | 156 | ( |
| 157 | - 'Tried to set param annotation for non existant ' |
|
| 157 | + 'Tried to set param annotation for non existant ' |
|
| 158 | 158 | . 'parameter: ' . $param |
| 159 | 159 | ); |
| 160 | 160 | } |
@@ -63,8 +63,7 @@ discard block |
||
| 63 | 63 | */ |
| 64 | 64 | public static function fromName(string $class, string $method) |
| 65 | 65 | { |
| 66 | - return new static(new PHPNativeReflectionMethod |
|
| 67 | - ( |
|
| 66 | + return new static(new PHPNativeReflectionMethod( |
|
| 68 | 67 | $class, $method |
| 69 | 68 | )); |
| 70 | 69 | } |
@@ -84,12 +83,11 @@ discard block |
||
| 84 | 83 | * this method belongs to |
| 85 | 84 | * @return ReflectionMethod |
| 86 | 85 | */ |
| 87 | - public function build(?ReflectionComposite $parent = null) |
|
| 86 | + public function build(? ReflectionComposite $parent = null) |
|
| 88 | 87 | { |
| 89 | 88 | $this->typeParser = new TypeParser($parent); |
| 90 | 89 | $this->accessor->setRawValue('owner', $parent); |
| 91 | - $this->accessor->setRawValue |
|
| 92 | - ( |
|
| 90 | + $this->accessor->setRawValue( |
|
| 93 | 91 | 'name', |
| 94 | 92 | $this->reflector->getName() |
| 95 | 93 | ); |
@@ -125,13 +123,11 @@ discard block |
||
| 125 | 123 | */ |
| 126 | 124 | protected function initParams() |
| 127 | 125 | { |
| 128 | - $this->accessor->setRawValue |
|
| 129 | - ( |
|
| 126 | + $this->accessor->setRawValue( |
|
| 130 | 127 | 'parameters', |
| 131 | 128 | new FixedList(count($this->reflector->getParameters())) |
| 132 | 129 | ); |
| 133 | - $this->accessor->setRawValue |
|
| 134 | - ( |
|
| 130 | + $this->accessor->setRawValue( |
|
| 135 | 131 | 'nativeParameters', |
| 136 | 132 | new FixedList(count($this->reflector->getParameters())) |
| 137 | 133 | ); |
@@ -152,8 +148,7 @@ discard block |
||
| 152 | 148 | |
| 153 | 149 | if (!$this->parameters->containsKey($param)) |
| 154 | 150 | { |
| 155 | - throw new \Exception |
|
| 156 | - ( |
|
| 151 | + throw new \Exception( |
|
| 157 | 152 | 'Tried to set param annotation for non existant ' |
| 158 | 153 | . 'parameter: ' . $param |
| 159 | 154 | ); |
@@ -178,8 +173,7 @@ discard block |
||
| 178 | 173 | * |
| 179 | 174 | * @param PHPNativeReflectionParameter $reflect |
| 180 | 175 | */ |
| 181 | - protected function addParameter |
|
| 182 | - ( |
|
| 176 | + protected function addParameter( |
|
| 183 | 177 | PHPNativeReflectionParameter $reflect |
| 184 | 178 | ) |
| 185 | 179 | : void |
@@ -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 | |
@@ -73,8 +73,7 @@ |
||
| 73 | 73 | public function generateClassCode(...$generics) : string |
| 74 | 74 | { |
| 75 | 75 | $object = $this->createObject(...$generics); |
| 76 | - $this->nameProvider = new GenericNameProvider |
|
| 77 | - ( |
|
| 76 | + $this->nameProvider = new GenericNameProvider( |
|
| 78 | 77 | new GenericContext($object, $this->reflect) |
| 79 | 78 | ); |
| 80 | 79 | $class = $this->nameProvider->inferName($object); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $i = 0; |
| 83 | 83 | |
| 84 | 84 | $code = |
| 85 | - '<?php namespace ' . $class->namespace . ';' |
|
| 85 | + '<?php namespace ' . $class->namespace . ';' |
|
| 86 | 86 | . 'class ' . $class->classname . ' ' |
| 87 | 87 | . 'extends ' . $originalClass |
| 88 | 88 | . '{'; |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | return |
| 121 | - ($method->scope === 'static' ? 'static ' : '') |
|
| 121 | + ($method->scope === 'static' ? 'static ' : '') |
|
| 122 | 122 | . 'function ' . $method->name |
| 123 | 123 | . '(' . implode(',', $params) . '){' |
| 124 | 124 | . '__generic_' . $method->name |
@@ -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 | ) |