Skip to content

Commit ad0c32e

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit 05cc9af356d08f264c0faabd6a22149c1c06da89
rectorphp/rector-src@05cc9af [CodingStyle] Skip concat on first arg on ConsistentImplodeRector (#3702)
1 parent dd229e0 commit ad0c32e

File tree

7 files changed

+37
-23
lines changed

7 files changed

+37
-23
lines changed

‎vendor/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
require_once __DIR__ . '/composer/autoload_real.php';
2424

25-
return ComposerAutoloaderInit361eebc41de2eaf4f1c07032c00a0816::getLoader();
25+
return ComposerAutoloaderInit6458b67bf43ec630b928ef200eea841a::getLoader();

‎vendor/composer/autoload_real.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInit361eebc41de2eaf4f1c07032c00a0816
5+
class ComposerAutoloaderInit6458b67bf43ec630b928ef200eea841a
66
{
77
private static $loader;
88

@@ -22,17 +22,17 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25-
spl_autoload_register(array('ComposerAutoloaderInit361eebc41de2eaf4f1c07032c00a0816', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInit6458b67bf43ec630b928ef200eea841a', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInit361eebc41de2eaf4f1c07032c00a0816', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInit6458b67bf43ec630b928ef200eea841a', 'loadClassLoader'));
2828

2929
require __DIR__ . '/autoload_static.php';
30-
call_user_func(\Composer\Autoload\ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::getInitializer($loader));
30+
call_user_func(\Composer\Autoload\ComposerStaticInit6458b67bf43ec630b928ef200eea841a::getInitializer($loader));
3131

3232
$loader->setClassMapAuthoritative(true);
3333
$loader->register(true);
3434

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInit6458b67bf43ec630b928ef200eea841a::$files;
3636
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3737
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3838
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

‎vendor/composer/autoload_static.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816
7+
class ComposerStaticInit6458b67bf43ec630b928ef200eea841a
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3152,9 +3152,9 @@ class ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816
31523152
public static function getInitializer(ClassLoader $loader)
31533153
{
31543154
return \Closure::bind(function () use ($loader) {
3155-
$loader->prefixLengthsPsr4 = ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::$prefixLengthsPsr4;
3156-
$loader->prefixDirsPsr4 = ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::$prefixDirsPsr4;
3157-
$loader->classMap = ComposerStaticInit361eebc41de2eaf4f1c07032c00a0816::$classMap;
3155+
$loader->prefixLengthsPsr4 = ComposerStaticInit6458b67bf43ec630b928ef200eea841a::$prefixLengthsPsr4;
3156+
$loader->prefixDirsPsr4 = ComposerStaticInit6458b67bf43ec630b928ef200eea841a::$prefixDirsPsr4;
3157+
$loader->classMap = ComposerStaticInit6458b67bf43ec630b928ef200eea841a::$classMap;
31583158

31593159
}, null, ClassLoader::class);
31603160
}

‎vendor/composer/installed.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,12 +2128,12 @@
21282128
"source": {
21292129
"type": "git",
21302130
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
2131-
"reference": "7ace160c8ab770c773aca150eda2f4eae5e4a0f0"
2131+
"reference": "39da5b774a4ae6e51d98d4ab71b1197367bea1cd"
21322132
},
21332133
"dist": {
21342134
"type": "zip",
2135-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/7ace160c8ab770c773aca150eda2f4eae5e4a0f0",
2136-
"reference": "7ace160c8ab770c773aca150eda2f4eae5e4a0f0",
2135+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/39da5b774a4ae6e51d98d4ab71b1197367bea1cd",
2136+
"reference": "39da5b774a4ae6e51d98d4ab71b1197367bea1cd",
21372137
"shasum": ""
21382138
},
21392139
"require": {
@@ -2163,7 +2163,7 @@
21632163
"tomasvotruba\/type-coverage": "^0.0.9",
21642164
"tomasvotruba\/unused-public": "^0.0.34"
21652165
},
2166-
"time": "2023-05-01T11:28:54+00:00",
2166+
"time": "2023-05-02T07:00:29+00:00",
21672167
"default-branch": true,
21682168
"type": "rector-extension",
21692169
"extra": {

‎vendor/composer/installed.php

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎vendor/rector/extension-installer/src/GeneratedConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
final class GeneratedConfig
1111
{
12-
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'));
12+
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'));
1313
private function __construct()
1414
{
1515
}

‎vendor/rector/rector-symfony/src/Bridge/Symfony/ContainerServiceProvider.php

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@
55

66
use Rector\Core\Configuration\RectorConfigProvider;
77
use Rector\Core\Exception\ShouldNotHappenException;
8+
use RectorPrefix202305\Symfony\Component\DependencyInjection\Container;
89
use RectorPrefix202305\Webmozart\Assert\Assert;
910
final class ContainerServiceProvider
1011
{
12+
/**
13+
* @var object|null
14+
*/
15+
private $container;
1116
/**
1217
* @readonly
1318
* @var \Rector\Core\Configuration\RectorConfigProvider
@@ -19,15 +24,24 @@ public function __construct(RectorConfigProvider $rectorConfigProvider)
1924
}
2025
public function provideByName(string $serviceName) : object
2126
{
22-
$symfonyContainerPhp = $this->rectorConfigProvider->getSymfonyContainerPhp();
23-
Assert::fileExists($symfonyContainerPhp);
24-
$container = (require_once $symfonyContainerPhp);
25-
// this allows older Symfony versions, e.g. 2.8 did not have the PSR yet
26-
Assert::isInstanceOf($container, 'Symfony\\Component\\DependencyInjection\\Container');
27-
if (!$container->has($serviceName)) {
27+
/** @var Container $symfonyContainer */
28+
$symfonyContainer = $this->getSymfonyContainer();
29+
if (!$symfonyContainer->has($serviceName)) {
2830
$errorMessage = \sprintf('Symfony container has no service "%s", maybe it is private', $serviceName);
2931
throw new ShouldNotHappenException($errorMessage);
3032
}
31-
return $container->get($serviceName);
33+
return $symfonyContainer->get($serviceName);
34+
}
35+
private function getSymfonyContainer() : object
36+
{
37+
if ($this->container === null) {
38+
$symfonyContainerPhp = $this->rectorConfigProvider->getSymfonyContainerPhp();
39+
Assert::fileExists($symfonyContainerPhp);
40+
$container = (require $symfonyContainerPhp);
41+
// this allows older Symfony versions, e.g. 2.8 did not have the PSR yet
42+
Assert::isInstanceOf($container, 'Symfony\\Component\\DependencyInjection\\Container');
43+
$this->container = $container;
44+
}
45+
return $this->container;
3246
}
3347
}

0 commit comments

Comments
 (0)