@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use PhpParser\Node; |
| 8 | 8 | use PhpParser\Node\Stmt\Catch_; |
| 9 | 9 | use PHPStan\Analyser\Scope; |
| 10 | -use PHPStan\Broker\Broker; |
|
| 11 | 10 | use PHPStan\Rules\Rule; |
| 12 | 11 | |
| 13 | 12 | class EmptyExceptionRule implements Rule |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use PhpParser\NodeTraverser; |
| 10 | 10 | use PhpParser\NodeVisitorAbstract; |
| 11 | 11 | use PHPStan\Analyser\Scope; |
| 12 | -use PHPStan\Broker\Broker; |
|
| 13 | 12 | use PHPStan\Rules\Rule; |
| 14 | 13 | |
| 15 | 14 | /** |
@@ -3,12 +3,9 @@ |
||
| 3 | 3 | |
| 4 | 4 | namespace TheCodingMachine\PHPStan\Rules\TypeHints; |
| 5 | 5 | |
| 6 | -use Roave\BetterReflection\Reflection\ReflectionFunction; |
|
| 7 | 6 | use Roave\BetterReflection\Reflection\ReflectionFunctionAbstract; |
| 8 | -use Roave\BetterReflection\Reflection\ReflectionMethod; |
|
| 9 | 7 | use Roave\BetterReflection\Reflection\ReflectionParameter; |
| 10 | 8 | use PhpParser\Node; |
| 11 | -use PHPStan\Reflection\MethodReflection; |
|
| 12 | 9 | |
| 13 | 10 | class MissingTypeHintInMethodRule extends AbstractMissingTypeHintRule |
| 14 | 11 | { |
@@ -3,7 +3,6 @@ discard block |
||
| 3 | 3 | |
| 4 | 4 | namespace TheCodingMachine\PHPStan\Rules\TypeHints; |
| 5 | 5 | |
| 6 | -use phpDocumentor\Reflection\DocBlockFactory; |
|
| 7 | 6 | use phpDocumentor\Reflection\Type; |
| 8 | 7 | use phpDocumentor\Reflection\Types\Array_; |
| 9 | 8 | use phpDocumentor\Reflection\Types\Boolean; |
@@ -26,8 +25,6 @@ discard block |
||
| 26 | 25 | use Roave\BetterReflection\Reflection\ReflectionMethod; |
| 27 | 26 | use Roave\BetterReflection\Reflection\ReflectionParameter; |
| 28 | 27 | use Roave\BetterReflection\Reflector\Exception\IdentifierNotFound; |
| 29 | -use Roave\BetterReflection\TypesFinder\PhpDocumentor\NamespaceNodeToReflectionTypeContext; |
|
| 30 | -use Roave\BetterReflection\TypesFinder\ResolveTypes; |
|
| 31 | 28 | |
| 32 | 29 | abstract class AbstractMissingTypeHintRule implements Rule |
| 33 | 30 | { |
@@ -197,9 +197,9 @@ discard block |
||
| 197 | 197 | foreach ($docblockWithoutNullable as $docblockTypehint) { |
| 198 | 198 | if (!$this->isTypeIterable($docblockTypehint)) { |
| 199 | 199 | if ($context instanceof ReflectionParameter) { |
| 200 | - return sprintf('%s, mismatching type-hints for parameter %s. PHP type hint is "array" and docblock type hint is %s.', $this->getContext($context), $context->getName(), (string)$docblockTypehint); |
|
| 200 | + return sprintf('%s, mismatching type-hints for parameter %s. PHP type hint is "array" and docblock type hint is %s.', $this->getContext($context), $context->getName(), (string) $docblockTypehint); |
|
| 201 | 201 | } else { |
| 202 | - return sprintf('%s, mismatching type-hints for return type. PHP type hint is "array" and docblock declared return type is %s.', $this->getContext($context), (string)$docblockTypehint); |
|
| 202 | + return sprintf('%s, mismatching type-hints for return type. PHP type hint is "array" and docblock declared return type is %s.', $this->getContext($context), (string) $docblockTypehint); |
|
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | |
@@ -308,11 +308,11 @@ discard block |
||
| 308 | 308 | $type = $types[0]; |
| 309 | 309 | |
| 310 | 310 | if ($this->isNativeType($type)) { |
| 311 | - return ($isNullable?'?':'').((string)$type); |
|
| 311 | + return ($isNullable ? '?' : '').((string) $type); |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | if ($type instanceof Array_) { |
| 315 | - return ($isNullable?'?':'').'array'; |
|
| 315 | + return ($isNullable ? '?' : '').'array'; |
|
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | // TODO: more definitions to add here |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | |
| 322 | 322 | // "object" type-hint is not available in PHP 7.1 |
| 323 | 323 | if ($type instanceof Object_ && (string) $type !== 'object') { |
| 324 | - return ($isNullable?'?':'').((string)$type); |
|
| 324 | + return ($isNullable ? '?' : '').((string) $type); |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | return null; |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | */ |
| 365 | 365 | private function typesWithoutNullable(array $docBlockTypeHints): array |
| 366 | 366 | { |
| 367 | - return array_values(array_filter($docBlockTypeHints, function ($item) { |
|
| 367 | + return array_values(array_filter($docBlockTypeHints, function($item) { |
|
| 368 | 368 | return !$item instanceof Null_; |
| 369 | 369 | })); |
| 370 | 370 | } |