Updated Rector to commit 5a2897090e0cce57c2b6849a9d70c1cf3fb1cba9

5a2897090e [DX] Remove PackageBuilder classes (#2886)
This commit is contained in:
Tomas Votruba 2022-09-01 20:29:21 +00:00
parent 7211a6c632
commit a295f6325a
7 changed files with 39 additions and 17 deletions

View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '6cdebe40bd259e25f5832c01c8ef65117cf3c010';
public const PACKAGE_VERSION = '5a2897090e0cce57c2b6849a9d70c1cf3fb1cba9';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-09-01 20:04:57';
public const RELEASE_DATE = '2022-09-01 20:24:19';
/**
* @var int
*/

View File

@ -0,0 +1,21 @@
<?php
declare (strict_types=1);
namespace Rector\Core\DependencyInjection\CompilerPass;
use Rector\Core\Contract\Rector\RectorInterface;
use RectorPrefix202209\Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use RectorPrefix202209\Symfony\Component\DependencyInjection\ContainerBuilder;
final class AutowireRectorCompilerPass implements CompilerPassInterface
{
public function process(ContainerBuilder $containerBuilder) : void
{
$definitions = $containerBuilder->getDefinitions();
foreach ($definitions as $definition) {
if (!\is_a((string) $definition->getClass(), RectorInterface::class, \true)) {
continue;
}
$definition->setAutowired(\true);
}
}
}

View File

@ -4,8 +4,8 @@ declare (strict_types=1);
namespace Rector\Core\Kernel;
use Rector\Core\Config\Loader\ConfigureCallMergingLoaderFactory;
use Rector\Core\Contract\Rector\RectorInterface;
use Rector\Core\DependencyInjection\Collector\ConfigureCallValuesCollector;
use Rector\Core\DependencyInjection\CompilerPass\AutowireRectorCompilerPass;
use Rector\Core\DependencyInjection\CompilerPass\MakeRectorsPublicCompilerPass;
use Rector\Core\DependencyInjection\CompilerPass\MergeImportedRectorConfigureCallValuesCompilerPass;
use Rector\Core\DependencyInjection\CompilerPass\RemoveSkippedRectorsCompilerPass;
@ -14,7 +14,6 @@ use RectorPrefix202209\Symfony\Component\DependencyInjection\Compiler\CompilerPa
use RectorPrefix202209\Symfony\Component\DependencyInjection\ContainerBuilder;
use RectorPrefix202209\Symfony\Component\DependencyInjection\ContainerInterface;
use RectorPrefix202209\Symplify\AutowireArrayParameter\DependencyInjection\CompilerPass\AutowireArrayParameterCompilerPass;
use RectorPrefix202209\Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireInterfacesCompilerPass;
use RectorPrefix202209\Symplify\PackageBuilder\ValueObject\ConsoleColorDiffConfig;
final class RectorKernel
{
@ -70,7 +69,7 @@ final class RectorKernel
// must run before AutowireArrayParameterCompilerPass, as the autowired array cannot contain removed services
new RemoveSkippedRectorsCompilerPass(),
// autowire Rectors by default (mainly for tests)
new AutowireInterfacesCompilerPass([RectorInterface::class]),
new AutowireRectorCompilerPass(),
new MakeRectorsPublicCompilerPass(),
// add all merged arguments of Rector services
new MergeImportedRectorConfigureCallValuesCompilerPass($this->configureCallValuesCollector),

2
vendor/autoload.php vendored
View File

@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitf9386b3167e6f436551675dcefff7647::getLoader();
return ComposerAutoloaderInit5f34428cc73dcc52824027dcd8b2ebce::getLoader();

View File

@ -1391,6 +1391,7 @@ return array(
'Rector\\Core\\Contract\\Rector\\ScopeAwarePhpRectorInterface' => $baseDir . '/src/Contract/Rector/ScopeAwarePhpRectorInterface.php',
'Rector\\Core\\Contract\\Template\\TemplateResolverInterface' => $baseDir . '/src/Contract/Template/TemplateResolverInterface.php',
'Rector\\Core\\DependencyInjection\\Collector\\ConfigureCallValuesCollector' => $baseDir . '/src/DependencyInjection/Collector/ConfigureCallValuesCollector.php',
'Rector\\Core\\DependencyInjection\\CompilerPass\\AutowireRectorCompilerPass' => $baseDir . '/src/DependencyInjection/CompilerPass/AutowireRectorCompilerPass.php',
'Rector\\Core\\DependencyInjection\\CompilerPass\\MakeRectorsPublicCompilerPass' => $baseDir . '/src/DependencyInjection/CompilerPass/MakeRectorsPublicCompilerPass.php',
'Rector\\Core\\DependencyInjection\\CompilerPass\\MergeImportedRectorConfigureCallValuesCompilerPass' => $baseDir . '/src/DependencyInjection/CompilerPass/MergeImportedRectorConfigureCallValuesCompilerPass.php',
'Rector\\Core\\DependencyInjection\\CompilerPass\\RemoveSkippedRectorsCompilerPass' => $baseDir . '/src/DependencyInjection/CompilerPass/RemoveSkippedRectorsCompilerPass.php',

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitf9386b3167e6f436551675dcefff7647
class ComposerAutoloaderInit5f34428cc73dcc52824027dcd8b2ebce
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInitf9386b3167e6f436551675dcefff7647
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitf9386b3167e6f436551675dcefff7647', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit5f34428cc73dcc52824027dcd8b2ebce', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitf9386b3167e6f436551675dcefff7647', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit5f34428cc73dcc52824027dcd8b2ebce', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitf9386b3167e6f436551675dcefff7647::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit5f34428cc73dcc52824027dcd8b2ebce::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInitf9386b3167e6f436551675dcefff7647::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit5f34428cc73dcc52824027dcd8b2ebce::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiref9386b3167e6f436551675dcefff7647($fileIdentifier, $file);
composerRequire5f34428cc73dcc52824027dcd8b2ebce($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInitf9386b3167e6f436551675dcefff7647
* @param string $file
* @return void
*/
function composerRequiref9386b3167e6f436551675dcefff7647($fileIdentifier, $file)
function composerRequire5f34428cc73dcc52824027dcd8b2ebce($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitf9386b3167e6f436551675dcefff7647
class ComposerStaticInit5f34428cc73dcc52824027dcd8b2ebce
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -1661,6 +1661,7 @@ class ComposerStaticInitf9386b3167e6f436551675dcefff7647
'Rector\\Core\\Contract\\Rector\\ScopeAwarePhpRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/ScopeAwarePhpRectorInterface.php',
'Rector\\Core\\Contract\\Template\\TemplateResolverInterface' => __DIR__ . '/../..' . '/src/Contract/Template/TemplateResolverInterface.php',
'Rector\\Core\\DependencyInjection\\Collector\\ConfigureCallValuesCollector' => __DIR__ . '/../..' . '/src/DependencyInjection/Collector/ConfigureCallValuesCollector.php',
'Rector\\Core\\DependencyInjection\\CompilerPass\\AutowireRectorCompilerPass' => __DIR__ . '/../..' . '/src/DependencyInjection/CompilerPass/AutowireRectorCompilerPass.php',
'Rector\\Core\\DependencyInjection\\CompilerPass\\MakeRectorsPublicCompilerPass' => __DIR__ . '/../..' . '/src/DependencyInjection/CompilerPass/MakeRectorsPublicCompilerPass.php',
'Rector\\Core\\DependencyInjection\\CompilerPass\\MergeImportedRectorConfigureCallValuesCompilerPass' => __DIR__ . '/../..' . '/src/DependencyInjection/CompilerPass/MergeImportedRectorConfigureCallValuesCompilerPass.php',
'Rector\\Core\\DependencyInjection\\CompilerPass\\RemoveSkippedRectorsCompilerPass' => __DIR__ . '/../..' . '/src/DependencyInjection/CompilerPass/RemoveSkippedRectorsCompilerPass.php',
@ -3148,9 +3149,9 @@ class ComposerStaticInitf9386b3167e6f436551675dcefff7647
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitf9386b3167e6f436551675dcefff7647::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitf9386b3167e6f436551675dcefff7647::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitf9386b3167e6f436551675dcefff7647::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit5f34428cc73dcc52824027dcd8b2ebce::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5f34428cc73dcc52824027dcd8b2ebce::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5f34428cc73dcc52824027dcd8b2ebce::$classMap;
}, null, ClassLoader::class);
}