octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-02 01:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit dfe5bcfabc

Browse Source 
dfe5bcfabc Misc (#1312)
This commit is contained in:
Tomas Votruba 2021-11-25 19:08:52 +00:00
parent cf2bb9a656
commit 17e1139e1f
10 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/NodeTypeResolver/Node/AttributeKey.php
View File

@ -178,4 +178,9 @@ final class AttributeKey
* @var string
*/
public const CREATED_BY_RULE = 'created_by_rule';
/**
* Provided by PHPStan parser, depth in sense of nesting
* @var string
*/
public const STATEMENT_DEPTH = 'statementDepth';
}

6
packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
View File

@ -38,6 +38,10 @@ final class PHPStanNodeScopeResolver
* @see https://regex101.com/r/aXsCkK/1
*/
private const ANONYMOUS_CLASS_START_REGEX = '#^AnonymousClass(\\w+)#';
/**
* @var string
*/
private const CONTEXT = 'context';
/**
* @var \Rector\Caching\Detector\ChangedFilesDetector
*/
@ -106,7 +110,7 @@ final class PHPStanNodeScopeResolver
$traitReflectionClass = $this->reflectionProvider->getClass($traitName);
$scopeContext = $this->traitScopeFaker->createDummyClassScopeContext($scope);
$traitScope = clone $scope;
$this->privatesAccessor->setPrivateProperty($traitScope, 'context', $scopeContext);
$this->privatesAccessor->setPrivateProperty($traitScope, self::CONTEXT, $scopeContext);
$traitScope = $traitScope->enterTrait($traitReflectionClass);
$this->nodeScopeResolver->processNodes($node->stmts, $traitScope, $nodeCallback);
return;

10
rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
View File

@ -74,8 +74,9 @@ class SomeClass
{
public float $someVariable;
public function __construct(float $someVariable = 0.0)
{
public function __construct(
float $someVariable = 0.0
) {
$this->someVariable = $someVariable;
}
}
@ -83,8 +84,9 @@ CODE_SAMPLE
, <<<'CODE_SAMPLE'
class SomeClass
{
public function __construct(private float $someVariable = 0.0)
{
public function __construct(
private float $someVariable = 0.0
) {
}
}
CODE_SAMPLE

6
rules/Php80/ValueObject/CondAndExpr.php
View File

@ -8,7 +8,7 @@ use Rector\Php80\Enum\MatchKind;
final class CondAndExpr
{
/**
* @var \PhpParser\Node\Expr[]
* @var \PhpParser\Node\Expr[]|null
*/
private $condExprs;
/**
@ -20,9 +20,9 @@ final class CondAndExpr
*/
private $matchKind;
/**
* @param Expr[] $condExprs
* @param Expr[]|null $condExprs
*/
public function __construct(array $condExprs, \PhpParser\Node\Expr $expr, \Rector\Php80\Enum\MatchKind $matchKind)
public function __construct($condExprs, \PhpParser\Node\Expr $expr, \Rector\Php80\Enum\MatchKind $matchKind)
{
$this->condExprs = $condExprs;
$this->expr = $expr;

4
rules/Renaming/Rector/FuncCall/RenameFunctionRector.php
View File

@ -57,11 +57,11 @@ final class RenameFunctionRector extends \Rector\Core\Rector\AbstractRector impl
return null;
}
/**
* @param array<string, array<string, string>> $configuration
* @param array<string, mixed[]> $configuration
*/
public function configure(array $configuration) : void
{
$oldFunctionToNewFunction = $configuration[self::OLD_FUNCTION_TO_NEW_FUNCTION] ?? [];
$oldFunctionToNewFunction = $configuration[self::OLD_FUNCTION_TO_NEW_FUNCTION] ?? $configuration ?: [];
\RectorPrefix20211125\Webmozart\Assert\Assert::allString($oldFunctionToNewFunction);
\RectorPrefix20211125\Webmozart\Assert\Assert::allString(\array_values($oldFunctionToNewFunction));
$this->oldFunctionToNewFunction = $oldFunctionToNewFunction;

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'dc07c1f9a8c03c73915fec8d9fb8ef324e9e5ed2';
public const PACKAGE_VERSION = 'dfe5bcfabc658c33068cd7b8e3b0648c72d78bc1';
/**
* @var string
*/
public const RELEASE_DATE = '2021-11-25 18:26:06';
public const RELEASE_DATE = '2021-11-25 18:54:27';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211125\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda::getLoader();
return ComposerAutoloaderInit25d8c70c96b808401c8c62f98da0e82a::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda
class ComposerAutoloaderInit25d8c70c96b808401c8c62f98da0e82a
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit25d8c70c96b808401c8c62f98da0e82a', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit25d8c70c96b808401c8c62f98da0e82a', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit99c9d5125c06e991ece166f257758bda::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit25d8c70c96b808401c8c62f98da0e82a::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit99c9d5125c06e991ece166f257758bda::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit25d8c70c96b808401c8c62f98da0e82a::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire99c9d5125c06e991ece166f257758bda($fileIdentifier, $file);
composerRequire25d8c70c96b808401c8c62f98da0e82a($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire99c9d5125c06e991ece166f257758bda($fileIdentifier, $file)
function composerRequire25d8c70c96b808401c8c62f98da0e82a($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit99c9d5125c06e991ece166f257758bda
class ComposerStaticInit25d8c70c96b808401c8c62f98da0e82a
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3765,9 +3765,9 @@ class ComposerStaticInit99c9d5125c06e991ece166f257758bda
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit99c9d5125c06e991ece166f257758bda::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit99c9d5125c06e991ece166f257758bda::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit99c9d5125c06e991ece166f257758bda::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit25d8c70c96b808401c8c62f98da0e82a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit25d8c70c96b808401c8c62f98da0e82a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit25d8c70c96b808401c8c62f98da0e82a::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211125\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda', false) && !interface_exists('ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda', false) && !trait_exists('ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda', false)) {
spl_autoload_call('RectorPrefix20211125\ComposerAutoloaderInit99c9d5125c06e991ece166f257758bda');
if (!class_exists('ComposerAutoloaderInit25d8c70c96b808401c8c62f98da0e82a', false) && !interface_exists('ComposerAutoloaderInit25d8c70c96b808401c8c62f98da0e82a', false) && !trait_exists('ComposerAutoloaderInit25d8c70c96b808401c8c62f98da0e82a', false)) {
spl_autoload_call('RectorPrefix20211125\ComposerAutoloaderInit25d8c70c96b808401c8c62f98da0e82a');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20211125\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -81,9 +81,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211125\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire99c9d5125c06e991ece166f257758bda')) {
function composerRequire99c9d5125c06e991ece166f257758bda() {
return \RectorPrefix20211125\composerRequire99c9d5125c06e991ece166f257758bda(...func_get_args());
if (!function_exists('composerRequire25d8c70c96b808401c8c62f98da0e82a')) {
function composerRequire25d8c70c96b808401c8c62f98da0e82a() {
return \RectorPrefix20211125\composerRequire25d8c70c96b808401c8c62f98da0e82a(...func_get_args());
}
}
if (!function_exists('scanPath')) {