octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-30 16:00:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 505a2490fab1d61dffe6a9fa0cd95efc35ff9ac0

Browse Source 
505a2490fa remove MethodTypeAnalyzer
This commit is contained in:
Tomas Votruba 2023-01-15 01:58:44 +00:00
parent f456cdf31c
commit bede86547e
11 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'daf7d2b5edd3bd83433630d1c189de78ed38d62b';
public const PACKAGE_VERSION = '505a2490fab1d61dffe6a9fa0cd95efc35ff9ac0';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-01-15 01:43:47';
public const RELEASE_DATE = '2023-01-15 01:54:36';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

2
vendor/composer/autoload_classmap.php vendored
View File

@ -1888,6 +1888,7 @@ return array(
'Rector\\Naming\\ValueObject\\VariableAndCallForeach' => $baseDir . '/rules/Naming/ValueObject/VariableAndCallForeach.php',
'Rector\\Naming\\VariableRenamer' => $baseDir . '/rules/Naming/VariableRenamer.php',
'Rector\\NodeAnalyzer\\CoalesceAnalyzer' => $vendorDir . '/rector/rector-downgrade-php/src/NodeAnalyzer/CoalesceAnalyzer.php',
'Rector\\NodeAnalyzer\\MethodCallTypeAnalyzer' => $vendorDir . '/rector/rector-downgrade-php/src/NodeAnalyzer/MethodCallTypeAnalyzer.php',
'Rector\\NodeCollector\\BinaryOpConditionsCollector' => $baseDir . '/packages/NodeCollector/BinaryOpConditionsCollector.php',
'Rector\\NodeCollector\\BinaryOpTreeRootLocator' => $baseDir . '/packages/NodeCollector/BinaryOpTreeRootLocator.php',
'Rector\\NodeCollector\\NodeAnalyzer\\ArrayCallableMethodMatcher' => $baseDir . '/packages/NodeCollector/NodeAnalyzer/ArrayCallableMethodMatcher.php',
@ -1969,7 +1970,6 @@ return array(
'Rector\\NodeTypeResolver\\Reflection\\BetterReflection\\SourceLocator\\IntermediateSourceLocator' => $baseDir . '/packages/NodeTypeResolver/Reflection/BetterReflection/SourceLocator/IntermediateSourceLocator.php',
'Rector\\NodeTypeResolver\\TypeAnalyzer\\ArrayTypeAnalyzer' => $baseDir . '/packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php',
'Rector\\NodeTypeResolver\\TypeAnalyzer\\CountableTypeAnalyzer' => $baseDir . '/packages/NodeTypeResolver/TypeAnalyzer/CountableTypeAnalyzer.php',
'Rector\\NodeTypeResolver\\TypeAnalyzer\\MethodTypeAnalyzer' => $baseDir . '/packages/NodeTypeResolver/TypeAnalyzer/MethodTypeAnalyzer.php',
'Rector\\NodeTypeResolver\\TypeAnalyzer\\StringTypeAnalyzer' => $baseDir . '/packages/NodeTypeResolver/TypeAnalyzer/StringTypeAnalyzer.php',
'Rector\\NodeTypeResolver\\TypeComparator\\ArrayTypeComparator' => $baseDir . '/packages/NodeTypeResolver/TypeComparator/ArrayTypeComparator.php',
'Rector\\NodeTypeResolver\\TypeComparator\\ScalarTypeComparator' => $baseDir . '/packages/NodeTypeResolver/TypeComparator/ScalarTypeComparator.php',

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit47b1ec4244873ddbc94f2c55f569c7c6
class ComposerAutoloaderInitc9a68d0668d7e1b7a423642a8307b356
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit47b1ec4244873ddbc94f2c55f569c7c6
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit47b1ec4244873ddbc94f2c55f569c7c6', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitc9a68d0668d7e1b7a423642a8307b356', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit47b1ec4244873ddbc94f2c55f569c7c6', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitc9a68d0668d7e1b7a423642a8307b356', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit47b1ec4244873ddbc94f2c55f569c7c6::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitc9a68d0668d7e1b7a423642a8307b356::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit47b1ec4244873ddbc94f2c55f569c7c6::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInitc9a68d0668d7e1b7a423642a8307b356::$files;
$requireFile = static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

10
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit47b1ec4244873ddbc94f2c55f569c7c6
class ComposerStaticInitc9a68d0668d7e1b7a423642a8307b356
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2133,6 +2133,7 @@ class ComposerStaticInit47b1ec4244873ddbc94f2c55f569c7c6
'Rector\\Naming\\ValueObject\\VariableAndCallForeach' => __DIR__ . '/../..' . '/rules/Naming/ValueObject/VariableAndCallForeach.php',
'Rector\\Naming\\VariableRenamer' => __DIR__ . '/../..' . '/rules/Naming/VariableRenamer.php',
'Rector\\NodeAnalyzer\\CoalesceAnalyzer' => __DIR__ . '/..' . '/rector/rector-downgrade-php/src/NodeAnalyzer/CoalesceAnalyzer.php',
'Rector\\NodeAnalyzer\\MethodCallTypeAnalyzer' => __DIR__ . '/..' . '/rector/rector-downgrade-php/src/NodeAnalyzer/MethodCallTypeAnalyzer.php',
'Rector\\NodeCollector\\BinaryOpConditionsCollector' => __DIR__ . '/../..' . '/packages/NodeCollector/BinaryOpConditionsCollector.php',
'Rector\\NodeCollector\\BinaryOpTreeRootLocator' => __DIR__ . '/../..' . '/packages/NodeCollector/BinaryOpTreeRootLocator.php',
'Rector\\NodeCollector\\NodeAnalyzer\\ArrayCallableMethodMatcher' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeAnalyzer/ArrayCallableMethodMatcher.php',
@ -2214,7 +2215,6 @@ class ComposerStaticInit47b1ec4244873ddbc94f2c55f569c7c6
'Rector\\NodeTypeResolver\\Reflection\\BetterReflection\\SourceLocator\\IntermediateSourceLocator' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/Reflection/BetterReflection/SourceLocator/IntermediateSourceLocator.php',
'Rector\\NodeTypeResolver\\TypeAnalyzer\\ArrayTypeAnalyzer' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php',
'Rector\\NodeTypeResolver\\TypeAnalyzer\\CountableTypeAnalyzer' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/TypeAnalyzer/CountableTypeAnalyzer.php',
'Rector\\NodeTypeResolver\\TypeAnalyzer\\MethodTypeAnalyzer' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/TypeAnalyzer/MethodTypeAnalyzer.php',
'Rector\\NodeTypeResolver\\TypeAnalyzer\\StringTypeAnalyzer' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/TypeAnalyzer/StringTypeAnalyzer.php',
'Rector\\NodeTypeResolver\\TypeComparator\\ArrayTypeComparator' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/TypeComparator/ArrayTypeComparator.php',
'Rector\\NodeTypeResolver\\TypeComparator\\ScalarTypeComparator' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/TypeComparator/ScalarTypeComparator.php',
@ -3066,9 +3066,9 @@ class ComposerStaticInit47b1ec4244873ddbc94f2c55f569c7c6
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit47b1ec4244873ddbc94f2c55f569c7c6::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit47b1ec4244873ddbc94f2c55f569c7c6::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit47b1ec4244873ddbc94f2c55f569c7c6::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitc9a68d0668d7e1b7a423642a8307b356::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitc9a68d0668d7e1b7a423642a8307b356::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitc9a68d0668d7e1b7a423642a8307b356::$classMap;
}, null, ClassLoader::class);
}

