mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-03 15:12:30 +02:00
Code Issues Projects Releases Wiki Activity

Resolve anonymous class return type to object (#1719)

Browse Source 
Resolve anonymous class return type to object
This commit is contained in:
Tomáš Votruba 2019-07-09 22:50:42 +02:00 committed by GitHub
commit d7a88ddd45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/NodeTypeResolver/src/NodeTypeResolver.php
View File

@ -35,6 +35,7 @@ use PHPStan\Type\IntersectionType;
use PHPStan\Type\MixedType;
use PHPStan\Type\NullType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\ObjectWithoutClassType;
use PHPStan\Type\StringType;
use PHPStan\Type\Type;
use PHPStan\Type\UnionType;
@ -297,6 +298,12 @@ final class NodeTypeResolver
return null;
}
if ($node instanceof New_) {
if ($this->isAnonymousClass($node->class)) {
return new ObjectWithoutClassType();
}
}
return $nodeScope->getType($node);
}
@ -410,8 +417,7 @@ final class NodeTypeResolver
// skip anonymous classes, ref https://github.com/rectorphp/rector/issues/1574
if ($node instanceof New_) {
$className = $this->nameResolver->resolve($node->class);
if ($className === null || Strings::contains($className, 'AnonymousClass')) {
if ($this->isAnonymousClass($node->class)) {
return [];
}
}
@ -556,4 +562,15 @@ final class NodeTypeResolver
return null;
}
private function isAnonymousClass(Node $node): bool
{
if (! $node instanceof Class_) {
return false;
}
$className = $this->nameResolver->resolve($node);
return $className === null || Strings::contains($className, 'AnonymousClass');
}
}

2
packages/NodeTypeResolver/src/StaticTypeToStringResolver.php
View File

@ -10,6 +10,7 @@ use PHPStan\Type\FloatType;
use PHPStan\Type\IntegerType;
use PHPStan\Type\NullType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\ObjectWithoutClassType;
use PHPStan\Type\StringType;
use PHPStan\Type\Type;
use PHPStan\Type\UnionType;
@ -26,6 +27,7 @@ final class StaticTypeToStringResolver
{
$resolvers = [
IntegerType::class => ['int'],
ObjectWithoutClassType::class => ['object'],
ClosureType::class => ['callable'],
CallableType::class => ['callable'],
FloatType::class => ['float'],

27
packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/Fixture/a_new_class.php.inc Normal file
View File

@ -0,0 +1,27 @@
<?php
namespace Rector\TypeDeclaration\Tests\Rector\ClassMethod\ReturnTypeDeclarationRector\Fixture;
class ANewClass
{
public function getObject()
{
return new class() {};
}
}
?>
-----
<?php
namespace Rector\TypeDeclaration\Tests\Rector\ClassMethod\ReturnTypeDeclarationRector\Fixture;
class ANewClass
{
public function getObject(): object
{
return new class() {};
}
}
?>

2
packages/TypeDeclaration/tests/Rector/FunctionLike/ReturnTypeDeclarationRector/ReturnTypeDeclarationRectorTest.php
View File

@ -53,6 +53,8 @@ final class ReturnTypeDeclarationRectorTest extends AbstractRectorTestCase
__DIR__ . '/Fixture/dunglas/BazTrait.php.inc',
__DIR__ . '/Fixture/dunglas/Child.php.inc',
__DIR__ . '/Fixture/dunglas/nullable_types.php.inc',
// anonymous class
__DIR__ . '/Fixture/a_new_class.php.inc',
];
$this->doTestFiles($integrationFiles);