Skip to content

Commit 826539a

Browse files
TomasVotrubaTomasVotruba
committed
Rector 0.15.16
1 parent 9805e05 commit 826539a

File tree

8 files changed

+24
-23
lines changed

8 files changed

+24
-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 ComposerAutoloaderInit5232d97987500efd23e80c06e4ab7e3a::getLoader();
25+
return ComposerAutoloaderInit47f241ab07e500a20273611f852cb226::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 ComposerAutoloaderInit5232d97987500efd23e80c06e4ab7e3a
5+
class ComposerAutoloaderInit47f241ab07e500a20273611f852cb226
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('ComposerAutoloaderInit5232d97987500efd23e80c06e4ab7e3a', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInit47f241ab07e500a20273611f852cb226', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInit5232d97987500efd23e80c06e4ab7e3a', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInit47f241ab07e500a20273611f852cb226', 'loadClassLoader'));
2828

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

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

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInit5232d97987500efd23e80c06e4ab7e3a::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInit47f241ab07e500a20273611f852cb226::$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 ComposerStaticInit5232d97987500efd23e80c06e4ab7e3a
7+
class ComposerStaticInit47f241ab07e500a20273611f852cb226
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3121,9 +3121,9 @@ class ComposerStaticInit5232d97987500efd23e80c06e4ab7e3a
31213121
public static function getInitializer(ClassLoader $loader)
31223122
{
31233123
return \Closure::bind(function () use ($loader) {
3124-
$loader->prefixLengthsPsr4 = ComposerStaticInit5232d97987500efd23e80c06e4ab7e3a::$prefixLengthsPsr4;
3125-
$loader->prefixDirsPsr4 = ComposerStaticInit5232d97987500efd23e80c06e4ab7e3a::$prefixDirsPsr4;
3126-
$loader->classMap = ComposerStaticInit5232d97987500efd23e80c06e4ab7e3a::$classMap;
3124+
$loader->prefixLengthsPsr4 = ComposerStaticInit47f241ab07e500a20273611f852cb226::$prefixLengthsPsr4;
3125+
$loader->prefixDirsPsr4 = ComposerStaticInit47f241ab07e500a20273611f852cb226::$prefixDirsPsr4;
3126+
$loader->classMap = ComposerStaticInit47f241ab07e500a20273611f852cb226::$classMap;
31273127

31283128
}, null, ClassLoader::class);
31293129
}

‎vendor/composer/installed.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2125,12 +2125,12 @@
21252125
"source": {
21262126
"type": "git",
21272127
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
2128-
"reference": "e8018231e791ad3df522dc5821999bf73474a59d"
2128+
"reference": "9eefcc90a23d6e4b55d835f78892e56466957314"
21292129
},
21302130
"dist": {
21312131
"type": "zip",
2132-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/e8018231e791ad3df522dc5821999bf73474a59d",
2133-
"reference": "e8018231e791ad3df522dc5821999bf73474a59d",
2132+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/9eefcc90a23d6e4b55d835f78892e56466957314",
2133+
"reference": "9eefcc90a23d6e4b55d835f78892e56466957314",
21342134
"shasum": ""
21352135
},
21362136
"require": {
@@ -2160,7 +2160,7 @@
21602160
"tomasvotruba\/type-coverage": "^0.0.9",
21612161
"tomasvotruba\/unused-public": "^0.0.34"
21622162
},
2163-
"time": "2023-02-14T21:39:13+00:00",
2163+
"time": "2023-02-14T22:16:04+00:00",
21642164
"default-branch": true,
21652165
"type": "rector-extension",
21662166
"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 ea9cf46'), '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 fb0167c'), '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 13e842b'), '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 e801823'));
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 ea9cf46'), '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 fb0167c'), '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 13e842b'), '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 9eefcc9'));
1313
private function __construct()
1414
{
1515
}

‎vendor/rector/rector-symfony/config/sets/symfony/symfony53.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
# https://github.com/symfony/symfony/blob/5.4/UPGRADE-5.3.md
2222
return static function (RectorConfig $rectorConfig) : void {
2323
$rectorConfig->sets([SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES]);
24-
$rectorConfig->import(__DIR__ . '/symfony53-types.php');
2524
$rectorConfig->ruleWithConfiguration(RenameMethodRector::class, [
2625
// @see https://github.com/symfony/symfony/pull/40536
2726
new MethodCallRename('Symfony\\Component\\HttpFoundation\\RequestStack', 'getMasterRequest', 'getMainRequest'),

‎vendor/rector/rector-symfony/src/Rector/Closure/ServiceArgsToServiceNamedArgRector.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PhpParser\Node\Expr;
99
use PhpParser\Node\Expr\Array_;
1010
use PhpParser\Node\Expr\ArrayItem;
11+
use PhpParser\Node\Expr\ClassConstFetch;
1112
use PhpParser\Node\Expr\Closure;
1213
use PhpParser\Node\Expr\MethodCall;
1314
use PhpParser\Node\Scalar\String_;
@@ -41,7 +42,7 @@ public function __construct(SymfonyPhpClosureDetector $symfonyPhpClosureDetector
4142
}
4243
public function getRuleDefinition() : RuleDefinition
4344
{
44-
return new RuleDefinition('Converts order-dependent arguments args() to named arg arg()', [new CodeSample(<<<'CODE_SAMPLE'
45+
return new RuleDefinition('Converts order-dependent arguments args() to named arg() call', [new CodeSample(<<<'CODE_SAMPLE'
4546
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
4647
4748
return static function (ContainerConfigurator $containerConfigurator): void {
@@ -116,12 +117,13 @@ private function resolveServiceClass(MethodCall $methodCall) : ?string
116117
return null;
117118
}
118119
$servicesSetArgs = $methodCall->getArgs();
119-
// we can handle only one arg
120-
if (\count($servicesSetArgs) !== 1) {
121-
return null;
120+
foreach ($servicesSetArgs as $serviceSetArg) {
121+
if (!$serviceSetArg->value instanceof ClassConstFetch) {
122+
continue;
123+
}
124+
return $this->valueResolver->getValue($serviceSetArg->value);
122125
}
123-
$className = $servicesSetArgs[0]->value;
124-
return $this->valueResolver->getValue($className);
126+
return null;
125127
}
126128
/**
127129
* @return string[]

0 commit comments

Comments
 (0)