@@ -39,7 +39,7 @@ |
||
39 | 39 | { |
40 | 40 | preg_match_all |
41 | 41 | ( |
42 | - '/^' |
|
42 | + '/^' |
|
43 | 43 | . '[ \t]*\*[ \t]*' |
44 | 44 | . '@([a-zA-Z]+)' |
45 | 45 | . '(.*)' |
@@ -63,8 +63,7 @@ discard block |
||
63 | 63 | */ |
64 | 64 | protected function parseDocComment(array $acceptedParams) |
65 | 65 | { |
66 | - preg_match_all |
|
67 | - ( |
|
66 | + preg_match_all( |
|
68 | 67 | '/^' |
69 | 68 | . '[ \t]*\*[ \t]*' |
70 | 69 | . '@([a-zA-Z]+)' |
@@ -81,8 +80,7 @@ discard block |
||
81 | 80 | |
82 | 81 | if (isset($acceptedParams[$name])) |
83 | 82 | { |
84 | - call_user_func |
|
85 | - ( |
|
83 | + call_user_func( |
|
86 | 84 | array($this, $acceptedParams[$name]), |
87 | 85 | $name, $value |
88 | 86 | ); |
@@ -98,7 +96,7 @@ discard block |
||
98 | 96 | */ |
99 | 97 | protected function setBool($name, $value) |
100 | 98 | { |
101 | - switch(strtolower($value)) |
|
99 | + switch (strtolower($value)) |
|
102 | 100 | { |
103 | 101 | case '': |
104 | 102 | case 'true': |
@@ -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 |
@@ -110,8 +110,7 @@ |
||
110 | 110 | $prop->setAccessible(true); |
111 | 111 | |
112 | 112 | return $prop; |
113 | - } |
|
114 | - catch (ReflectionException $e) |
|
113 | + } catch (ReflectionException $e) |
|
115 | 114 | { |
116 | 115 | throw new $class |
117 | 116 | ( |
@@ -93,8 +93,7 @@ discard block |
||
93 | 93 | { |
94 | 94 | $as .= $token[1]; |
95 | 95 | } |
96 | - } |
|
97 | - elseif ($matching) |
|
96 | + } elseif ($matching) |
|
98 | 97 | { |
99 | 98 | switch ($token[0]) |
100 | 99 | { |
@@ -105,8 +104,7 @@ discard block |
||
105 | 104 | case T_AS: |
106 | 105 | $matching = T_AS; |
107 | 106 | } |
108 | - } |
|
109 | - else |
|
107 | + } else |
|
110 | 108 | { |
111 | 109 | switch ($token[0]) |
112 | 110 | { |
@@ -60,8 +60,7 @@ discard block |
||
60 | 60 | case T_NAMESPACE: |
61 | 61 | $ns = new NamespaceBlock($classname); |
62 | 62 | $currentNS = new RawPropertyAccessor($ns); |
63 | - $this->accessor->getRawValue |
|
64 | - ( |
|
63 | + $this->accessor->getRawValue( |
|
65 | 64 | 'namespaces' |
66 | 65 | ) |
67 | 66 | ->add($classname, $ns); |
@@ -76,8 +75,7 @@ discard block |
||
76 | 75 | $as = end($as); |
77 | 76 | } |
78 | 77 | |
79 | - $currentNS->getRawValue |
|
80 | - ( |
|
78 | + $currentNS->getRawValue( |
|
81 | 79 | 'useStatements' |
82 | 80 | ) |
83 | 81 | ->add($as, new UseStatement($classname, $as)); |
@@ -17,7 +17,7 @@ |
||
17 | 17 | { |
18 | 18 | parent::__construct |
19 | 19 | ( |
20 | - 'Tried to set an illegal property type for ' |
|
20 | + 'Tried to set an illegal property type for ' |
|
21 | 21 | . $class .'::$' . $property . '. Excpected ' . $expected |
22 | 22 | . ', got ' . $got, |
23 | 23 | 0, |
@@ -32,8 +32,7 @@ discard block |
||
32 | 32 | * @param string $got The type that was provided |
33 | 33 | * @param Exception $previous The exception which caused this |
34 | 34 | */ |
35 | - public function __construct |
|
36 | - ( |
|
35 | + public function __construct( |
|
37 | 36 | string $class, |
38 | 37 | string $property, |
39 | 38 | string $expected, |
@@ -41,10 +40,9 @@ discard block |
||
41 | 40 | Exception $previous = null |
42 | 41 | ) |
43 | 42 | { |
44 | - parent::__construct |
|
45 | - ( |
|
43 | + parent::__construct( |
|
46 | 44 | 'Tried to set an illegal property type for ' |
47 | - . $class .'::$' . $property . '. Excpected ' . $expected |
|
45 | + . $class . '::$' . $property . '. Excpected ' . $expected |
|
48 | 46 | . ', got ' . $got, |
49 | 47 | 0, |
50 | 48 | $previous |
@@ -12,8 +12,7 @@ discard block |
||
12 | 12 | if ($property->writable) |
13 | 13 | { |
14 | 14 | parent::setAnyValue($property, $value); |
15 | - } |
|
16 | - else |
|
15 | + } else |
|
17 | 16 | { |
18 | 17 | throw new PropertyNotWritableException |
19 | 18 | ( |
@@ -32,8 +31,7 @@ discard block |
||
32 | 31 | get_class($this->object), |
33 | 32 | $property |
34 | 33 | ); |
35 | - } |
|
36 | - elseif (!$this->reflect->properties[$property]->readable) |
|
34 | + } elseif (!$this->reflect->properties[$property]->readable) |
|
37 | 35 | { |
38 | 36 | throw new PropertyNotReadableException |
39 | 37 | ( |
@@ -35,8 +35,7 @@ discard block |
||
35 | 35 | } |
36 | 36 | else |
37 | 37 | { |
38 | - throw new PropertyNotWritableException |
|
39 | - ( |
|
38 | + throw new PropertyNotWritableException( |
|
40 | 39 | get_class($this->object), |
41 | 40 | $property->name |
42 | 41 | ); |
@@ -50,16 +49,14 @@ discard block |
||
50 | 49 | { |
51 | 50 | if (!$this->reflect->properties->containsKey($property)) |
52 | 51 | { |
53 | - throw new CannotReadPropertyException |
|
54 | - ( |
|
52 | + throw new CannotReadPropertyException( |
|
55 | 53 | get_class($this->object), |
56 | 54 | $property |
57 | 55 | ); |
58 | 56 | } |
59 | 57 | elseif (!$this->reflect->properties[$property]->readable) |
60 | 58 | { |
61 | - throw new PropertyNotReadableException |
|
62 | - ( |
|
59 | + throw new PropertyNotReadableException( |
|
63 | 60 | get_class($this->object), |
64 | 61 | $property |
65 | 62 | ); |
@@ -29,8 +29,7 @@ |
||
29 | 29 | { |
30 | 30 | if (!$this->accessor) |
31 | 31 | { |
32 | - $this->accessor = new ConditionalPropertyAccessor |
|
33 | - ( |
|
32 | + $this->accessor = new ConditionalPropertyAccessor( |
|
34 | 33 | $this, |
35 | 34 | self::getReflectionComposite() |
36 | 35 | ); |
@@ -74,7 +74,7 @@ |
||
74 | 74 | * Builds the ReflectionProperty from the provided parameters, |
75 | 75 | * linking to a parent ReflectionComposite |
76 | 76 | * |
77 | - * @param ReflectionCompostite $parent The reflector for the class |
|
77 | + * @param ReflectionComposite $parent The reflector for the class |
|
78 | 78 | * this property belongs to |
79 | 79 | * @param mixed $default This property's default value |
80 | 80 | * @return ReflectionProperty |
@@ -53,8 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public static function fromName($class, $property) |
55 | 55 | { |
56 | - return new static(new PHPNativeReflectionProperty |
|
57 | - ( |
|
56 | + return new static(new PHPNativeReflectionProperty( |
|
58 | 57 | $class, $property |
59 | 58 | )); |
60 | 59 | } |
@@ -72,14 +71,12 @@ discard block |
||
72 | 71 | { |
73 | 72 | $this->accessor->setRawValue('owner', $parent); |
74 | 73 | $this->accessor->setRawValue('defaultValue', $default); |
75 | - $this->accessor->setRawValue |
|
76 | - ( |
|
74 | + $this->accessor->setRawValue( |
|
77 | 75 | 'name', |
78 | 76 | $this->reflector->getName() |
79 | 77 | ); |
80 | 78 | |
81 | - $this->parseDocComment |
|
82 | - ([ |
|
79 | + $this->parseDocComment([ |
|
83 | 80 | 'readable' => 'setBool', |
84 | 81 | 'writable' => 'setBool', |
85 | 82 | 'var' => 'setType', |
@@ -97,8 +94,7 @@ discard block |
||
97 | 94 | */ |
98 | 95 | protected function setType($name, $value) |
99 | 96 | { |
100 | - $this->accessor->setRawValue |
|
101 | - ( |
|
97 | + $this->accessor->setRawValue( |
|
102 | 98 | 'type', |
103 | 99 | (new TypeParser($this->object->owner))->parse($value) |
104 | 100 | ); |
@@ -120,50 +116,42 @@ discard block |
||
120 | 116 | switch ($value[0]) |
121 | 117 | { |
122 | 118 | case 'required': |
123 | - $this->accessor->setRawValue |
|
124 | - ( |
|
119 | + $this->accessor->setRawValue( |
|
125 | 120 | 'passedToConstructor', |
126 | 121 | true |
127 | 122 | ); |
128 | - $this->accessor->setRawValue |
|
129 | - ( |
|
123 | + $this->accessor->setRawValue( |
|
130 | 124 | 'requiredInConstructor', |
131 | 125 | true |
132 | 126 | ); |
133 | - $compositeAccessor->rawAddToValue |
|
134 | - ( |
|
127 | + $compositeAccessor->rawAddToValue( |
|
135 | 128 | 'requiredProperties', |
136 | 129 | $this->object |
137 | 130 | ); |
138 | 131 | break; |
139 | 132 | case 'new': |
140 | - $this->accessor->setRawValue |
|
141 | - ( |
|
133 | + $this->accessor->setRawValue( |
|
142 | 134 | 'builtInConstructor', |
143 | 135 | true |
144 | 136 | ); |
145 | - $compositeAccessor->rawAddToValue |
|
146 | - ( |
|
137 | + $compositeAccessor->rawAddToValue( |
|
147 | 138 | 'builtProperties', |
148 | 139 | $this->object |
149 | 140 | ); |
150 | 141 | break; |
151 | 142 | case 'optional': |
152 | - $this->accessor->setRawValue |
|
153 | - ( |
|
143 | + $this->accessor->setRawValue( |
|
154 | 144 | 'passedToConstructor', |
155 | 145 | true |
156 | 146 | ); |
157 | - $compositeAccessor->rawAddToValue |
|
158 | - ( |
|
147 | + $compositeAccessor->rawAddToValue( |
|
159 | 148 | 'optionalProperties', |
160 | 149 | $this->object |
161 | 150 | ); |
162 | 151 | |
163 | 152 | if (isset($value[1]) && $value[1] === 'new') |
164 | 153 | { |
165 | - $this->accessor->setRawValue |
|
166 | - ( |
|
154 | + $this->accessor->setRawValue( |
|
167 | 155 | 'builtInConstructor', |
168 | 156 | true |
169 | 157 | ); |
@@ -16,13 +16,7 @@ |
||
16 | 16 | |
17 | 17 | use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite; |
18 | 18 | use Spaark\CompositeUtils\Model\Reflection\ReflectionProperty; |
19 | -use Spaark\CompositeUtils\Model\Reflection\ReflectionParameter; |
|
20 | -use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType; |
|
21 | -use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType; |
|
22 | -use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType; |
|
23 | 19 | use Spaark\CompositeUtils\Model\Reflection\Type\MixedType; |
24 | -use Spaark\CompositeUtils\Model\Reflection\Type\ObjectType; |
|
25 | -use Spaark\CompositeUtils\Model\Reflection\Type\StringType; |
|
26 | 20 | use Spaark\CompositeUtils\Service\RawPropertyAccessor; |
27 | 21 | use \ReflectionProperty as PHPNativeReflectionProperty; |
28 | 22 |
@@ -56,7 +56,7 @@ |
||
56 | 56 | { |
57 | 57 | parent::__construct |
58 | 58 | ( |
59 | - 'Cannot ' . static::ACCESS_TYPE . ' property: ' |
|
59 | + 'Cannot ' . static::ACCESS_TYPE . ' property: ' |
|
60 | 60 | . $class . '::$' . $property . '. ' . static::ERROR_REASON, |
61 | 61 | 0, |
62 | 62 | $previous |
@@ -47,15 +47,13 @@ |
||
47 | 47 | * @param string $property The property accessed |
48 | 48 | * @param Throwable $previous The exception which caused this |
49 | 49 | */ |
50 | - public function __construct |
|
51 | - ( |
|
50 | + public function __construct( |
|
52 | 51 | string $class, |
53 | 52 | string $property, |
54 | 53 | Throwable $previous = null |
55 | 54 | ) |
56 | 55 | { |
57 | - parent::__construct |
|
58 | - ( |
|
56 | + parent::__construct( |
|
59 | 57 | 'Cannot ' . static::ACCESS_TYPE . ' property: ' |
60 | 58 | . $class . '::$' . $property . '. ' . static::ERROR_REASON, |
61 | 59 | 0, |
@@ -39,7 +39,7 @@ |
||
39 | 39 | { |
40 | 40 | parent::__construct |
41 | 41 | ( |
42 | - 'Missing required parameter in constructor. ' |
|
42 | + 'Missing required parameter in constructor. ' |
|
43 | 43 | . $class . ' requires a value for ' . $parameter, |
44 | 44 | 0, |
45 | 45 | $previous |
@@ -30,15 +30,13 @@ |
||
30 | 30 | * @param string $parameter The name of the missing parameter |
31 | 31 | * @param Throwable The exception which caused this |
32 | 32 | */ |
33 | - public function __construct |
|
34 | - ( |
|
33 | + public function __construct( |
|
35 | 34 | string $class, |
36 | 35 | string $parameter, |
37 | 36 | Throwable $previous = null |
38 | 37 | ) |
39 | 38 | { |
40 | - parent::__construct |
|
41 | - ( |
|
39 | + parent::__construct( |
|
42 | 40 | 'Missing required parameter in constructor. ' |
43 | 41 | . $class . ' requires a value for ' . $parameter, |
44 | 42 | 0, |