15
vendor/composer/installed.json vendored
View File

@ -1913,12 +1913,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-downgrade-php.git",
"reference": "e7f7f8e4f4ecf51b74a9b6fb284d35e42612f615"
"reference": "4c1bc82fd09231bc601b2e27183b15d853c5042a"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-downgrade-php\/zipball\/e7f7f8e4f4ecf51b74a9b6fb284d35e42612f615",
"reference": "e7f7f8e4f4ecf51b74a9b6fb284d35e42612f615",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-downgrade-php\/zipball\/4c1bc82fd09231bc601b2e27183b15d853c5042a",
"reference": "4c1bc82fd09231bc601b2e27183b15d853c5042a",
"shasum": ""
},
"require": {
@ -1942,9 +1942,12 @@
"symplify\/phpstan-extensions": "^11.1",
"symplify\/phpstan-rules": "^11.1",
"symplify\/rule-doc-generator": "^11.1",
"symplify\/vendor-patches": "^11.1"
"symplify\/vendor-patches": "^11.1",
"tomasvotruba\/cognitive-complexity": "^0.0.5",
"tomasvotruba\/type-coverage": "^0.0.9",
"tomasvotruba\/unused-public": "^0.0.34"
},
"time": "2023-01-15T01:43:30+00:00",
"time": "2023-01-15T01:53:13+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {
@ -1974,7 +1977,7 @@
"description": "Rector downgrade PHP rules",
"support": {
"issues": "https:\/\/github.com\/rectorphp\/rector-downgrade-php\/issues",
"source": "https:\/\/github.com\/rectorphp\/rector-downgrade-php\/tree\/main"
"source": "https:\/\/github.com\/rectorphp\/rector-downgrade-php\/tree\/0.14.2"
},
"install-path": "..\/rector\/rector-downgrade-php"
},

2
vendor/composer/installed.php vendored
View File

File diff suppressed because one or more lines are too long

2
vendor/rector/extension-installer/src/GeneratedConfig.php vendored
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 f0c3c11'), '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 e7f7f8e'), 'rector/rector-php-parser' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-php-parser', 'relative_install_path' => '../../rector-php-parser', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 9ea5f62'), '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 2cfc0a5'), '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 3b132c1'));
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 f0c3c11'), '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 4c1bc82'), 'rector/rector-php-parser' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-php-parser', 'relative_install_path' => '../../rector-php-parser', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 9ea5f62'), '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 2cfc0a5'), '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 3b132c1'));
private function __construct()
{
}

5
vendor/rector/rector-downgrade-php/composer.json vendored
View File

