Completed
Pull Request — master (#4)
by Emily
03:24 queued 01:07
created
src/Service/RawPropertyAccessor.php 2 patches
Spacing   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,8 +48,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -110,8 +110,7 @@
 block discarded – undo
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
             (
Please login to merge, or discard this patch.
src/Factory/Reflection/ReflectionFileFactory.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -93,8 +93,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
                 {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -60,8 +60,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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));
Please login to merge, or discard this patch.
src/Service/ConditionalPropertyAccessor.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,8 +12,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
             (
Please login to merge, or discard this patch.
Spacing   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -35,8 +35,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
             );
Please login to merge, or discard this patch.
src/Traits/HasReflectorTrait.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,7 @@
 block discarded – undo
25 25
         if (!static::$reflectionComposite)
26 26
         {
27 27
             static::$reflectionComposite =
28
-                ReflectionCompositeFactory::fromClassName
29
-                (
28
+                ReflectionCompositeFactory::fromClassName(
30 29
                     get_called_class()
31 30
                 )
32 31
                 ->build();
Please login to merge, or discard this patch.
src/Traits/PropertyAccessTrait.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,8 +29,7 @@
 block discarded – undo
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
             );
Please login to merge, or discard this patch.
src/Exception/PropertyAccessException.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,15 +47,13 @@
 block discarded – undo
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,
Please login to merge, or discard this patch.
src/Exception/MissingRequiredParameterException.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,15 +30,13 @@
 block discarded – undo
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,
Please login to merge, or discard this patch.
src/Exception/IllegalPropertyTypeException.php 1 patch
Spacing   +3 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,8 +32,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/Service/PropertyAccessor.php 2 patches
Spacing   +11 added lines, -22 removed lines patch added patch discarded remove patch
@@ -65,8 +65,7 @@  discard block
 block discarded – undo
65 65
         {
66 66
             if (!isset($args[$i]))
67 67
             {
68
-                throw new MissingRequiredParameterException
69
-                (
68
+                throw new MissingRequiredParameterException(
70 69
                     get_class($this->object),
71 70
                     $property->name
72 71
                 );
@@ -144,14 +143,12 @@  discard block
 block discarded – undo
144 143
     {
145 144
         if (!$this->reflect->properties->containsKey($property))
146 145
         {
147
-            throw new CannotWritePropertyException
148
-            (
146
+            throw new CannotWritePropertyException(
149 147
                 get_class($this->object), $property
150 148
             );
151 149
         }
152 150
 
153
-        $this->setAnyValue
154
-        (
151
+        $this->setAnyValue(
155 152
             $this->reflect->properties[$property],
156 153
             $value
157 154
         );
@@ -198,8 +195,7 @@  discard block
 block discarded – undo
198 195
      * @param ReflectionProperty $property The property to set
199 196
      * @param mixed $value The value to set
200 197
      */
201
-    private function setNonNullValue
202
-    (
198
+    private function setNonNullValue(
203 199
         ReflectionProperty $property,
204 200
         $value
205 201
     )
@@ -248,8 +244,7 @@  discard block
 block discarded – undo
248 244
      * @param callable $cast Method to cast a value to the scalar data
249 245
      *     type
250 246
      */
251
-    private function setScalarValue
252
-    (
247
+    private function setScalarValue(
253 248
         ReflectionProperty $property,
254 249
         $value,
255 250
         string $name,
@@ -264,8 +259,7 @@  discard block
 block discarded – undo
264 259
         }
265 260
         elseif (is_object($value) && method_exists([$value, $method]))
266 261
         {
267
-            $this->setScalarValue
268
-            (
262
+            $this->setScalarValue(
269 263
                 $property,
270 264
                 $value->$method(),
271 265
                 $method,
@@ -284,8 +278,7 @@  discard block
 block discarded – undo
284 278
      * @param ReflectionProperty $property The property to set
285 279
      * @param mixed $value The value to set
286 280
      */
287
-    private function setObjectValue
288
-    (
281
+    private function setObjectValue(
289 282
         ReflectionProperty $property,
290 283
         $value
291 284
     )
@@ -296,8 +289,7 @@  discard block
 block discarded – undo
296 289
         }
297 290
         else
298 291
         {
299
-            $this->throwError
300
-            (
292
+            $this->throwError(
301 293
                 $property,
302 294
                 $property->type->classname,
303 295
                 $value
@@ -311,8 +303,7 @@  discard block
 block discarded – undo
311 303
      * @param ReflectionProperty $property The property to set
312 304
      * @param mixed The value to set
313 305
      */
314
-    private function setCollectionValue
315
-    (
306
+    private function setCollectionValue(
316 307
         ReflectionProperty $property,
317 308
         $value
318 309
     )
@@ -334,15 +325,13 @@  discard block
 block discarded – undo
334 325
      * @param string $expected The expected datatype
335 326
      * @param string $value The value being set
336 327
      */
337
-    private function throwError
338
-    (
328
+    private function throwError(
339 329
         ReflectionProperty $property,
340 330
         string $expected,
341 331
         $value
342 332
     )
343 333
     {
344
-        throw new IllegalPropertyTypeException
345
-        (
334
+        throw new IllegalPropertyTypeException(
346 335
             get_class($this->object),
347 336
             $property->name,
348 337
             $expected,
Please login to merge, or discard this patch.
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -83,15 +83,13 @@  discard block
 block discarded – undo
83 83
             if ($building)
84 84
             {
85 85
                 $this->buildProperty($property);
86
-            }
87
-            else
86
+            } else
88 87
             {
89 88
                 if (isset($args[$i]))
90 89
                 {
91 90
                     $this->setAnyValue($property, $args[$i]);
92 91
                     $i++;
93
-                }
94
-                else
92
+                } else
95 93
                 {
96 94
                     $building = true;
97 95
                     $this->buildProperty($property);
@@ -116,8 +114,7 @@  discard block
 block discarded – undo
116 114
         {
117 115
             $class = $property->type->classname;
118 116
             $this->setRawValue($property->name, new $class());
119
-        }
120
-        else
117
+        } else
121 118
         {
122 119
             $this->setAnyValue($property, 0);
123 120
         }
@@ -168,8 +165,7 @@  discard block
 block discarded – undo
168 165
         if (is_null($value))
169 166
         {
170 167
             $this->setNullValue($property);
171
-        }
172
-        else
168
+        } else
173 169
         {
174 170
             $this->setNonNullValue($property, $value);
175 171
         }
@@ -185,8 +181,7 @@  discard block
 block discarded – undo
185 181
         if ($property->type->nullable)
186 182
         {
187 183
             $this->setRawValue($property->name, null);
188
-        }
189
-        else
184
+        } else
190 185
         {
191 186
             $this->throwError($property, 'NonNull', null);
192 187
         }
@@ -261,8 +256,7 @@  discard block
 block discarded – undo
261 256
         if (is_scalar($value))
262 257
         {
263 258
             $this->setRawValue($property->name, $cast($value));
264
-        }
265
-        elseif (is_object($value) && method_exists([$value, $method]))
259
+        } elseif (is_object($value) && method_exists([$value, $method]))
266 260
         {
267 261
             $this->setScalarValue
268 262
             (
@@ -271,8 +265,7 @@  discard block
 block discarded – undo
271 265
                 $method,
272 266
                 $cast
273 267
             );
274
-        }
275
-        else
268
+        } else
276 269
         {
277 270
             $this->throwError($property, $name, $value);
278 271
         }
@@ -293,8 +286,7 @@  discard block
 block discarded – undo
293 286
         if (is_a($value, $property->type->classname))
294 287
         {
295 288
             $this->setRawValue($property->name, $value);
296
-        }
297
-        else
289
+        } else
298 290
         {
299 291
             $this->throwError
300 292
             (
@@ -320,8 +312,7 @@  discard block
 block discarded – undo
320 312
         if (is_a($value, \ArrayAccess::class) || is_array($value))
321 313
         {
322 314
             $this->setRawValue($property->name, $value);
323
-        }
324
-        else
315
+        } else
325 316
         {
326 317
             $this->throwError($property, 'Collection', $value);
327 318
         }
Please login to merge, or discard this patch.