@@ -185,6 +185,9 @@ |
||
185 | 185 | $node->returnType = $this->fixType($node->returnType, self::RETURN_TYPES); |
186 | 186 | } |
187 | 187 | |
188 | + /** |
|
189 | + * @param integer $contextType |
|
190 | + */ |
|
188 | 191 | private function fixType($node, $contextType) |
189 | 192 | { |
190 | 193 | if (!is_object($node) && (strval($node) == '')) { |
@@ -43,7 +43,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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, |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | public function enterNode(Node $node) |
169 | 169 | { |
170 | 170 | if ( |
171 | - ($node instanceof Stmt\Function_) || |
|
171 | + ($node instanceof Stmt\Function_) || |
|
172 | 172 | ($node instanceof Stmt\ClassMethod) || |
173 | 173 | ($node instanceof Expr\Closure) |
174 | 174 | ) { |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | // where a builtin type could be recognized as a class |
212 | 212 | // name instead. |
213 | 213 | if ( |
214 | - ($node instanceof Name) && |
|
214 | + ($node instanceof Name) && |
|
215 | 215 | !($node->isFullyQualified()) && |
216 | 216 | (count($node->parts) == 1) && |
217 | 217 | ( |