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 1e94a70450

Browse Source 
1e94a70450 [DowngradePhp72] Improve DowngradeParameterTypeWideningRector (#1150)
This commit is contained in:
Tomas Votruba 2021-11-05 10:25:23 +00:00
parent d5469fb5cf
commit d42bc5b694
7 changed files with 43 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
rules/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector.php
View File

@ -158,16 +158,25 @@ CODE_SAMPLE
}
private function shouldSkip(\PHPStan\Reflection\ClassReflection $classReflection, \PhpParser\Node\Stmt\ClassMethod $classMethod) : bool
{
if ($this->sealedClassAnalyzer->isSealedClass($classReflection)) {
return \true;
}
if ($this->isSafeType($classReflection, $classMethod)) {
if ($classMethod->params === []) {
return \true;
}
if ($classMethod->isPrivate()) {
return \true;
}
return $this->shouldSkipClassMethod($classMethod);
if ($classMethod->isMagic()) {
return \true;
}
if ($this->sealedClassAnalyzer->isSealedClass($classReflection)) {
return \true;
}
if ($this->autowiredClassMethodOrPropertyAnalyzer->detect($classMethod)) {
return \true;
}
if ($this->hasParamAlreadyNonTyped($classMethod)) {
return \true;
}
return $this->isSafeType($classReflection, $classMethod);
}
private function processRemoveParamTypeFromMethod(\PHPStan\Reflection\ClassReflection $classReflection, \PhpParser\Node\Stmt\ClassMethod $classMethod) : ?\PhpParser\Node\Stmt\ClassMethod
{
@ -189,25 +198,12 @@ CODE_SAMPLE
if (!$param instanceof \PhpParser\Node\Param) {
return;
}
// It already has no type => nothing to do - check original param, as it could have been removed by this rule
if ($param->type === null) {
return;
}
// Add the current type in the PHPDoc
$this->nativeParamToPhpDocDecorator->decorate($classMethod, $param);
$param->type = null;
}
private function shouldSkipClassMethod(\PhpParser\Node\Stmt\ClassMethod $classMethod) : bool
private function hasParamAlreadyNonTyped(\PhpParser\Node\Stmt\ClassMethod $classMethod) : bool
{
if ($classMethod->isMagic()) {
return \true;
}
if ($classMethod->params === []) {
return \true;
}
if ($this->autowiredClassMethodOrPropertyAnalyzer->detect($classMethod)) {
return \true;
}
foreach ($classMethod->params as $param) {
if ($param->type !== null) {
return \false;
@ -217,12 +213,13 @@ CODE_SAMPLE
}
private function isSafeType(\PHPStan\Reflection\ClassReflection $classReflection, \PhpParser\Node\Stmt\ClassMethod $classMethod) : bool
{
$classReflectionName = $classReflection->getName();
foreach ($this->safeTypes as $safeType) {
if ($classReflection->isSubclassOf($safeType)) {
return \true;
}
// skip self too
if ($classReflection->getName() === $safeType) {
if ($classReflectionName === $safeType) {
return \true;
}
}
@ -234,7 +231,7 @@ CODE_SAMPLE
return \true;
}
// skip self too
if ($classReflection->getName() === $safeType) {
if ($classReflectionName === $safeType) {
return \true;
}
}

19
rules/TypeDeclaration/NodeAnalyzer/AutowiredClassMethodOrPropertyAnalyzer.php
View File

@ -7,7 +7,7 @@ use PhpParser\Node\Param;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Property;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
use RectorPrefix20211105\Symfony\Contracts\Service\Attribute\Required;
final class AutowiredClassMethodOrPropertyAnalyzer
{
@ -16,13 +16,13 @@ final class AutowiredClassMethodOrPropertyAnalyzer
*/
private $phpDocInfoFactory;
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
* @var \Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer
*/
private $nodeNameResolver;
public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver)
private $phpAttributeAnalyzer;
public function __construct(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer $phpAttributeAnalyzer)
{
$this->phpDocInfoFactory = $phpDocInfoFactory;
$this->nodeNameResolver = $nodeNameResolver;
$this->phpAttributeAnalyzer = $phpAttributeAnalyzer;
}
/**
* @param \PhpParser\Node\Param|\PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Property $node
@ -33,13 +33,6 @@ final class AutowiredClassMethodOrPropertyAnalyzer
if ($nodePhpDocInfo->hasByNames(['required', 'inject'])) {
return \true;
}
foreach ($node->attrGroups as $attrGroup) {
foreach ($attrGroup->attrs as $attribute) {
if ($this->nodeNameResolver->isNames($attribute->name, [\RectorPrefix20211105\Symfony\Contracts\Service\Attribute\Required::class, 'Nette\\DI\\Attributes\\Inject'])) {
return \true;
}
}
}
return \false;
return $this->phpAttributeAnalyzer->hasPhpAttributes($node, [\RectorPrefix20211105\Symfony\Contracts\Service\Attribute\Required::class, 'Nette\\DI\\Attributes\\Inject']);
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '502cc04dacff9c8b3ff1297878968e90ae4e55d0';
public const PACKAGE_VERSION = '1e94a7045029d16fc4932fdd8127691c07813d4c';
/**
* @var string
*/
public const RELEASE_DATE = '2021-11-05 00:17:45';
public const RELEASE_DATE = '2021-11-05 11:07:31';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211105\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 ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b::getLoader();
return ComposerAutoloaderInitef7c0c9e3b4f677aa4a23e4a48fcecc3::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b
class ComposerAutoloaderInitef7c0c9e3b4f677aa4a23e4a48fcecc3
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitef7c0c9e3b4f677aa4a23e4a48fcecc3', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitef7c0c9e3b4f677aa4a23e4a48fcecc3', '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\ComposerStaticInit15757a555de5cfce1d189f0e9b29870b::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitef7c0c9e3b4f677aa4a23e4a48fcecc3::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit15757a555de5cfce1d189f0e9b29870b::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitef7c0c9e3b4f677aa4a23e4a48fcecc3::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire15757a555de5cfce1d189f0e9b29870b($fileIdentifier, $file);
composerRequireef7c0c9e3b4f677aa4a23e4a48fcecc3($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire15757a555de5cfce1d189f0e9b29870b($fileIdentifier, $file)
function composerRequireef7c0c9e3b4f677aa4a23e4a48fcecc3($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 ComposerStaticInit15757a555de5cfce1d189f0e9b29870b
class ComposerStaticInitef7c0c9e3b4f677aa4a23e4a48fcecc3
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3529,9 +3529,9 @@ class ComposerStaticInit15757a555de5cfce1d189f0e9b29870b
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit15757a555de5cfce1d189f0e9b29870b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit15757a555de5cfce1d189f0e9b29870b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit15757a555de5cfce1d189f0e9b29870b::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitef7c0c9e3b4f677aa4a23e4a48fcecc3::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitef7c0c9e3b4f677aa4a23e4a48fcecc3::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitef7c0c9e3b4f677aa4a23e4a48fcecc3::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211105\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b', false) && !interface_exists('ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b', false) && !trait_exists('ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b', false)) {
spl_autoload_call('RectorPrefix20211105\ComposerAutoloaderInit15757a555de5cfce1d189f0e9b29870b');
if (!class_exists('ComposerAutoloaderInitef7c0c9e3b4f677aa4a23e4a48fcecc3', false) && !interface_exists('ComposerAutoloaderInitef7c0c9e3b4f677aa4a23e4a48fcecc3', false) && !trait_exists('ComposerAutoloaderInitef7c0c9e3b4f677aa4a23e4a48fcecc3', false)) {
spl_autoload_call('RectorPrefix20211105\ComposerAutoloaderInitef7c0c9e3b4f677aa4a23e4a48fcecc3');
}
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('RectorPrefix20211105\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211105\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire15757a555de5cfce1d189f0e9b29870b')) {
function composerRequire15757a555de5cfce1d189f0e9b29870b() {
return \RectorPrefix20211105\composerRequire15757a555de5cfce1d189f0e9b29870b(...func_get_args());
if (!function_exists('composerRequireef7c0c9e3b4f677aa4a23e4a48fcecc3')) {
function composerRequireef7c0c9e3b4f677aa4a23e4a48fcecc3() {
return \RectorPrefix20211105\composerRequireef7c0c9e3b4f677aa4a23e4a48fcecc3(...func_get_args());
}
}
if (!function_exists('parseArgs')) {