Completed
Pull Request — master (#8)
by Emily
02:13
created
src/Service/GenericNameProvider.php 5 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,8 +68,7 @@
 block discarded – undo
68 68
         if ($reflect->generics->empty())
69 69
         {
70 70
             return $reflect->classname;
71
-        }
72
-        else
71
+        } else
73 72
         {
74 73
             $items = [];
75 74
             foreach ($reflect->generics as $generic)
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
      * Infers the serialized name of the given ObjectType
100 100
      *
101 101
      * @param ObjectType $reflect
102
-     * @return string
102
+     * @return ClassName
103 103
      */
104 104
     protected function inferObjectName(ObjectType $reflect)
105 105
     {
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
 
118 118
             return new ClassName
119 119
             (
120
-                  self::BASE . $reflect->classname
120
+                    self::BASE . $reflect->classname
121 121
                 . '_g' . implode('_c', $items) . '_e'
122 122
             );
123 123
         }
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -20,10 +20,8 @@
 block discarded – undo
20 20
 use Spaark\CompositeUtils\Model\Reflection\Type\FloatType;
21 21
 use Spaark\CompositeUtils\Model\Reflection\Type\MixedType;
22 22
 use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType;
23
-use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType;
24 23
 use Spaark\CompositeUtils\Model\Reflection\Type\StringType;
25 24
 use Spaark\CompositeUtils\Model\Reflection\Type\GenericType;
26
-use Spaark\CompositeUtils\Model\Generic\GenericContext;
27 25
 use Spaark\CompositeUtils\Exception\MissingContextException;
28 26
 use Spaark\CompositeUtils\Traits\HasGenericContextTrait;
29 27
 use Spaark\CompositeUtils\Model\ClassName;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -63,8 +63,7 @@  discard block
 block discarded – undo
63 63
                 return $this->inferGenericName($reflect);
64 64
         }
65 65
 
66
-        throw new \DomainException
67
-        (
66
+        throw new \DomainException(
68 67
             'Unknown type: ' . get_class($reflect)
69 68
         );
70 69
     }
@@ -101,8 +100,7 @@  discard block
 block discarded – undo
101 100
                 $items[] = $this->inferName($generic);
102 101
             }
103 102
 
104
-            return new ClassName
105
-            (
103
+            return new ClassName(
106 104
                   self::BASE . $reflect->classname
107 105
                 . '_g' . implode('_c', $items) . '_e'
108 106
             );
Please login to merge, or discard this patch.
src/Factory/Reflection/TypeParser.php 3 patches
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -113,8 +113,7 @@  discard block
 block discarded – undo
113 113
                     if ($stack->isEmpty())
114 114
                     {
115 115
                         return $item;
116
-                    }
117
-                    else
116
+                    } else
118 117
                     {
119 118
                         $stack->top()->generics[] = $item;
120 119
                     }
@@ -141,12 +140,10 @@  discard block
 block discarded – undo
141 140
         if ($i + 1 === strlen($value))
142 141
         {
143 142
             throw new \Exception('Unexpected EOF');
144
-        }
145
-        elseif ($value{$i + 1} !== ']')
143
+        } elseif ($value{$i + 1} !== ']')
146 144
         {
147 145
             throw new \Exception('[ must be followed by ]');
148
-        }
149
-        elseif ($i + 2 !== strlen($value))
146
+        } elseif ($i + 2 !== strlen($value))
150 147
         {
151 148
             if (!in_array($value{$i + 2}, ['>',',']))
152 149
             {
@@ -245,12 +242,10 @@  discard block
 block discarded – undo
245 242
         if ($useStatements->containsKey($this->currentValue))
246 243
         {
247 244
             return $useStatements[$this->currentValue]->classname;
248
-        }
249
-        elseif ($generics->containsKey($this->currentValue))
245
+        } elseif ($generics->containsKey($this->currentValue))
250 246
         {
251 247
             return new GenericType($this->currentValue);
252
-        }
253
-        else
248
+        } else
254 249
         {
255 250
             return $this->context->namespace->namespace
256 251
                 . '\\' . $this->currentValue;
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -225,6 +225,9 @@
 block discarded – undo
225 225
             : new ObjectType($context);
226 226
     }
227 227
 
228
+    /**
229
+     * @param string $var
230
+     */
228 231
     public function scalarToType($var) : ?AbstractType
