Updated Rector to commit 05cc9af356d08f264c0faabd6a22149c1c06da89

05cc9af356 [CodingStyle] Skip concat on first arg on ConsistentImplodeRector (#3702)
This commit is contained in:
Tomas Votruba 2023-05-02 07:09:01 +00:00
parent dd229e0b1b
commit ad0c32ebbb
7 changed files with 37 additions and 23 deletions

2
vendor/autoload.php vendored
View File

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

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit361eebc41de2eaf4f1c07032c00a0816
class ComposerAutoloaderInit6458b67bf43ec630b928ef200eea841a
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit361eebc41de2eaf4f1c07032c00a0816
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit361eebc41de2eaf4f1c07032c00a0816', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit6458b67bf43ec630b928ef200eea841a', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit361eebc41de2eaf4f1c07032c00a0816', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit6458b67bf43ec630b928ef200eea841a', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit6458b67bf43ec630b928ef200eea841a::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit6458b67bf43ec630b928ef200eea841a::$files;
$requireFile = \Closure::bind(static function ($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 ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816
class ComposerStaticInit6458b67bf43ec630b928ef200eea841a
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3152,9 +3152,9 @@ class ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit6458b67bf43ec630b928ef200eea841a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit6458b67bf43ec630b928ef200eea841a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit6458b67bf43ec630b928ef200eea841a::$classMap;
}, null, ClassLoader::class);
}

View File

@ -2128,12 +2128,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
"reference": "7ace160c8ab770c773aca150eda2f4eae5e4a0f0"
"reference": "39da5b774a4ae6e51d98d4ab71b1197367bea1cd"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/7ace160c8ab770c773aca150eda2f4eae5e4a0f0",
"reference": "7ace160c8ab770c773aca150eda2f4eae5e4a0f0",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/39da5b774a4ae6e51d98d4ab71b1197367bea1cd",
"reference": "39da5b774a4ae6e51d98d4ab71b1197367bea1cd",
"shasum": ""
},
"require": {
@ -2163,7 +2163,7 @@
"tomasvotruba\/type-coverage": "^0.0.9",
"tomasvotruba\/unused-public": "^0.0.34"
},
"time": "2023-05-01T11:28:54+00:00",
"time": "2023-05-02T07:00:29+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/
final class GeneratedConfig
{
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 03df9e3'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 23e55c6'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main dc4b405'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7ace160'));
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 03df9e3'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 23e55c6'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main dc4b405'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 39da5b7'));
private function __construct()
{
}

View File

@ -5,9 +5,14 @@ namespace Rector\Symfony\Bridge\Symfony;
use Rector\Core\Configuration\RectorConfigProvider;
use Rector\Core\Exception\ShouldNotHappenException;
use RectorPrefix202305\Symfony\Component\DependencyInjection\Container;
use RectorPrefix202305\Webmozart\Assert\Assert;
final class ContainerServiceProvider
{
/**
* @var object|null
*/
private $container;
/**
* @readonly
* @var \Rector\Core\Configuration\RectorConfigProvider
@ -19,15 +24,24 @@ final class ContainerServiceProvider
}
public function provideByName(string $serviceName) : object
{
$symfonyContainerPhp = $this->rectorConfigProvider->getSymfonyContainerPhp();
Assert::fileExists($symfonyContainerPhp);
$container = (require_once $symfonyContainerPhp);
// this allows older Symfony versions, e.g. 2.8 did not have the PSR yet
Assert::isInstanceOf($container, 'Symfony\\Component\\DependencyInjection\\Container');
if (!$container->has($serviceName)) {
/** @var Container $symfonyContainer */
$symfonyContainer = $this->getSymfonyContainer();
if (!$symfonyContainer->has($serviceName)) {
$errorMessage = \sprintf('Symfony container has no service "%s", maybe it is private', $serviceName);
throw new ShouldNotHappenException($errorMessage);
}
return $container->get($serviceName);
return $symfonyContainer->get($serviceName);
}
private function getSymfonyContainer() : object
{
if ($this->container === null) {
$symfonyContainerPhp = $this->rectorConfigProvider->getSymfonyContainerPhp();
Assert::fileExists($symfonyContainerPhp);
$container = (require $symfonyContainerPhp);
// this allows older Symfony versions, e.g. 2.8 did not have the PSR yet
Assert::isInstanceOf($container, 'Symfony\\Component\\DependencyInjection\\Container');
$this->container = $container;
}
return $this->container;
}
}