Merge pull request #2831 from rectorphp/import

remove parameter in imports
This commit is contained in:
Tomas Votruba 2020-02-10 10:52:07 +01:00 committed by GitHub
commit 5f38ce4608

View File

@ -9,15 +9,9 @@ use Rector\Core\DependencyInjection\Collector\RectorServiceArgumentCollector;
use Symfony\Component\Config\FileLocatorInterface; use Symfony\Component\Config\FileLocatorInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symplify\PackageBuilder\Yaml\FileLoader\AbstractParameterMergingYamlFileLoader; use Symplify\PackageBuilder\Yaml\FileLoader\AbstractParameterMergingYamlFileLoader;
use Symplify\PackageBuilder\Yaml\ParameterInImportResolver;
final class TolerantRectorYamlFileLoader extends AbstractParameterMergingYamlFileLoader final class TolerantRectorYamlFileLoader extends AbstractParameterMergingYamlFileLoader
{ {
/**
* @var ParameterInImportResolver
*/
private $parameterInImportResolver;
/** /**
* @var ClassExistenceValidator * @var ClassExistenceValidator
*/ */
@ -33,7 +27,6 @@ final class TolerantRectorYamlFileLoader extends AbstractParameterMergingYamlFil
FileLocatorInterface $fileLocator, FileLocatorInterface $fileLocator,
RectorServiceArgumentCollector $rectorServiceArgumentCollector RectorServiceArgumentCollector $rectorServiceArgumentCollector
) { ) {
$this->parameterInImportResolver = new ParameterInImportResolver();
$this->classExistenceValidator = new ClassExistenceValidator(); $this->classExistenceValidator = new ClassExistenceValidator();
$this->rectorServiceArgumentCollector = $rectorServiceArgumentCollector; $this->rectorServiceArgumentCollector = $rectorServiceArgumentCollector;
@ -56,7 +49,7 @@ final class TolerantRectorYamlFileLoader extends AbstractParameterMergingYamlFil
$this->classExistenceValidator->ensureClassesAreValid($configuration, $file); $this->classExistenceValidator->ensureClassesAreValid($configuration, $file);
return $this->parameterInImportResolver->process($configuration); return $configuration;
} }
private function collectRectorServiceArguments(array $configuration): void private function collectRectorServiceArguments(array $configuration): void