@ -21,7 +21,10 @@
"symplify\/phpstan-extensions": "^11.1",
"symplify\/phpstan-rules": "^11.1",
"symplify\/rule-doc-generator": "^11.1",
"symplify\/vendor-patches": "^11.1"
"symplify\/vendor-patches": "^11.1",
"tomasvotruba\/cognitive-complexity": "^0.0.5",
"tomasvotruba\/type-coverage": "^0.0.9",
"tomasvotruba\/unused-public": "^0.0.34"
},
"autoload": {
"psr-4": {

12
vendor/rector/rector-downgrade-php/rules/DowngradePhp70/Rector/MethodCall/DowngradeClosureCallRector.php vendored
View File

@ -13,7 +13,7 @@ use PhpParser\Node\Name;
use PhpParser\Node\Param;
use PhpParser\Node\Scalar\LNumber;
use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\TypeAnalyzer\MethodTypeAnalyzer;
use Rector\NodeAnalyzer\MethodCallTypeAnalyzer;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -25,12 +25,12 @@ final class DowngradeClosureCallRector extends AbstractRector
{
/**
* @readonly
* @var \Rector\NodeTypeResolver\TypeAnalyzer\MethodTypeAnalyzer
* @var \Rector\NodeAnalyzer\MethodCallTypeAnalyzer
*/
private $methodTypeAnalyzer;
public function __construct(MethodTypeAnalyzer $methodTypeAnalyzer)
private $methodCallTypeAnalyzer;
public function __construct(MethodCallTypeAnalyzer $methodCallTypeAnalyzer)
{
$this->methodTypeAnalyzer = $methodTypeAnalyzer;
$this->methodCallTypeAnalyzer = $methodCallTypeAnalyzer;
}
public function getRuleDefinition() : RuleDefinition
{
@ -67,7 +67,7 @@ CODE_SAMPLE
if ($methodCall->args === []) {
return \true;
}
return !$this->methodTypeAnalyzer->isCallTo($methodCall, Closure::class, 'call');
return !$this->methodCallTypeAnalyzer->isMethodCallTo($methodCall, Closure::class, 'call');
}
private function createBindToCall(MethodCall $methodCall) : MethodCall
{

30
packages/NodeTypeResolver/TypeAnalyzer/MethodTypeAnalyzer.php → vendor/rector/rector-downgrade-php/src/NodeAnalyzer/MethodCallTypeAnalyzer.php vendored
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace Rector\NodeTypeResolver\TypeAnalyzer;
namespace Rector\NodeAnalyzer;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\MethodCall;
@ -9,7 +9,7 @@ use PhpParser\Node\Identifier;
use PHPStan\Type\Constant\ConstantStringType;
use PHPStan\Type\TypeWithClassName;
use Rector\NodeTypeResolver\NodeTypeResolver;
final class MethodTypeAnalyzer
final class MethodCallTypeAnalyzer
{
/**
* @readonly
@ -20,33 +20,24 @@ final class MethodTypeAnalyzer
{
$this->nodeTypeResolver = $nodeTypeResolver;
}
/**
* @api downgrade
* @param class-string $expectedClass
* @param non-empty-string $expectedMethod
*/
public function isCallTo(MethodCall $methodCall, string $expectedClass, string $expectedMethod) : bool
public function isMethodCallTo(MethodCall $methodCall, string $expectedClass, string $expectedMethod) : bool
{
if (!$this->isMethodName($methodCall, $expectedMethod)) {
return \false;
}
return $this->isInstanceOf($methodCall->var, $expectedClass);
}
/**
* @param non-empty-string $expectedName
*/
private function isMethodName(MethodCall $methodCall, string $expectedName) : bool
{
if ($methodCall->name instanceof Identifier && $this->areMethodNamesEqual($methodCall->name->toString(), $expectedName)) {
if ($methodCall->name instanceof Identifier && $this->areNamesEqual($methodCall->name->toString(), $expectedName)) {
return \true;
}
$type = $this->nodeTypeResolver->getType($methodCall->name);
return $type instanceof ConstantStringType && $this->areMethodNamesEqual($type->getValue(), $expectedName);
return $type instanceof ConstantStringType && $this->areNamesEqual($type->getValue(), $expectedName);
}
private function areMethodNamesEqual(string $left, string $right) : bool
private function areNamesEqual(string $left, string $right) : bool
{
$comparison = \strcasecmp($left, $right);
return $comparison === 0;
return \strcasecmp($left, $right) === 0;
}
/**
* @param class-string $expectedClass
@ -57,14 +48,9 @@ final class MethodTypeAnalyzer
if (!$type instanceof TypeWithClassName) {
return \false;
}
if ($this->areClassNamesEqual($expectedClass, $type->getClassName())) {
if ($this->areNamesEqual($expectedClass, $type->getClassName())) {
return \true;
}
return $type->getAncestorWithClassName($expectedClass) !== null;
}
private function areClassNamesEqual(string $left, string $right) : bool
{
$comparison = \strcasecmp($left, $right);
return $comparison === 0;
}
}