Updated Rector to commit 857e7a5604df3c36f85ea2702c066744a17728f7

857e7a5604 [Scoped] Do not downgrade vendor/rector-*/config (#4859)
This commit is contained in:
Tomas Votruba 2023-08-26 13:52:10 +00:00
parent 3982c504e9
commit 35b66505ec
9 changed files with 31 additions and 21 deletions

View File

@ -176,8 +176,10 @@ final class RectorConfig extends Container
public function import(string $filePath) : void
{
$paths = [$filePath];
$filesystemTweaker = new FilesystemTweaker();
$paths = $filesystemTweaker->resolveWithFnmatch($paths);
if (\strpos($filePath, '*') !== \false) {
$filesystemTweaker = new FilesystemTweaker();
$paths = $filesystemTweaker->resolveWithFnmatch($paths);
}
foreach ($paths as $path) {
$this->importFile($path);
}

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'f64cb7b3f8467fe5e6509f0651017a6dabc1fd47';
public const PACKAGE_VERSION = '857e7a5604df3c36f85ea2702c066744a17728f7';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-26 08:39:06';
public const RELEASE_DATE = '2023-08-26 13:42:39';
/**
* @var int
*/

View File

@ -6,11 +6,16 @@ namespace Rector\Core\PHPStan\NodeVisitor;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\NodeVisitorAbstract;
use PHPStan\Analyser\MutatingScope;
use PHPStan\Analyser\Scope;
use PHPStan\Node\VirtualNode;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use Rector\NodeTypeResolver\Node\AttributeKey;
use PHPStan\Analyser\MutatingScope;
final class ExprScopeFromStmtNodeVisitor extends NodeVisitorAbstract
{
/**
@ -28,6 +33,9 @@ final class ExprScopeFromStmtNodeVisitor extends NodeVisitorAbstract
}
public function enterNode(Node $node) : ?Node
{
if ($node instanceof FileWithoutNamespace || $node instanceof Namespace_ || $node instanceof ClassLike || $node instanceof ClassMethod || $node instanceof Function_) {
return null;
}
if ($node instanceof Stmt) {
$this->currentStmt = $node;
return null;

2
vendor/autoload.php vendored
View File

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

View File

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

View File

@ -1956,12 +1956,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
"reference": "ef9424adb90d2254c41b0f77925c93aca064701a"
"reference": "bf21591f4d73aabdc8c6c39f73effd1d5ff8b076"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/ef9424adb90d2254c41b0f77925c93aca064701a",
"reference": "ef9424adb90d2254c41b0f77925c93aca064701a",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/bf21591f4d73aabdc8c6c39f73effd1d5ff8b076",
"reference": "bf21591f4d73aabdc8c6c39f73effd1d5ff8b076",
"shasum": ""
},
"require": {
@ -1992,7 +1992,7 @@
"tomasvotruba\/unused-public": "^0.2",
"tracy\/tracy": "^2.10"
},
"time": "2023-08-20T12:40:49+00:00",
"time": "2023-08-26T13:49:22+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 c0ab738'), '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 6fbdefd'), '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 e6dd6a0'), '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 ef9424a'));
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 c0ab738'), '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 6fbdefd'), '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 e6dd6a0'), '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 bf21591'));
private function __construct()
{
}