@@ -189,6 +189,9 @@ |
||
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 | if (!is_object($node) && (strval($node) == '')) { |
194 | 197 | return $node; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | } |
43 | 43 | $numericIndexCount = count(array_filter( |
44 | 44 | $options['supportedBuiltinTypeHints'], |
45 | - (function ($val) { |
|
45 | + (function($val) { |
|
46 | 46 | return preg_match('/^0*(0|[1-9]\\d*)$/', $val); |
47 | 47 | }), |
48 | 48 | ARRAY_FILTER_USE_KEY |
@@ -52,24 +52,24 @@ discard block |
||
52 | 52 | $typeHintName = $key; |
53 | 53 | $validFor = $value; |
54 | 54 | if (preg_match('/^0*(0|[1-9]\\d*)$/', $key) && |
55 | - (intval($key) >= 0) && |
|
56 | - (intval($key) < $numericIndexCount) |
|
55 | + (intval($key) >= 0) && |
|
56 | + (intval($key) < $numericIndexCount) |
|
57 | 57 | ) { |
58 | 58 | $numericIndex = true; |
59 | 59 | $typeHintName = $value; |
60 | - $validFor = self::PARAMETER_TYPES|self::RETURN_TYPES; |
|
60 | + $validFor = self::PARAMETER_TYPES | self::RETURN_TYPES; |
|
61 | 61 | } |
62 | 62 | if (!is_string($typeHintName) || !preg_match('/^\\w(?<!\\d)\\w*$/', $typeHintName)) { |
63 | 63 | throw new \InvalidArgumentException( |
64 | 64 | sprintf( |
65 | - "Option 'supportedBuiltinTypeHints's element %s " . |
|
65 | + "Option 'supportedBuiltinTypeHints's element %s ". |
|
66 | 66 | "isn't a valid typehint string.", |
67 | 67 | var_export($typeHintName, true) |
68 | 68 | ) |
69 | 69 | ); |
70 | - } elseif (!is_scalar($validFor) || |
|
71 | - (strval($validFor) != strval(intval($validFor))) || |
|
72 | - (intval($validFor) != (intval($validFor) & (self::PARAMETER_TYPES|self::RETURN_TYPES))) || |
|
70 | + } elseif (!is_scalar($validFor) || |
|
71 | + (strval($validFor) != strval(intval($validFor))) || |
|
72 | + (intval($validFor) != (intval($validFor) & (self::PARAMETER_TYPES | self::RETURN_TYPES))) || |
|
73 | 73 | (intval($validFor) == 0) |
74 | 74 | ) { |
75 | 75 | throw new \InvalidArgumentException( |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | ) |
88 | 88 | ); |
89 | 89 | } else { |
90 | - $this->supportedBuiltinTypeHints[$typeHintName] = intval($validFor) & (self::PARAMETER_TYPES|self::RETURN_TYPES); |
|
90 | + $this->supportedBuiltinTypeHints[$typeHintName] = intval($validFor) & (self::PARAMETER_TYPES | self::RETURN_TYPES); |
|
91 | 91 | } |
92 | 92 | } |
93 | 93 | } else { |
@@ -125,31 +125,31 @@ discard block |
||
125 | 125 | $builtInTypeNames = [ |
126 | 126 | 'array' => [ |
127 | 127 | 'introduced_version' => 50100, |
128 | - 'valid_for' => self::PARAMETER_TYPES|self::RETURN_TYPES, |
|
128 | + 'valid_for' => self::PARAMETER_TYPES | self::RETURN_TYPES, |
|
129 | 129 | ], |
130 | 130 | 'callable' => [ |
131 | 131 | 'introduced_version' => 50400, |
132 | - 'valid_for' => self::PARAMETER_TYPES|self::RETURN_TYPES, |
|
132 | + 'valid_for' => self::PARAMETER_TYPES | self::RETURN_TYPES, |
|
133 | 133 | ], |
134 | 134 | 'bool' => [ |
135 | 135 | 'introduced_version' => 70000, |
136 | - 'valid_for' => self::PARAMETER_TYPES|self::RETURN_TYPES, |
|
136 | + 'valid_for' => self::PARAMETER_TYPES | self::RETURN_TYPES, |
|
137 | 137 | ], |
138 | 138 | 'float' => [ |
139 | 139 | 'introduced_version' => 70000, |
140 | - 'valid_for' => self::PARAMETER_TYPES|self::RETURN_TYPES, |
|
140 | + 'valid_for' => self::PARAMETER_TYPES | self::RETURN_TYPES, |
|
141 | 141 | ], |
142 | 142 | 'int' => [ |
143 | 143 | 'introduced_version' => 70000, |
144 | - 'valid_for' => self::PARAMETER_TYPES|self::RETURN_TYPES, |
|
144 | + 'valid_for' => self::PARAMETER_TYPES | self::RETURN_TYPES, |
|
145 | 145 | ], |
146 | 146 | 'string' => [ |
147 | 147 | 'introduced_version' => 70000, |
148 | - 'valid_for' => self::PARAMETER_TYPES|self::RETURN_TYPES, |
|
148 | + 'valid_for' => self::PARAMETER_TYPES | self::RETURN_TYPES, |
|
149 | 149 | ], |
150 | 150 | 'iterable' => [ |
151 | 151 | 'introduced_version' => 70100, |
152 | - 'valid_for' => self::PARAMETER_TYPES|self::RETURN_TYPES, |
|
152 | + 'valid_for' => self::PARAMETER_TYPES | self::RETURN_TYPES, |
|
153 | 153 | ], |
154 | 154 | 'void' => [ |
155 | 155 | 'introduced_version' => 70100, |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | |
167 | 167 | public function enterNode(Node $node) { |
168 | 168 | if ( |
169 | - ($node instanceof Stmt\Function_) || |
|
169 | + ($node instanceof Stmt\Function_) || |
|
170 | 170 | ($node instanceof Stmt\ClassMethod) || |
171 | 171 | ($node instanceof Expr\Closure) |
172 | 172 | ) { |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | // where a builtin type could be recognized as a class |
208 | 208 | // name instead. |
209 | 209 | if ( |
210 | - ($node instanceof Name) && |
|
210 | + ($node instanceof Name) && |
|
211 | 211 | !($node->isFullyQualified()) && |
212 | 212 | (count($node->parts) == 1) && |
213 | 213 | ( |