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

[NodeTypeResolver] decouple nested call types Test

Browse Source
This commit is contained in:
TomasVotruba 2017-11-02 16:29:10 +01:00
parent ca3d8f1609
commit 48f3f02504
5 changed files with 67 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
packages/NodeTypeResolver/tests/NodeCallerTypeResolver/MethodCallTest.php
View File

@ -6,63 +6,8 @@ use PhpParser\Node\Expr\MethodCall;
use Rector\Node\Attribute;
use Rector\NodeTypeResolver\Tests\AbstractNodeTypeResolverTest;
/**
* @todo split to NestedMethodCallTest
*/
final class MethodCallTest extends AbstractNodeTypeResolverTest
{
public function testOnNestedDifferentMethodCall(): void
{
/** @var MethodCall[] $methodCallNodes */
$methodCallNodes = $this->getNodesForFileOfType(
__DIR__ . '/MethodCallSource/OnMethodCallCallDifferentType.php.inc',
MethodCall::class
);
$this->assertCount(2, $methodCallNodes);
$this->assertSame('setScope', $methodCallNodes[0]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[0], Attribute::CALLER_TYPES, [
'Symfony\Component\DependencyInjection\Definition',
]);
$this->assertSame('register', $methodCallNodes[1]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[1], Attribute::CALLER_TYPES, [
'Symfony\Component\DependencyInjection\ContainerBuilder',
'Symfony\Component\DependencyInjection\ResettableContainerInterface',
'Symfony\Component\DependencyInjection\ContainerInterface',
'Psr\Container\ContainerInterface',
'Symfony\Component\DependencyInjection\TaggedContainerInterface',
'Symfony\Component\DependencyInjection\Container',
]);
}
public function testOnNestedMethodCall(): void
{
/** @var MethodCall[] $methodCallNodes */
$methodCallNodes = $this->getNodesForFileOfType(
__DIR__ . '/MethodCallSource/NestedMethodCalls.php.inc',
MethodCall::class
);
$this->assertCount(3, $methodCallNodes);
$this->assertSame('getParameters', $methodCallNodes[0]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[0], Attribute::CALLER_TYPES, [
'Nette\DI\Container',
]);
$this->assertSame('addService', $methodCallNodes[1]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[1], Attribute::CALLER_TYPES, [
'Nette\DI\Container',
]);
$this->assertSame('createContainer', $methodCallNodes[2]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[2], Attribute::CALLER_TYPES, [
'Nette\Config\Configurator',
'Nette\Object',
]);
}
public function testOnSelfCall(): void
{
$methodCallNodes = $this->getNodesForFileOfType(

0
packages/NodeTypeResolver/tests/NodeCallerTypeResolver/MethodCallSource/NestedMethodCalls.php.inc → packages/NodeTypeResolver/tests/NodeCallerTypeResolver/NestedMethodCallSource/NestedMethodCalls.php.inc
View File

0
packages/NodeTypeResolver/tests/NodeCallerTypeResolver/MethodCallSource/OnMethodCallCallDifferentType.php.inc → packages/NodeTypeResolver/tests/NodeCallerTypeResolver/NestedMethodCallSource/OnMethodCallCallDifferentType.php.inc
View File

62
packages/NodeTypeResolver/tests/NodeCallerTypeResolver/NestedMethodCallTest.php Normal file
View File

@ -0,0 +1,62 @@
<?php declare(strict_types=1);
namespace Rector\NodeTypeResolver\Tests\NodeCallerTypeResolver;
use PhpParser\Node\Expr\MethodCall;
use Rector\Node\Attribute;
use Rector\NodeTypeResolver\Tests\AbstractNodeTypeResolverTest;
final class NestedMethodCallTest extends AbstractNodeTypeResolverTest
{
public function testOnNestedDifferentMethodCall(): void
{
/** @var MethodCall[] $methodCallNodes */
$methodCallNodes = $this->getNodesForFileOfType(
__DIR__ . '/NestedMethodCallSource/OnMethodCallCallDifferentType.php.inc',
MethodCall::class
);
$this->assertCount(2, $methodCallNodes);
$this->assertSame('setScope', $methodCallNodes[0]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[0], Attribute::CALLER_TYPES, [
'Symfony\Component\DependencyInjection\Definition',
]);
$this->assertSame('register', $methodCallNodes[1]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[1], Attribute::CALLER_TYPES, [
'Symfony\Component\DependencyInjection\ContainerBuilder',
'Symfony\Component\DependencyInjection\ResettableContainerInterface',
'Symfony\Component\DependencyInjection\ContainerInterface',
'Psr\Container\ContainerInterface',
'Symfony\Component\DependencyInjection\TaggedContainerInterface',
'Symfony\Component\DependencyInjection\Container',
]);
}
public function testOnNestedMethodCall(): void
{
/** @var MethodCall[] $methodCallNodes */
$methodCallNodes = $this->getNodesForFileOfType(
__DIR__ . '/NestedMethodCallSource/NestedMethodCalls.php.inc',
MethodCall::class
);
$this->assertCount(3, $methodCallNodes);
$this->assertSame('getParameters', $methodCallNodes[0]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[0], Attribute::CALLER_TYPES, [
'Nette\DI\Container',
]);
$this->assertSame('addService', $methodCallNodes[1]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[1], Attribute::CALLER_TYPES, [
'Nette\DI\Container',
]);
$this->assertSame('createContainer', $methodCallNodes[2]->name->toString());
$this->doTestAttributeEquals($methodCallNodes[2], Attribute::CALLER_TYPES, [
'Nette\Config\Configurator',
'Nette\Object',
]);
}
}

6
src/Rector/Contrib/Nette/Forms/FormSetRequiredRector.php
View File

@ -38,7 +38,11 @@ final class FormSetRequiredRector extends AbstractRector
public function isCandidate(Node $node): bool
{
if (! $this->methodCallAnalyzer->isTypeAndMethods($node, self::FORM_CLASS, ['addCondition'])) {
if (! $this->methodCallAnalyzer->isTypesAndMethods(
$node,
[self::FORM_CLASS, 'Nette\Forms\Container'],
['addCondition'])
) {
return false;
}