229 232
     {
230 233
         switch (strtolower($var))
Please login to merge, or discard this patch.
Spacing   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -89,8 +89,7 @@  discard block
 block discarded – undo
89 89
      */
90 90
     public function parseObjectName($var) : ObjectType
91 91
     {
92
-        return $this->parse(str_replace
93
-        (
92
+        return $this->parse(str_replace(
94 93
             [GenericNameProvider::BASE, '_g', '_e', '_c'],
95 94
             ['', '<', '>', ','],
96 95
             get_class($var)
@@ -135,7 +134,7 @@  discard block
 block discarded – undo
135 134
                     $item = $stack->pop();
136 135
                     if ($value{$i - 1} !== '>')
137 136
                     {
138
-                        $item->generics[] =$this->resolveName();
137
+                        $item->generics[] = $this->resolveName();
139 138
                     }
140 139
 
141 140
                     if ($i + 1 !== strlen($value) && $value{$i + 1} === '[')
@@ -183,7 +182,7 @@  discard block
 block discarded – undo
183 182
         }
184 183
         elseif ($i + 2 !== strlen($value))
185 184
         {
186
-            if (!in_array($value{$i + 2}, ['>',',']))
185
+            if (!in_array($value{$i + 2}, ['>', ',']))
187 186
             {
188 187
                 throw new \Exception('Unexpected char after collection');
189 188
             }
@@ -226,7 +225,7 @@  discard block
 block discarded – undo
226 225
             : new ObjectType($context);
227 226
     }
228 227
 
229
-    public function scalarToType($var) : ?AbstractType
228
+    public function scalarToType($var) : ? AbstractType
230 229
     {
231 230
         switch (strtolower($var))
232 231
         {
Please login to merge, or discard this patch.
src/Traits/HasReflectorTrait.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
src/Model/Common/Equatable.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
src/Exception/MissingContextException.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,13 +28,11 @@
 block discarded – undo
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,
Please login to merge, or discard this patch.
src/Service/ReflectionCompositeProvider.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,8 +54,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
90 89
         {
91 90
             $this->cache[$classname] =
92 91
                 (
93
-                    ReflectionCompositeFactory::fromClassName
94
-                    (
92
+                    ReflectionCompositeFactory::fromClassName(
95 93
                         $classname
96 94
                     )
97 95
                 )
Please login to merge, or discard this patch.
src/Model/Reflection/Type/ObjectType.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
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)
Please login to merge, or discard this patch.
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,8 +59,7 @@
 block discarded – undo
59 59
      */
60 60
     public function equals($type) : bool
61 61
     {
62
-        if
63
-        (
62
+        if (
64 63
             $type instanceof ObjectType &&
65 64
             $type->classname->equals($this->classname) &&
66 65
             $type->generics->size() === $this->generics->size()
Please login to merge, or discard this patch.
src/Model/ClassName.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,8 +46,7 @@
 block discarded – undo
46 46
         if (!$matches)
47 47
         {
48 48
             $this->classname = $classname;
49
-        }
50
-        else
49
+        } else
51 50
         {
52 51
             $this->classname = $matches[2];
53 52
             $this->namespace = $matches[1];
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
     public function __toString()
63 63
     {
64 64
         return
65
-              ($this->namespace ? $this->namespace . '\\' : '')
65
+                ($this->namespace ? $this->namespace . '\\' : '')
66 66
             . $this->classname;
67 67
     }
68 68
 
Please login to merge, or discard this patch.
src/Service/PropertyAccessor.php 3 patches
Unused Use Statements   -5 removed lines patch added patch discarded remove patch
@@ -17,11 +17,6 @@
 block discarded – undo
17 17
 use Spaark\CompositeUtils\Model\Reflection\ReflectionComposite;
18 18
 use Spaark\CompositeUtils\Model\Reflection\ReflectionProperty;
19 19
 use Spaark\CompositeUtils\Model\Reflection\Type\ObjectType;
20
-use Spaark\CompositeUtils\Model\Reflection\Type\MixedType;
21
-use Spaark\CompositeUtils\Model\Reflection\Type\StringType;
22
-use Spaark\CompositeUtils\Model\Reflection\Type\IntegerType;
23
-use Spaark\CompositeUtils\Model\Reflection\Type\BooleanType;
24
-use Spaark\CompositeUtils\Model\Reflection\Type\CollectionType;
25 20
 use Spaark\CompositeUtils\Model\Reflection\Type\ScalarType;
26 21
 use Spaark\CompositeUtils\Model\Reflection\Type\AbstractType;
27 22
 use Spaark\CompositeUtils\Exception\CannotWritePropertyException;
Please login to merge, or discard this patch.
Spacing   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@  discard block
 block discarded – undo
69 69
         {
70 70
             if (!isset($args[$i]))
71 71
             {
72
-                throw new MissingRequiredParameterException
73
-                (
72
+                throw new MissingRequiredParameterException(
74 73
                     get_class($this->object),
75 74
                     $property->name
76 75
                 );
@@ -148,14 +147,12 @@  discard block
 block discarded – undo
148 147
     {
149 148
         if (!$this->reflect->properties->containsKey($property))
150 149
         {
151
-            throw new CannotWritePropertyException
152
-            (
150
+            throw new CannotWritePropertyException(
153 151
                 get_class($this->object), $property
154 152
             );
155 153
         }
156 154
 
157
-        $this->setAnyValue
158
-        (
155
+        $this->setAnyValue(
159 156
             $this->reflect->properties[$property],
160 157
             $value
161 158
         );
@@ -193,8 +190,7 @@  discard block
 block discarded – undo
193 190
      * @param ScalarType $valueType The scalar type
194 191
      * @param mixed $value The value to set
195 192
      */
196
-    private function setScalarValue
197
-    (
193
+    private function setScalarValue(
198 194
         ReflectionProperty $property,
199 195
         ScalarType $valueType,
200 196
         $value
@@ -204,16 +200,14 @@  discard block
 block discarded – undo
204 200
 
205 201
         if (is_scalar($value))
206 202
         {
207
-            $this->setRawValue
208
-            (
203
+            $this->setRawValue(
209 204
                 $property->name,
210 205
                 $property->type->cast($value)
211 206
             );
212 207
         }
213 208
         elseif (is_object($value) && method_exists([$value, $method]))
214 209
         {
215
-            $this->setScalarValue
216
-            (
210
+            $this->setScalarValue(
217 211
                 $property,
218 212
                 $valueType,
219 213
                 $value->$method()
@@ -231,14 +225,12 @@  discard block
 block discarded – undo
231 225
      * @param ReflectionProperty $property The property being set
232 226
      * @param AbstractType $valueType The value being set
233 227
      */
234
-    private function throwError
235
-    (
228
+    private function throwError(
236 229
         ReflectionProperty $property,
237 230
         AbstractType $valueType
238 231
     )
239 232
     {
240
-        throw new IllegalPropertyTypeException
241
-        (
233
+        throw new IllegalPropertyTypeException(
242 234
             get_class($this->object),
243 235
             $property->name,
244 236
             $property->type,
Please login to merge, or discard this patch.
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -88,15 +88,13 @@  discard block
 block discarded – undo
88 88
             if ($building)
89 89
             {
90 90
                 $this->buildProperty($property);
91
-            }
92
-            else
91
+            } else
93 92
             {
94 93
                 if (isset($args[$i]))
95 94
                 {
96 95
                     $this->setAnyValue($property, $args[$i]);
97 96
                     $i++;
98
-                }
99
-                else
97
+                } else
100 98
                 {
101 99
                     $building = true;
102 100
                     $this->buildProperty($property);
@@ -120,8 +118,7 @@  discard block
 block discarded – undo
120 118
         if (!$property->type instanceof ObjectType)
121 119
         {
122 120
             $this->setAnyValue($property, 0);
123
-        }
124
-        elseif ($property->builtInConstructor)
121
+        } elseif ($property->builtInConstructor)
125 122
         {
126 123
             $class = (string)$property->type->classname;
127 124
             $this->setRawValue($property->name, new $class());
@@ -175,8 +172,7 @@  discard block
 block discarded – undo
175 172
         if ($value instanceof Generic)
176 173
         {
177 174
             $valueType = $value->getObjectType();
178
-        }
179
-        else
175
+        } else
180 176
         {
181 177
             $valueType = (new TypeParser())->parseFromType($value);
182 178
         }
@@ -184,12 +180,10 @@  discard block
 block discarded – undo
184 180
         if ($comparator->compatible($property->type, $valueType))
185 181
         {
186 182
             $this->setRawValue($property->name, $value);
187
-        }
188
-        elseif ($property->type instanceof ScalarType)
183
+        } elseif ($property->type instanceof ScalarType)
189 184
         {
190 185
             $this->setScalarValue($property, $valueType, $value);
191
-        }
192
-        else
186
+        } else
193 187
         {
194 188
             $this->throwError($property, $valueType);
195 189
         }
@@ -218,8 +212,7 @@  discard block
 block discarded – undo
218 212
                 $property->name,
219 213
                 $property->type->cast($value)
220 214
             );
221
-        }
222
-        elseif (is_object($value) && method_exists([$value, $method]))
215
+        } elseif (is_object($value) && method_exists([$value, $method]))
223 216
         {
224 217
             $this->setScalarValue
225 218
             (
@@ -227,8 +220,7 @@  discard block
 block discarded – undo
227 220
                 $valueType,
228 221
                 $value->$method()
229 222
             );
230
-        }
231
-        else
223
+        } else
232 224
         {
233 225
             $this->throwError($property, $valueType);
234 226
         }
Please login to merge, or discard this patch.