From e814dc3e3e3a1c5d990093f86be90c4d0a0acf69 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Thu, 17 Jun 2021 16:05:13 +0000 Subject: [PATCH] Updated Rector to commit 1fb8e54d9594d30f931b143a18f572fe3c9cb8c8 https://github.com/rectorphp/rector-src/commit/1fb8e54d9594d30f931b143a18f572fe3c9cb8c8 [Php71] Skip interface type on RemoveExtraParametersRector (#237) --- .../FuncCall/RemoveExtraParametersRector.php | 7 +++++++ src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/scoper-autoload.php | 10 +++++----- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php b/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php index 09690195610..16d0a5eba18 100644 --- a/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php +++ b/rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php @@ -11,6 +11,7 @@ use PhpParser\Node\Name; use PHPStan\Reflection\FunctionReflection; use PHPStan\Reflection\MethodReflection; use PHPStan\Reflection\ParametersAcceptor; +use PHPStan\Reflection\Php\PhpMethodReflection; use PHPStan\Reflection\Type\UnionTypeMethodReflection; use Rector\Core\PHPStan\Reflection\CallReflectionResolver; use Rector\Core\Rector\AbstractRector; @@ -59,6 +60,12 @@ final class RemoveExtraParametersRector extends \Rector\Core\Rector\AbstractRect if ($functionLikeReflection === null) { return null; } + if ($functionLikeReflection instanceof \PHPStan\Reflection\Php\PhpMethodReflection) { + $classReflection = $functionLikeReflection->getDeclaringClass(); + if ($classReflection->isInterface()) { + return null; + } + } $maximumAllowedParameterCount = $this->resolveMaximumAllowedParameterCount($functionLikeReflection); $numberOfArguments = \count($node->args); if ($numberOfArguments <= $maximumAllowedParameterCount) { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 8a7f2b820cc..24e57fd01dd 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '246a5863eda22e02a1081b576344eb6e2dda9395'; + public const PACKAGE_VERSION = '1fb8e54d9594d30f931b143a18f572fe3c9cb8c8'; /** * @var string */ - public const RELEASE_DATE = '2021-06-17 17:49:34'; + public const RELEASE_DATE = '2021-06-17 17:52:59'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210617\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index da2337fe0c9..daeca0ce8ac 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2::getLoader(); +return ComposerAutoloaderInit5622c1bfbbf900cd309405a7f4559d0c::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 28b45c30215..5f4d658f6a1 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2 +class ComposerAutoloaderInit5622c1bfbbf900cd309405a7f4559d0c { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit5622c1bfbbf900cd309405a7f4559d0c', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit5622c1bfbbf900cd309405a7f4559d0c', '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\ComposerStaticInitd785366774feb1ac9d3efd38a84da3f2::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit5622c1bfbbf900cd309405a7f4559d0c::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitd785366774feb1ac9d3efd38a84da3f2::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit5622c1bfbbf900cd309405a7f4559d0c::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequired785366774feb1ac9d3efd38a84da3f2($fileIdentifier, $file); + composerRequire5622c1bfbbf900cd309405a7f4559d0c($fileIdentifier, $file); } return $loader; } } -function composerRequired785366774feb1ac9d3efd38a84da3f2($fileIdentifier, $file) +function composerRequire5622c1bfbbf900cd309405a7f4559d0c($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 21a41fc488a..7e2fac2a59b 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitd785366774feb1ac9d3efd38a84da3f2 +class ComposerStaticInit5622c1bfbbf900cd309405a7f4559d0c { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3874,9 +3874,9 @@ class ComposerStaticInitd785366774feb1ac9d3efd38a84da3f2 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitd785366774feb1ac9d3efd38a84da3f2::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitd785366774feb1ac9d3efd38a84da3f2::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitd785366774feb1ac9d3efd38a84da3f2::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit5622c1bfbbf900cd309405a7f4559d0c::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit5622c1bfbbf900cd309405a7f4559d0c::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit5622c1bfbbf900cd309405a7f4559d0c::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 5b7aa60ec21..bcb5cd4a3b5 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) { spl_autoload_call('RectorPrefix20210617\CheckoutEntityFactory'); } -if (!class_exists('ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2', false) && !interface_exists('ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2', false) && !trait_exists('ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2', false)) { - spl_autoload_call('RectorPrefix20210617\ComposerAutoloaderInitd785366774feb1ac9d3efd38a84da3f2'); +if (!class_exists('ComposerAutoloaderInit5622c1bfbbf900cd309405a7f4559d0c', false) && !interface_exists('ComposerAutoloaderInit5622c1bfbbf900cd309405a7f4559d0c', false) && !trait_exists('ComposerAutoloaderInit5622c1bfbbf900cd309405a7f4559d0c', false)) { + spl_autoload_call('RectorPrefix20210617\ComposerAutoloaderInit5622c1bfbbf900cd309405a7f4559d0c'); } if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) { spl_autoload_call('RectorPrefix20210617\Doctrine\Inflector\Inflector'); @@ -3323,9 +3323,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210617\print_node(...func_get_args()); } } -if (!function_exists('composerRequired785366774feb1ac9d3efd38a84da3f2')) { - function composerRequired785366774feb1ac9d3efd38a84da3f2() { - return \RectorPrefix20210617\composerRequired785366774feb1ac9d3efd38a84da3f2(...func_get_args()); +if (!function_exists('composerRequire5622c1bfbbf900cd309405a7f4559d0c')) { + function composerRequire5622c1bfbbf900cd309405a7f4559d0c() { + return \RectorPrefix20210617\composerRequire5622c1bfbbf900cd309405a7f4559d0c(...func_get_args()); } } if (!function_exists('parseArgs')) {