| @@ -2,9 +2,7 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Spaark\CompositeUtils\Factory\Reflection; | 
| 4 | 4 | |
| 5 | -use Spaark\CompositeUtils\Factory\BaseFactory; | |
| 6 | 5 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; | 
| 7 | -use Spaark\CompositeUtils\Service\PropertyAccessor; | |
| 8 | 6 | use \ReflectionClass as PHPNativeReflectionClass; | 
| 9 | 7 | |
| 10 | 8 | class ReflectionCompositeFactory extends ReflectorFactory | 
| @@ -39,12 +39,10 @@ discard block | ||
| 39 | 39 | |
| 40 | 40 | protected function buildProperty($reflect) | 
| 41 | 41 |      { | 
| 42 | - $this->accessor->rawAddToValue | |
| 43 | - ( | |
| 42 | + $this->accessor->rawAddToValue( | |
| 44 | 43 | 'properties', | 
| 45 | 44 | (new ReflectionPropertyFactory($reflect)) | 
| 46 | - ->build | |
| 47 | - ( | |
| 45 | + ->build( | |
| 48 | 46 | $this->object, | 
| 49 | 47 | $this->reflector | 
| 50 | 48 | ->getDefaultProperties()[$reflect->getName()] | 
| @@ -54,8 +52,7 @@ discard block | ||
| 54 | 52 | |
| 55 | 53 | protected function buildMethod($reflect) | 
| 56 | 54 |      { | 
| 57 | - $this->accessor->rawAddToValue | |
| 58 | - ( | |
| 55 | + $this->accessor->rawAddToValue( | |
| 59 | 56 | 'methods', | 
| 60 | 57 | (new ReflectionMethodFactory($reflect)) | 
| 61 | 58 | ->build($this->object) | 
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; | 
| 6 | 6 | use Spaark\CompositeUtils\Model\Reflection\ReflectionProperty; | 
| 7 | -use Spaark\CompositeUtils\Model\Reflection\ReflectionParameter; | |
| 8 | 7 | use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType; | 
| 9 | 8 | use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; | 
| 10 | 9 | use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; | 
| @@ -26,8 +26,7 @@ discard block | ||
| 26 | 26 | |
| 27 | 27 | public static function fromName($class, $property) | 
| 28 | 28 |      { | 
| 29 | - return new static(new PHPNativeReflectionProperty | |
| 30 | - ( | |
| 29 | + return new static(new PHPNativeReflectionProperty( | |
| 31 | 30 | $class, $property | 
| 32 | 31 | )); | 
| 33 | 32 | } | 
| @@ -36,8 +35,7 @@ discard block | ||
| 36 | 35 |      { | 
| 37 | 36 |          $this->accessor->setRawValue('owner', $parent); | 
| 38 | 37 |          $this->accessor->setRawValue('defaultValue', $default); | 
| 39 | - $this->accessor->setRawValue | |
| 40 | - ( | |
| 38 | + $this->accessor->setRawValue( | |
| 41 | 39 | 'name', | 
| 42 | 40 | $this->reflector->getName() | 
| 43 | 41 | ); | 
| @@ -48,8 +48,7 @@ discard block | ||
| 48 | 48 | */ | 
| 49 | 49 | public function setRawValue($key, $value) | 
| 50 | 50 |      { | 
| 51 | - $this->getPropertyOrFail | |
| 52 | - ( | |
| 51 | + $this->getPropertyOrFail( | |
| 53 | 52 | $key, | 
| 54 | 53 | CannotWritePropertyException::class | 
| 55 | 54 | ) | 
| @@ -68,8 +67,7 @@ discard block | ||
| 68 | 67 | public function getRawValue($key) | 
| 69 | 68 |      { | 
| 70 | 69 | return | 
| 71 | - $this->getPropertyOrFail | |
| 72 | - ( | |
| 70 | + $this->getPropertyOrFail( | |
| 73 | 71 | $key, | 
| 74 | 72 | CannotReadPropertyException::class | 
| 75 | 73 | ) | 
| @@ -86,8 +84,7 @@ discard block | ||
| 86 | 84 | */ | 
| 87 | 85 | public function rawAddToValue($key, $value) | 
| 88 | 86 |      { | 
| 89 | - $property = $this->getPropertyOrFail | |
| 90 | - ( | |
| 87 | + $property = $this->getPropertyOrFail( | |
| 91 | 88 | $key, | 
| 92 | 89 | CannotWritePropertyException::class | 
| 93 | 90 | ); | 
| @@ -113,8 +110,7 @@ discard block | ||
| 113 | 110 | } | 
| 114 | 111 | catch (ReflectionException $e) | 
| 115 | 112 |          { | 
| 116 | - throw new $class | |
| 117 | - ( | |
| 113 | + throw new $class( | |
| 118 | 114 | get_class($this->object), | 
| 119 | 115 | $key, | 
| 120 | 116 | $e | 
| @@ -37,8 +37,7 @@ discard block | ||
| 37 | 37 | |
| 38 | 38 | protected function parseDocComment() | 
| 39 | 39 |      { | 
| 40 | - preg_match_all | |
| 41 | - ( | |
| 40 | + preg_match_all( | |
| 42 | 41 | '/^' | 
| 43 | 42 | . '[ \t]*\*[ \t]*' | 
| 44 | 43 | . '@([a-zA-Z]+)' | 
| @@ -55,8 +54,7 @@ discard block | ||
| 55 | 54 | |
| 56 | 55 | if (isset($this->acceptedParams[$name])) | 
| 57 | 56 |              { | 
| 58 | - call_user_func | |
| 59 | - ( | |
| 57 | + call_user_func( | |
| 60 | 58 | array($this, $this->acceptedParams[$name]), | 
| 61 | 59 | $name, $value | 
| 62 | 60 | ); | 
| @@ -66,7 +64,7 @@ discard block | ||
| 66 | 64 | |
| 67 | 65 | protected function setBool($name, $value) | 
| 68 | 66 |      { | 
| 69 | - switch(strtolower($value)) | |
| 67 | + switch (strtolower($value)) | |
| 70 | 68 |          { | 
| 71 | 69 | case '': | 
| 72 | 70 | case 'true': | 
| @@ -13,17 +13,15 @@ | ||
| 13 | 13 | |
| 14 | 14 | public static function fromName($class, $method) | 
| 15 | 15 |      { | 
| 16 | - return new static(new PHPNativeReflectionMethod | |
| 17 | - ( | |
| 16 | + return new static(new PHPNativeReflectionMethod( | |
| 18 | 17 | $class, $method | 
| 19 | 18 | )); | 
| 20 | 19 | } | 
| 21 | 20 | |
| 22 | - public function build(?ReflectionComposite $parent = null) | |
| 21 | + public function build(? ReflectionComposite $parent = null) | |
| 23 | 22 |      { | 
| 24 | 23 |          $this->accessor->setRawValue('owner', $parent); | 
| 25 | - $this->accessor->setRawValue | |
| 26 | - ( | |
| 24 | + $this->accessor->setRawValue( | |
| 27 | 25 | 'name', | 
| 28 | 26 | $this->reflector->getName() | 
| 29 | 27 | ); | 
| @@ -28,8 +28,8 @@ | ||
| 28 | 28 |      { | 
| 29 | 29 | return | 
| 30 | 30 | (is_object($value) ? spl_object_hash($value) | 
| 31 | - : (is_array($value) ? implode($value) | |
| 32 | - : ( (string)$value))); | |
| 31 | + : (is_array($value) ? implode($value) | |
| 32 | + : ((string)$value))); | |
| 33 | 33 | } | 
| 34 | 34 | |
| 35 | 35 | /** | 
| @@ -24,8 +24,8 @@ | ||
| 24 | 24 |      { | 
| 25 | 25 | return | 
| 26 | 26 | (is_object($value) ? spl_object_hash($value) | 
| 27 | - : (is_array($value) ? implode($value) | |
| 28 | - : ( (string)$value))); | |
| 27 | + : (is_array($value) ? implode($value) | |
| 28 | + : ((string)$value))); | |
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | public function add($value) | 
| @@ -8,8 +8,7 @@ | ||
| 8 | 8 | |
| 9 | 9 | public function __construct($class, $property, $previous = null) | 
| 10 | 10 |      { | 
| 11 | - parent::__construct | |
| 12 | - ( | |
| 11 | + parent::__construct( | |
| 13 | 12 | 'Cannot ' . static::ACCESS_TYPE . ' non existent ' | 
| 14 | 13 | . 'property: ' . $class . '::$' . $property, | 
| 15 | 14 | 0, |