@@ -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 | /** |
@@ -9,10 +9,6 @@ |
||
| 9 | 9 | use PHPStan\Reflection\ParametersAcceptorSelector; |
| 10 | 10 | use PHPStan\Reflection\ParametersAcceptorWithPhpDocs; |
| 11 | 11 | use PHPStan\Reflection\Php\PhpMethodReflection; |
| 12 | -use Roave\BetterReflection\Reflection\ReflectionFunction; |
|
| 13 | -use Roave\BetterReflection\Reflection\ReflectionFunctionAbstract; |
|
| 14 | -use Roave\BetterReflection\Reflection\ReflectionMethod; |
|
| 15 | -use Roave\BetterReflection\Reflection\ReflectionParameter; |
|
| 16 | 12 | use PhpParser\Node; |
| 17 | 13 | use PHPStan\Reflection\MethodReflection; |
| 18 | 14 | |
@@ -42,8 +42,7 @@ |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | return sprintf('In method "%s::%s", parameter $%s', $this->scope->getClassReflection()->getDisplayName(), $this->function->name->name, $this->parameter->getName()); |
| 45 | - } |
|
| 46 | - elseif ($this->function instanceof Function_) { |
|
| 45 | + } elseif ($this->function instanceof Function_) { |
|
| 47 | 46 | return sprintf('In function "%s", parameter $%s', $this->function->name->name, $this->parameter->getName()); |
| 48 | 47 | } |
| 49 | 48 | return 'Should not happen'; |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | |
| 6 | 6 | |
| 7 | 7 | use PhpParser\Node\FunctionLike; |
| 8 | -use PhpParser\Node\Name; |
|
| 9 | 8 | use PhpParser\Node\Stmt\ClassMethod; |
| 10 | 9 | use PhpParser\Node\Stmt\Function_; |
| 11 | 10 | use PHPStan\Analyser\Scope; |
@@ -287,15 +287,15 @@ discard block |
||
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | if ($type instanceof ObjectType) { |
| 290 | - return ($isNullable?'?':'').'\\'.$type->describe(VerbosityLevel::typeOnly()); |
|
| 290 | + return ($isNullable ? '?' : '').'\\'.$type->describe(VerbosityLevel::typeOnly()); |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | if ($type instanceof ArrayType) { |
| 294 | - return ($isNullable?'?':'').'array'; |
|
| 294 | + return ($isNullable ? '?' : '').'array'; |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | if ($this->isNativeType($type)) { |
| 298 | - return ($isNullable?'?':'').$type->describe(VerbosityLevel::typeOnly()); |
|
| 298 | + return ($isNullable ? '?' : '').$type->describe(VerbosityLevel::typeOnly()); |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | // TODO: more definitions to add here |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | private function typesWithoutNullable(Type $docBlockTypeHints): Type |
| 346 | 346 | { |
| 347 | 347 | if ($docBlockTypeHints instanceof UnionType) { |
| 348 | - $filteredTypes = array_values(array_filter($docBlockTypeHints->getTypes(), function (Type $item) { |
|
| 348 | + $filteredTypes = array_values(array_filter($docBlockTypeHints->getTypes(), function(Type $item) { |
|
| 349 | 349 | return !$item instanceof NullType; |
| 350 | 350 | })); |
| 351 | 351 | if (\count($filteredTypes) === 1) { |
@@ -3,8 +3,6 @@ |
||
| 3 | 3 | |
| 4 | 4 | namespace TheCodingMachine\PHPStan\Rules\TypeHints; |
| 5 | 5 | |
| 6 | -use PHPStan\Reflection\Php\PhpFunctionReflection; |
|
| 7 | -use PHPStan\Reflection\Php\PhpMethodReflection; |
|
| 8 | 6 | use PHPStan\Type\ArrayType; |
| 9 | 7 | use PHPStan\Type\BooleanType; |
| 10 | 8 | use PHPStan\Type\CallableType; |
@@ -37,8 +37,7 @@ |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | return sprintf('In method "%s::%s",', $this->scope->getClassReflection()->getDisplayName(), $this->function->name->name); |
| 40 | - } |
|
| 41 | - elseif ($this->function instanceof Function_) { |
|
| 40 | + } elseif ($this->function instanceof Function_) { |
|
| 42 | 41 | return sprintf('In function "%s",', $this->function->name->name); |
| 43 | 42 | } |
| 44 | 43 | return 'Should not happen'; |
@@ -5,11 +5,9 @@ |
||
| 5 | 5 | |
| 6 | 6 | |
| 7 | 7 | use PhpParser\Node\FunctionLike; |
| 8 | -use PhpParser\Node\Name; |
|
| 9 | 8 | use PhpParser\Node\Stmt\ClassMethod; |
| 10 | 9 | use PhpParser\Node\Stmt\Function_; |
| 11 | 10 | use PHPStan\Analyser\Scope; |
| 12 | -use PHPStan\Reflection\Php\PhpParameterReflection; |
|
| 13 | 11 | |
| 14 | 12 | class FunctionDebugContext implements DebugContextInterface |
| 15 | 13 | { |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | use PhpParser\NodeTraverser; |
| 11 | 11 | use PhpParser\NodeVisitorAbstract; |
| 12 | 12 | use PHPStan\Analyser\Scope; |
| 13 | -use PHPStan\Broker\Broker; |
|
| 14 | 13 | use PHPStan\Rules\Rule; |
| 15 | 14 | use RuntimeException; |
| 16 | 15 | use TheCodingMachine\PHPStan\Utils\PrefixGenerator; |
@@ -37,8 +37,8 @@ |
||
| 37 | 37 | // Let's only apply the filter to \Exception, \RuntimeException or \Throwable |
| 38 | 38 | $exceptionType = null; |
| 39 | 39 | foreach ($node->types as $type) { |
| 40 | - if (in_array((string)$type, [Exception::class, RuntimeException::class, Throwable::class], true)) { |
|
| 41 | - $exceptionType = (string)$type; |
|
| 40 | + if (in_array((string) $type, [Exception::class, RuntimeException::class, Throwable::class], true)) { |
|
| 41 | + $exceptionType = (string) $type; |
|
| 42 | 42 | break; |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use PhpParser\Node; |
| 7 | 7 | use PhpParser\Node\Stmt\Catch_; |
| 8 | 8 | use PHPStan\Analyser\Scope; |
| 9 | -use PHPStan\Broker\Broker; |
|
| 10 | 9 | use PHPStan\Rules\Rule; |
| 11 | 10 | use function strpos; |
| 12 | 11 | |