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

Updated Rector to commit 7d8444e81b

Browse Source 
7d8444e81b [TypeDeclaration] Skip @inheritdoc on PropertyTypeDeclaration (#1752)
This commit is contained in:
Tomas Votruba 2022-02-15 15:35:02 +00:00
parent fc910d5859
commit 378c7f0a44
9 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/set/php80.php
View File

@ -7,13 +7,13 @@ use Rector\Arguments\Rector\ClassMethod\ArgumentAdderRector;
use Rector\Arguments\Rector\FuncCall\FunctionArgumentDefaultValueReplacerRector;
use Rector\Arguments\ValueObject\ArgumentAdder;
use Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue;
use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
use Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector;
use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
use Rector\Php80\Rector\Class_\StringableForToStringRector;
use Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector;
use Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector;
use Rector\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
use Rector\Php80\Rector\ClassMethod\SetStateToStaticRector;
use Rector\Php80\Rector\FuncCall\ClassOnObjectRector;
use Rector\Php80\Rector\FuncCall\Php8ResourceReturnToObjectRector;
@ -49,7 +49,7 @@ return static function (\Symfony\Component\DependencyInjection\Loader\Configurat
$services->set(\Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector::class);
// @see https://php.watch/versions/8.0/pgsql-aliases-deprecated
$services->set(\Rector\Renaming\Rector\FuncCall\RenameFunctionRector::class)->configure(['pg_clientencoding' => 'pg_client_encoding', 'pg_cmdtuples' => 'pg_affected_rows', 'pg_errormessage' => 'pg_last_error', 'pg_fieldisnull' => 'pg_field_is_null', 'pg_fieldname' => 'pg_field_name', 'pg_fieldnum' => 'pg_field_num', 'pg_fieldprtlen' => 'pg_field_prtlen', 'pg_fieldsize' => 'pg_field_size', 'pg_fieldtype' => 'pg_field_type', 'pg_freeresult' => 'pg_free_result', 'pg_getlastoid' => 'pg_last_oid', 'pg_loclose' => 'pg_lo_close', 'pg_locreate' => 'pg_lo_create', 'pg_loexport' => 'pg_lo_export', 'pg_loimport' => 'pg_lo_import', 'pg_loopen' => 'pg_lo_open', 'pg_loread' => 'pg_lo_read', 'pg_loreadall' => 'pg_lo_read_all', 'pg_lounlink' => 'pg_lo_unlink', 'pg_lowrite' => 'pg_lo_write', 'pg_numfields' => 'pg_num_fields', 'pg_numrows' => 'pg_num_rows', 'pg_result' => 'pg_fetch_result', 'pg_setclientencoding' => 'pg_set_client_encoding']);
$services->set(\Rector\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector::class);
$services->set(\Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector::class);
$services->set(\Rector\Arguments\Rector\FuncCall\FunctionArgumentDefaultValueReplacerRector::class)->configure([new \Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue('version_compare', 2, 'gte', 'ge'), new \Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue('version_compare', 2, 'lte', 'le'), new \Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue('version_compare', 2, '', '!='), new \Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue('version_compare', 2, '!', '!='), new \Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue('version_compare', 2, 'g', 'gt'), new \Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue('version_compare', 2, 'l', 'lt'), new \Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue('version_compare', 2, 'gte', 'ge'), new \Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue('version_compare', 2, 'lte', 'le'), new \Rector\Arguments\ValueObject\ReplaceFuncCallArgumentDefaultValue('version_compare', 2, 'n', 'ne')]);
$services->set(\Rector\Php80\Rector\FuncCall\Php8ResourceReturnToObjectRector::class);
$services->set(\Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector::class);

11
rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php → rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php
View File

@ -1,7 +1,7 @@
<?php
declare (strict_types=1);
namespace Rector\Php80\Rector\ClassMethod;
namespace Rector\CodeQuality\Rector\ClassMethod;
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
@ -15,15 +15,14 @@ use Rector\Core\Reflection\ReflectionResolver;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\Php80\NodeResolver\ArgumentSorter;
use Rector\Php80\NodeResolver\RequireOptionalParamResolver;
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
* @changelog https://php.watch/versions/8.0#deprecate-required-param-after-optional
*
* @see \Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\OptionalParametersAfterRequiredRectorTest
* @see \Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\OptionalParametersAfterRequiredRectorTest
*/
final class OptionalParametersAfterRequiredRector extends \Rector\Core\Rector\AbstractRector implements \Rector\VersionBonding\Contract\MinPhpVersionInterface
final class OptionalParametersAfterRequiredRector extends \Rector\Core\Rector\AbstractRector
{
/**
* @var string
@ -56,10 +55,6 @@ final class OptionalParametersAfterRequiredRector extends \Rector\Core\Rector\Ab
$this->reflectionResolver = $reflectionResolver;
$this->vendorLocationDetector = $vendorLocationDetector;
}
public function provideMinPhpVersion() : int
{
return \Rector\Core\ValueObject\PhpVersionFeature::DEPRECATE_REQUIRED_PARAMETER_AFTER_OPTIONAL;
}
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Move required parameters after optional ones', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample(<<<'CODE_SAMPLE'

3
rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php
View File

@ -92,6 +92,9 @@ CODE_SAMPLE
return null;
}
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
if ($phpDocInfo->hasInheritDoc() && !$node->isPrivate()) {
return null;
}
if ($this->isVarDocAlreadySet($phpDocInfo)) {
return null;
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'b708e071f3b349f7a1bae5ff1c259bd661e6e690';
public const PACKAGE_VERSION = '7d8444e81ba3ee6f25e0e05f5f1a7866a902d335';
/**
* @var string
*/
public const RELEASE_DATE = '2022-02-15 19:31:10';
public const RELEASE_DATE = '2022-02-15 16:28:35';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220215\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 ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f::getLoader();
return ComposerAutoloaderInit02ff6876a9b929fb2ff2b6d16ddf038f::getLoader();

2
vendor/composer/autoload_classmap.php vendored
View File

@ -1493,6 +1493,7 @@ return array(
'Rector\\CodeQuality\\Rector\\Catch_\\ThrowWithPreviousExceptionRector' => $baseDir . '/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php',
'Rector\\CodeQuality\\Rector\\ClassMethod\\DateTimeToDateTimeInterfaceRector' => $baseDir . '/rules/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector.php',
'Rector\\CodeQuality\\Rector\\ClassMethod\\NarrowUnionTypeDocRector' => $baseDir . '/rules/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector.php',
'Rector\\CodeQuality\\Rector\\ClassMethod\\OptionalParametersAfterRequiredRector' => $baseDir . '/rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php',
'Rector\\CodeQuality\\Rector\\Class_\\CompleteDynamicPropertiesRector' => $baseDir . '/rules/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector.php',
'Rector\\CodeQuality\\Rector\\Concat\\JoinStringConcatRector' => $baseDir . '/rules/CodeQuality/Rector/Concat/JoinStringConcatRector.php',
'Rector\\CodeQuality\\Rector\\Do_\\DoWhileBreakFalseToIfElseRector' => $baseDir . '/rules/CodeQuality/Rector/Do_/DoWhileBreakFalseToIfElseRector.php',
@ -2674,7 +2675,6 @@ return array(
'Rector\\Php80\\Rector\\Catch_\\RemoveUnusedVariableInCatchRector' => $baseDir . '/rules/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\AddParamBasedOnParentClassMethodRector' => $baseDir . '/rules/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\FinalPrivateToPrivateVisibilityRector' => $baseDir . '/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\OptionalParametersAfterRequiredRector' => $baseDir . '/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\SetStateToStaticRector' => $baseDir . '/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php',
'Rector\\Php80\\Rector\\Class_\\AnnotationToAttributeRector' => $baseDir . '/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php',
'Rector\\Php80\\Rector\\Class_\\ClassPropertyAssignToConstructorPromotionRector' => $baseDir . '/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f
class ComposerAutoloaderInit02ff6876a9b929fb2ff2b6d16ddf038f
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit02ff6876a9b929fb2ff2b6d16ddf038f', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit02ff6876a9b929fb2ff2b6d16ddf038f', '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\ComposerStaticInit83db5bd6d896453efa69bea8e035c20f::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit02ff6876a9b929fb2ff2b6d16ddf038f::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,12 +42,12 @@ class ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit83db5bd6d896453efa69bea8e035c20f::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit02ff6876a9b929fb2ff2b6d16ddf038f::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire83db5bd6d896453efa69bea8e035c20f($fileIdentifier, $file);
composerRequire02ff6876a9b929fb2ff2b6d16ddf038f($fileIdentifier, $file);
}
return $loader;
@ -59,7 +59,7 @@ class ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f
* @param string $file
* @return void
*/
function composerRequire83db5bd6d896453efa69bea8e035c20f($fileIdentifier, $file)
function composerRequire02ff6876a9b929fb2ff2b6d16ddf038f($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 ComposerStaticInit83db5bd6d896453efa69bea8e035c20f
class ComposerStaticInit02ff6876a9b929fb2ff2b6d16ddf038f
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -1882,6 +1882,7 @@ class ComposerStaticInit83db5bd6d896453efa69bea8e035c20f
'Rector\\CodeQuality\\Rector\\Catch_\\ThrowWithPreviousExceptionRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php',
'Rector\\CodeQuality\\Rector\\ClassMethod\\DateTimeToDateTimeInterfaceRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/ClassMethod/DateTimeToDateTimeInterfaceRector.php',
'Rector\\CodeQuality\\Rector\\ClassMethod\\NarrowUnionTypeDocRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector.php',
'Rector\\CodeQuality\\Rector\\ClassMethod\\OptionalParametersAfterRequiredRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php',
'Rector\\CodeQuality\\Rector\\Class_\\CompleteDynamicPropertiesRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/Class_/CompleteDynamicPropertiesRector.php',
'Rector\\CodeQuality\\Rector\\Concat\\JoinStringConcatRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/Concat/JoinStringConcatRector.php',
'Rector\\CodeQuality\\Rector\\Do_\\DoWhileBreakFalseToIfElseRector' => __DIR__ . '/../..' . '/rules/CodeQuality/Rector/Do_/DoWhileBreakFalseToIfElseRector.php',
@ -3063,7 +3064,6 @@ class ComposerStaticInit83db5bd6d896453efa69bea8e035c20f
'Rector\\Php80\\Rector\\Catch_\\RemoveUnusedVariableInCatchRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/Catch_/RemoveUnusedVariableInCatchRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\AddParamBasedOnParentClassMethodRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/ClassMethod/AddParamBasedOnParentClassMethodRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\FinalPrivateToPrivateVisibilityRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/ClassMethod/FinalPrivateToPrivateVisibilityRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\OptionalParametersAfterRequiredRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php',
'Rector\\Php80\\Rector\\ClassMethod\\SetStateToStaticRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/ClassMethod/SetStateToStaticRector.php',
'Rector\\Php80\\Rector\\Class_\\AnnotationToAttributeRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php',
'Rector\\Php80\\Rector\\Class_\\ClassPropertyAssignToConstructorPromotionRector' => __DIR__ . '/../..' . '/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php',
@ -3881,9 +3881,9 @@ class ComposerStaticInit83db5bd6d896453efa69bea8e035c20f
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit83db5bd6d896453efa69bea8e035c20f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit83db5bd6d896453efa69bea8e035c20f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit83db5bd6d896453efa69bea8e035c20f::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit02ff6876a9b929fb2ff2b6d16ddf038f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit02ff6876a9b929fb2ff2b6d16ddf038f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit02ff6876a9b929fb2ff2b6d16ddf038f::$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('RectorPrefix20220215\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f', false) && !interface_exists('ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f', false) && !trait_exists('ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f', false)) {
spl_autoload_call('RectorPrefix20220215\ComposerAutoloaderInit83db5bd6d896453efa69bea8e035c20f');
if (!class_exists('ComposerAutoloaderInit02ff6876a9b929fb2ff2b6d16ddf038f', false) && !interface_exists('ComposerAutoloaderInit02ff6876a9b929fb2ff2b6d16ddf038f', false) && !trait_exists('ComposerAutoloaderInit02ff6876a9b929fb2ff2b6d16ddf038f', false)) {
spl_autoload_call('RectorPrefix20220215\ComposerAutoloaderInit02ff6876a9b929fb2ff2b6d16ddf038f');
}
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('RectorPrefix20220215\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220215\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire83db5bd6d896453efa69bea8e035c20f')) {
function composerRequire83db5bd6d896453efa69bea8e035c20f() {
return \RectorPrefix20220215\composerRequire83db5bd6d896453efa69bea8e035c20f(...func_get_args());
if (!function_exists('composerRequire02ff6876a9b929fb2ff2b6d16ddf038f')) {
function composerRequire02ff6876a9b929fb2ff2b6d16ddf038f() {
return \RectorPrefix20220215\composerRequire02ff6876a9b929fb2ff2b6d16ddf038f(...func_get_args());
}
}
if (!function_exists('scanPath')) {