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

Updated Rector to commit 26ac103189

Browse Source 
26ac103189 [Php80] Copy array generic doc on ClassPropertyAssignToConstructorPromotionRector (#988)
This commit is contained in:
Tomas Votruba 2021-10-12 08:14:21 +00:00
parent 3163961fe7
commit 100023d71a
7 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/BetterPhpDocParser/PhpDocManipulator/PhpDocTypeChanger.php
View File

@ -4,14 +4,17 @@ declare (strict_types=1);
namespace Rector\BetterPhpDocParser\PhpDocManipulator;
use PhpParser\Node\Param;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Property;
use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
use PHPStan\Type\Constant\ConstantArrayType;
use PHPStan\Type\MixedType;
use PHPStan\Type\NeverType;
use PHPStan\Type\Type;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
use Rector\PHPStanStaticTypeMapper\ValueObject\TypeKind;
@ -31,11 +34,16 @@ final class PhpDocTypeChanger
* @var \Rector\TypeDeclaration\PhpDocParser\ParamPhpDocNodeFactory
*/
private $paramPhpDocNodeFactory;
public function __construct(\Rector\StaticTypeMapper\StaticTypeMapper $staticTypeMapper, \Rector\NodeTypeResolver\TypeComparator\TypeComparator $typeComparator, \Rector\TypeDeclaration\PhpDocParser\ParamPhpDocNodeFactory $paramPhpDocNodeFactory)
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
public function __construct(\Rector\StaticTypeMapper\StaticTypeMapper $staticTypeMapper, \Rector\NodeTypeResolver\TypeComparator\TypeComparator $typeComparator, \Rector\TypeDeclaration\PhpDocParser\ParamPhpDocNodeFactory $paramPhpDocNodeFactory, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver)
{
$this->staticTypeMapper = $staticTypeMapper;
$this->typeComparator = $typeComparator;
$this->paramPhpDocNodeFactory = $paramPhpDocNodeFactory;
$this->nodeNameResolver = $nodeNameResolver;
}
public function changeVarType(\Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo $phpDocInfo, \PHPStan\Type\Type $newType) : void
{
@ -125,5 +133,12 @@ final class PhpDocTypeChanger
}
$phpDocInfo->removeByType(\PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode::class);
$param->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::PHP_DOC_INFO, $phpDocInfo);
$functionLike = $param->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::PARENT_NODE);
$paramVarName = $this->nodeNameResolver->getName($param->var);
if ($functionLike instanceof \PhpParser\Node\Stmt\ClassMethod && $varTag->type instanceof \PHPStan\PhpDocParser\Ast\Type\GenericTypeNode && \is_string($paramVarName)) {
$phpDocInfo = $functionLike->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::PHP_DOC_INFO);
$paramType = $this->staticTypeMapper->mapPHPStanPhpDocTypeToPHPStanType($varTag, $property);
$this->changeParamType($phpDocInfo, $paramType, $param, $paramVarName);
}
}
}

7
rules/CodeQuality/Rector/Identical/StrlenZeroToIdenticalEmptyStringRector.php
View File

@ -9,9 +9,8 @@ use PhpParser\Node\Expr;
use PhpParser\Node\Expr\BinaryOp\Identical;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Scalar\String_;
use Rector\Core\NodeAnalyzer\ArgsAnalyzer;
use PhpParser\Node\Expr\BinaryOp\Equal;
use PHPStan\Type\StringType;
use Rector\Core\NodeAnalyzer\ArgsAnalyzer;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@ -70,12 +69,12 @@ CODE_SAMPLE
}
return null;
}
private function processIdentical(\PhpParser\Node\Expr $value, \PhpParser\Node\Expr\FuncCall $funcCall) : ?\PhpParser\Node\Expr\BinaryOp\Identical
private function processIdentical(\PhpParser\Node\Expr $expr, \PhpParser\Node\Expr\FuncCall $funcCall) : ?\PhpParser\Node\Expr\BinaryOp\Identical
{
if (!$this->isName($funcCall, 'strlen')) {
return null;
}
if (!$this->valueResolver->isValue($value, 0)) {
if (!$this->valueResolver->isValue($expr, 0)) {
return null;
}
if (!$this->argsAnalyzer->isArgInstanceInArgsPosition($funcCall->args, 0)) {

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '90c1d09a33d2675b5b60d8bc08d3853cfbfcf75a';
public const PACKAGE_VERSION = '26ac10318950d641fcd7df94c9fd2d42eb87921c';
/**
* @var string
*/
public const RELEASE_DATE = '2021-10-12 08:24:17';
public const RELEASE_DATE = '2021-10-12 10:02:51';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211012\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 ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181::getLoader();
return ComposerAutoloaderInita46e8cc2109d5de2ea95cadf20678283::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181
class ComposerAutoloaderInita46e8cc2109d5de2ea95cadf20678283
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInita46e8cc2109d5de2ea95cadf20678283', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInita46e8cc2109d5de2ea95cadf20678283', '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\ComposerStaticInit6d8c3ef1909956311baf1d5a790a6181::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInita46e8cc2109d5de2ea95cadf20678283::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit6d8c3ef1909956311baf1d5a790a6181::$files;
$includeFiles = Composer\Autoload\ComposerStaticInita46e8cc2109d5de2ea95cadf20678283::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire6d8c3ef1909956311baf1d5a790a6181($fileIdentifier, $file);
composerRequirea46e8cc2109d5de2ea95cadf20678283($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire6d8c3ef1909956311baf1d5a790a6181($fileIdentifier, $file)
function composerRequirea46e8cc2109d5de2ea95cadf20678283($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 ComposerStaticInit6d8c3ef1909956311baf1d5a790a6181
class ComposerStaticInita46e8cc2109d5de2ea95cadf20678283
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3896,9 +3896,9 @@ class ComposerStaticInit6d8c3ef1909956311baf1d5a790a6181
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit6d8c3ef1909956311baf1d5a790a6181::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit6d8c3ef1909956311baf1d5a790a6181::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit6d8c3ef1909956311baf1d5a790a6181::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInita46e8cc2109d5de2ea95cadf20678283::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita46e8cc2109d5de2ea95cadf20678283::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInita46e8cc2109d5de2ea95cadf20678283::$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('RectorPrefix20211012\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181', false) && !interface_exists('ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181', false) && !trait_exists('ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181', false)) {
spl_autoload_call('RectorPrefix20211012\ComposerAutoloaderInit6d8c3ef1909956311baf1d5a790a6181');
if (!class_exists('ComposerAutoloaderInita46e8cc2109d5de2ea95cadf20678283', false) && !interface_exists('ComposerAutoloaderInita46e8cc2109d5de2ea95cadf20678283', false) && !trait_exists('ComposerAutoloaderInita46e8cc2109d5de2ea95cadf20678283', false)) {
spl_autoload_call('RectorPrefix20211012\ComposerAutoloaderInita46e8cc2109d5de2ea95cadf20678283');
}
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('RectorPrefix20211012\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211012\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire6d8c3ef1909956311baf1d5a790a6181')) {
function composerRequire6d8c3ef1909956311baf1d5a790a6181() {
return \RectorPrefix20211012\composerRequire6d8c3ef1909956311baf1d5a790a6181(...func_get_args());
if (!function_exists('composerRequirea46e8cc2109d5de2ea95cadf20678283')) {
function composerRequirea46e8cc2109d5de2ea95cadf20678283() {
return \RectorPrefix20211012\composerRequirea46e8cc2109d5de2ea95cadf20678283(...func_get_args());
}
}
if (!function_exists('parseArgs')) {