Completed
Pull Request — master (#82)
by Loren
03:32
created
src/NodeVisitor/BuiltinTypeFixer.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -189,6 +189,9 @@  discard block
 block discarded – undo
189 189
         $node->returnType = $this->fixType($node->returnType, self::RETURN_TYPES);
190 190
     }
191 191
 
192
+    /**
193
+     * @param integer $contextType
194
+     */
192 195
     private function fixType($node, $contextType)
193 196
     {
194 197
         $typeAsString = $this->getTypeAsString($node);
@@ -232,6 +235,9 @@  discard block
 block discarded – undo
232 235
         return strval($node);
233 236
     }
234 237
 
238
+    /**
239
+     * @param string $typeName
240
+     */
235 241
     private function isTypeDefinedForContext($typeName, $contextType)
236 242
     {
237 243
         return
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
             }
44 44
             $numericIndexCount = count(array_filter(
45 45
                 $options['supportedBuiltinTypeHints'],
46
-                (function ($val) {
46
+                (function($val) {
47 47
                     return preg_match('/^0*(0|[1-9]\\d*)$/', $val);
48 48
                 }),
49 49
                 ARRAY_FILTER_USE_KEY
@@ -53,24 +53,24 @@  discard block
 block discarded – undo
53 53
                 $typeHintName = $key;
54 54
                 $validFor     = $value;
55 55
                 if (preg_match('/^0*(0|[1-9]\\d*)$/', $key) &&
56
-                    (intval($key) >= 0)                     &&
57
-                    (intval($key) <  $numericIndexCount)
56
+                    (intval($key) >= 0) &&
57
+                    (intval($key) < $numericIndexCount)
58 58
                 ) {
59 59
                     $numericIndex = true;
60 60
                     $typeHintName = $value;
61
-                    $validFor     = self::PARAMETER_TYPES|self::RETURN_TYPES;
61
+                    $validFor     = self::PARAMETER_TYPES | self::RETURN_TYPES;
62 62
                 }
63 63
                 if (!is_string($typeHintName) || !preg_match('/^\\w(?<!\\d)\\w*$/', $typeHintName)) {
64 64
                     throw new \InvalidArgumentException(
65 65
                         sprintf(
66
-                            "Option 'supportedBuiltinTypeHints's element %s " .
66
+                            "Option 'supportedBuiltinTypeHints's element %s ".
67 67
                                 "isn't a valid typehint string.",
68 68
                             var_export($typeHintName, true)
69 69
                         )
70 70
                     );
71
-                } elseif (!is_scalar($validFor)                                                                   ||
72
-                    (strval($validFor) != strval(intval($validFor)))                                        ||
73
-                    (intval($validFor) != (intval($validFor) & (self::PARAMETER_TYPES|self::RETURN_TYPES))) ||
71
+                } elseif (!is_scalar($validFor) ||
72
+                    (strval($validFor) != strval(intval($validFor))) ||
73
+                    (intval($validFor) != (intval($validFor) & (self::PARAMETER_TYPES | self::RETURN_TYPES))) ||
74 74
                     (intval($validFor) == 0)
75 75
                 ) {
76 76
                     throw new \InvalidArgumentException(
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
                         )
89 89
                     );
90 90
                 } else {
91
-                    $this->supportedBuiltinTypeHints[$typeHintName] = intval($validFor) & (self::PARAMETER_TYPES|self::RETURN_TYPES);
91
+                    $this->supportedBuiltinTypeHints[$typeHintName] = intval($validFor) & (self::PARAMETER_TYPES | self::RETURN_TYPES);
92 92
                 }
93 93
             }
94 94
         } else {
@@ -126,31 +126,31 @@  discard block
 block discarded – undo
126 126
             $builtInTypeNames = [
127 127
                 'array'    => [
128 128
                     'introduced_version' => 50100,
129
-                    'valid_for'          => self::PARAMETER_TYPES|self::RETURN_TYPES,
129
+                    'valid_for'          => self::PARAMETER_TYPES | self::RETURN_TYPES,
130 130
                 ],
131 131
                 'callable' => [
132 132
                     'introduced_version' => 50400,
133
-                    'valid_for'          => self::PARAMETER_TYPES|self::RETURN_TYPES,
133
+                    'valid_for'          => self::PARAMETER_TYPES | self::RETURN_TYPES,
134 134
                 ],
135 135
                 'bool'     => [
136 136
                     'introduced_version' => 70000,
137
-                    'valid_for'          => self::PARAMETER_TYPES|self::RETURN_TYPES,
137
+                    'valid_for'          => self::PARAMETER_TYPES | self::RETURN_TYPES,
138 138
                 ],
139 139
                 'float'    => [
140 140
                     'introduced_version' => 70000,
141
-                    'valid_for'          => self::PARAMETER_TYPES|self::RETURN_TYPES,
141
+                    'valid_for'          => self::PARAMETER_TYPES | self::RETURN_TYPES,
142 142
                 ],
143 143
                 'int'      => [
144 144
                     'introduced_version' => 70000,
145
-                    'valid_for'          => self::PARAMETER_TYPES|self::RETURN_TYPES,
145
+                    'valid_for'          => self::PARAMETER_TYPES | self::RETURN_TYPES,
146 146
                 ],
147 147
                 'string'   => [
148 148
                     'introduced_version' => 70000,
149
-                    'valid_for'          => self::PARAMETER_TYPES|self::RETURN_TYPES,
149
+                    'valid_for'          => self::PARAMETER_TYPES | self::RETURN_TYPES,
150 150
                 ],
151 151
                 'iterable' => [
152 152
                     'introduced_version' => 70100,
153
-                    'valid_for'          => self::PARAMETER_TYPES|self::RETURN_TYPES,
153
+                    'valid_for'          => self::PARAMETER_TYPES | self::RETURN_TYPES,
154 154
                 ],
155 155
                 'void'     => [
156 156
                     'introduced_version' => 70100,
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
                 ],
159 159
                 'object'   => [
160 160
                     'introduced_version' => 70200,
161
-                    'valid_for'          => self::PARAMETER_TYPES|self::RETURN_TYPES,
161
+                    'valid_for'          => self::PARAMETER_TYPES | self::RETURN_TYPES,
162 162
                 ],
163 163
             ];
164 164
             foreach ($builtInTypeNames as $typeHintName => $valid) {
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
     public function enterNode(Node $node)
173 173
     {
174 174
         if (
175
-            ($node instanceof Stmt\Function_)   ||
175
+            ($node instanceof Stmt\Function_) ||
176 176
             ($node instanceof Stmt\ClassMethod) ||
177 177
             ($node instanceof Expr\Closure)
178 178
         ) {
@@ -224,10 +224,10 @@  discard block
 block discarded – undo
224 224
         }
225 225
         if ($node instanceof Node\NullableType) {
226 226
             // This *SHOULD* never be called, but correct behavior shorter than Exception.
227
-            return '?' . $this->getTypeAsString($node->type);
227
+            return '?'.$this->getTypeAsString($node->type);
228 228
         }
229 229
         if ($node instanceof Name) {
230
-            return ($node->isFullyQualified() ? '\\' : '') . $node->toString();
230
+            return ($node->isFullyQualified() ? '\\' : '').$node->toString();
231 231
         }
232 232
         return strval($node);
233 233
     }
Please login to merge, or discard this patch.