@@ -103,6 +103,10 @@ |
||
103 | 103 | } |
104 | 104 | } |
105 | 105 | |
106 | + /** |
|
107 | + * @param string $name |
|
108 | + * @param \Closure $cast |
|
109 | + */ |
|
106 | 110 | private function setScalarValue($property, $value, $name, $cast) |
107 | 111 | { |
108 | 112 | $method = '__to' . $name; |
@@ -47,8 +47,7 @@ discard block |
||
47 | 47 | { |
48 | 48 | if (!isset($args[$i])) |
49 | 49 | { |
50 | - throw new MissingRequiredParameterException |
|
51 | - ( |
|
50 | + throw new MissingRequiredParameterException( |
|
52 | 51 | get_class($this->object), |
53 | 52 | $property->name |
54 | 53 | ); |
@@ -109,14 +108,12 @@ discard block |
||
109 | 108 | { |
110 | 109 | if (!$this->reflect->properties->contains($property)) |
111 | 110 | { |
112 | - throw new CannotWritePropertyException |
|
113 | - ( |
|
111 | + throw new CannotWritePropertyException( |
|
114 | 112 | get_class($this->object), $property |
115 | 113 | ); |
116 | 114 | } |
117 | 115 | |
118 | - $this->setAnyValue |
|
119 | - ( |
|
116 | + $this->setAnyValue( |
|
120 | 117 | $this->reflect->properties[$property], |
121 | 118 | $value |
122 | 119 | ); |
@@ -130,8 +127,7 @@ discard block |
||
130 | 127 | } |
131 | 128 | else |
132 | 129 | { |
133 | - $this->setNonNullValue |
|
134 | - ( |
|
130 | + $this->setNonNullValue( |
|
135 | 131 | $property->name, |
136 | 132 | $value, |
137 | 133 | $property->type |
@@ -198,8 +194,7 @@ discard block |
||
198 | 194 | } |
199 | 195 | elseif (is_object($value) && method_exists([$value, $method])) |
200 | 196 | { |
201 | - $this->setScalarValue |
|
202 | - ( |
|
197 | + $this->setScalarValue( |
|
203 | 198 | $property, |
204 | 199 | $value->$method(), |
205 | 200 | $method, |
@@ -238,8 +233,7 @@ discard block |
||
238 | 233 | |
239 | 234 | private function throwError($property, $expected, $value) |
240 | 235 | { |
241 | - throw new IllegalPropertyTypeException |
|
242 | - ( |
|
236 | + throw new IllegalPropertyTypeException( |
|
243 | 237 | get_class($this->object), |
244 | 238 | $property, |
245 | 239 | $expected, |
@@ -65,15 +65,13 @@ discard block |
||
65 | 65 | if ($building) |
66 | 66 | { |
67 | 67 | $this->buildProperty($property); |
68 | - } |
|
69 | - else |
|
68 | + } else |
|
70 | 69 | { |
71 | 70 | if (isset($args[$i])) |
72 | 71 | { |
73 | 72 | $this->setAnyValue($property, $args[$i]); |
74 | 73 | $i++; |
75 | - } |
|
76 | - else |
|
74 | + } else |
|
77 | 75 | { |
78 | 76 | $building = true; |
79 | 77 | $this->buildProperty($property); |
@@ -93,8 +91,7 @@ discard block |
||
93 | 91 | { |
94 | 92 | $class = $property->type->classname; |
95 | 93 | $this->setRawValue($property->name, new $class()); |
96 | - } |
|
97 | - else |
|
94 | + } else |
|
98 | 95 | { |
99 | 96 | $this->setAnyValue($property, 0); |
100 | 97 | } |
@@ -127,8 +124,7 @@ discard block |
||
127 | 124 | if (is_null($value)) |
128 | 125 | { |
129 | 126 | $this->setNullValue($property->name, $property->type); |
130 | - } |
|
131 | - else |
|
127 | + } else |
|
132 | 128 | { |
133 | 129 | $this->setNonNullValue |
134 | 130 | ( |
@@ -144,8 +140,7 @@ discard block |
||
144 | 140 | if ($type->nullable) |
145 | 141 | { |
146 | 142 | $this->setRawValue($property, null); |
147 | - } |
|
148 | - else |
|
143 | + } else |
|
149 | 144 | { |
150 | 145 | $this->throwError($property, 'NonNull', null); |
151 | 146 | } |
@@ -195,8 +190,7 @@ discard block |
||
195 | 190 | if (is_scalar($value)) |
196 | 191 | { |
197 | 192 | $this->setRawValue($property, $cast($value)); |
198 | - } |
|
199 | - elseif (is_object($value) && method_exists([$value, $method])) |
|
193 | + } elseif (is_object($value) && method_exists([$value, $method])) |
|
200 | 194 | { |
201 | 195 | $this->setScalarValue |
202 | 196 | ( |
@@ -205,8 +199,7 @@ discard block |
||
205 | 199 | $method, |
206 | 200 | $cast |
207 | 201 | ); |
208 | - } |
|
209 | - else |
|
202 | + } else |
|
210 | 203 | { |
211 | 204 | $this->throwError($property, $name, $value); |
212 | 205 | } |
@@ -217,8 +210,7 @@ discard block |
||
217 | 210 | if (is_a($value, $type->classname)) |
218 | 211 | { |
219 | 212 | $this->setRawValue($property, $value); |
220 | - } |
|
221 | - else |
|
213 | + } else |
|
222 | 214 | { |
223 | 215 | $this->throwError($property, $type->classname, $value); |
224 | 216 | } |
@@ -229,8 +221,7 @@ discard block |
||
229 | 221 | if (is_a($value, \ArrayAccess::class) || is_array($value)) |
230 | 222 | { |
231 | 223 | $this->setRawValue($property, $value); |
232 | - } |
|
233 | - else |
|
224 | + } else |
|
234 | 225 | { |
235 | 226 | $this->throwError($property, 'Collection', $value); |
236 | 227 | } |
@@ -66,8 +66,7 @@ discard block |
||
66 | 66 | if ($value{0} !== '?') |
67 | 67 | { |
68 | 68 | $nullable = false; |
69 | - } |
|
70 | - else |
|
69 | + } else |
|
71 | 70 | { |
72 | 71 | $nullable = true; |
73 | 72 | $value = substr($value, 1); |
@@ -76,8 +75,7 @@ discard block |
||
76 | 75 | if (substr($value, -2) !== '[]') |
77 | 76 | { |
78 | 77 | $collection = false; |
79 | - } |
|
80 | - else |
|
78 | + } else |
|
81 | 79 | { |
82 | 80 | $collection = true; |
83 | 81 | $value = substr($value, 0, -2); |
@@ -110,8 +108,7 @@ discard block |
||
110 | 108 | if ($useStatements->contains($value)) |
111 | 109 | { |
112 | 110 | $value = $useStatements[$value]->classname; |
113 | - } |
|
114 | - else |
|
111 | + } else |
|
115 | 112 | { |
116 | 113 | $value = $this->object->owner->namespace->namespace |
117 | 114 | . '\\' . $value; |
@@ -20,7 +20,7 @@ |
||
20 | 20 | { |
21 | 21 | parent::__construct |
22 | 22 | ( |
23 | - 'Missing required parameter in constructor. ' |
|
23 | + 'Missing required parameter in constructor. ' |
|
24 | 24 | . $class . ' requires a value for ' . $property, |
25 | 25 | 0, |
26 | 26 | $previous |
@@ -18,8 +18,7 @@ |
||
18 | 18 | { |
19 | 19 | public function __construct($class, $property, $previous = null) |
20 | 20 | { |
21 | - parent::__construct |
|
22 | - ( |
|
21 | + parent::__construct( |
|
23 | 22 | 'Missing required parameter in constructor. ' |
24 | 23 | . $class . ' requires a value for ' . $property, |
25 | 24 | 0, |