fix Nette\Object removal in Nette

This commit is contained in:
TomasVotruba 2018-02-19 18:42:36 +01:00
parent e0346dfdc2
commit d645a5a671
3 changed files with 10 additions and 21 deletions

View File

@ -28,8 +28,8 @@ final class AssignTypeResolverTest extends AbstractNodeTypeResolverTest
{
return [
# assign of "new <name>"
[__DIR__ . '/Source/MethodCall.php.inc', 0, ['Nette\Config\Configurator', 'Nette\Object']],
[__DIR__ . '/Source/MethodCall.php.inc', 2, ['Nette\Config\Configurator', 'Nette\Object']],
[__DIR__ . '/Source/MethodCall.php.inc', 0, ['Nette\Config\Configurator']],
[__DIR__ . '/Source/MethodCall.php.inc', 2, ['Nette\Config\Configurator']],
[__DIR__ . '/Source/New.php.inc', 0, [
'Symfony\Component\DependencyInjection\ContainerBuilder',
'Symfony\Component\DependencyInjection\ResettableContainerInterface',
@ -56,12 +56,12 @@ final class AssignTypeResolverTest extends AbstractNodeTypeResolverTest
$variableNodes = $this->getNodesForFileOfType(__DIR__ . '/Source/ClassConstant.php.inc', Variable::class);
$this->assertSame(
['Nette\Config\Configurator', 'Nette\Object'],
['Nette\Config\Configurator'],
$this->nodeTypeResolver->resolve($variableNodes[0])
);
$this->assertSame(
['Nette\Config\Configurator', 'Nette\Object'],
['Nette\Config\Configurator'],
$this->nodeTypeResolver->resolve($variableNodes[2])
);
}
@ -71,12 +71,12 @@ final class AssignTypeResolverTest extends AbstractNodeTypeResolverTest
$variableNodes = $this->getNodesForFileOfType(__DIR__ . '/Source/PropertyFetch.php.inc', Variable::class);
$this->assertSame(
['Nette\Config\Configurator', 'Nette\Object'],
['Nette\Config\Configurator'],
$this->nodeTypeResolver->resolve($variableNodes[0])
);
$this->assertSame(
['Nette\Config\Configurator', 'Nette\Object'],
['Nette\Config\Configurator'],
$this->nodeTypeResolver->resolve($variableNodes[2])
);
}

View File

@ -33,30 +33,19 @@ final class MethodCallTypeResolverTest extends AbstractNodeTypeResolverTest
[__DIR__ . '/MethodCallSource/OnSelfCall.php.inc', 0, [
'SomeClass',
'Nette\Config\Configurator',
'Nette\Object',
]],
[__DIR__ . '/MethodCallSource/OnSelfCall.php.inc', 1, [
'SomeClass',
'Nette\Config\Configurator',
'Nette\Object',
]],
# on method call
[__DIR__ . '/MethodCallSource/OnMethodCallCall.php.inc', 0, ['Nette\DI\Container']],
# on variable call
[__DIR__ . '/MethodCallSource/OnVariableCall.php.inc', 0, [
'Nette\Config\Configurator',
'Nette\Object',
]],
[__DIR__ . '/MethodCallSource/OnVariableCall.php.inc', 0, ['Nette\Config\Configurator']],
# on property call
[__DIR__ . '/MethodCallSource/OnPropertyCall.php.inc', 0, [
'Nette\Config\Configurator',
'Nette\Object',
]],
[__DIR__ . '/MethodCallSource/OnPropertyCall.php.inc', 0, ['Nette\Config\Configurator']],
# on magic class call
[__DIR__ . '/MethodCallSource/OnMagicClassCall.php.inc', 0, [
'Nette\Config\Configurator',
'Nette\Object',
]],
[__DIR__ . '/MethodCallSource/OnMagicClassCall.php.inc', 0, ['Nette\Config\Configurator']],
];
}
}

View File

@ -73,7 +73,7 @@ final class NestedMethodCallTest extends AbstractNodeTypeResolverTest
[__DIR__ . '/NestedMethodCallSource/NestedMethodCalls.php.inc', 0, 'getParameters', ['Nette\DI\Container']],
[__DIR__ . '/NestedMethodCallSource/NestedMethodCalls.php.inc', 1, 'addService', ['Nette\DI\Container']],
[__DIR__ . '/NestedMethodCallSource/NestedMethodCalls.php.inc', 2, 'createContainer', [
'Nette\Config\Configurator', 'Nette\Object',
'Nette\Config\Configurator'
]],
];
}