mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-13 03:52:15 +02:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit e81670c70921a4bf29f9de769be1b5cdd6eb2097

Browse Source 
e81670c709 [deprecation] Add message about deprecated MixedTypeRector rule, Remove deprecated SetListInterface as no longer used (#6590)
This commit is contained in:
Tomas Votruba 2024-12-14 23:01:26 +00:00
parent 8b56f9624f
commit 8156b1e214
5 changed files with 4 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
rules/Php80/Rector/FunctionLike/MixedTypeRector.php
View File

@ -6,20 +6,11 @@ namespace Rector\Php80\Rector\FunctionLike;
use PhpParser\Node;
use PhpParser\Node\Expr\ArrowFunction;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Identifier;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Type\MixedType;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
use Rector\DeadCode\PhpDoc\TagRemover\ParamTagRemover;
use Rector\FamilyTree\NodeAnalyzer\ClassChildAnalyzer;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Exception\ShouldNotHappenException;
use Rector\Rector\AbstractRector;
use Rector\Reflection\ReflectionResolver;
use Rector\ValueObject\PhpVersionFeature;
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@ -29,30 +20,6 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
*/
final class MixedTypeRector extends AbstractRector implements MinPhpVersionInterface, DeprecatedInterface
{
/**
* @readonly
*/
private ReflectionResolver $reflectionResolver;
/**
* @readonly
*/
private ClassChildAnalyzer $classChildAnalyzer;
/**
* @readonly
*/
private ParamTagRemover $paramTagRemover;
/**
* @readonly
*/
private PhpDocInfoFactory $phpDocInfoFactory;
private bool $hasChanged = \false;
public function __construct(ReflectionResolver $reflectionResolver, ClassChildAnalyzer $classChildAnalyzer, ParamTagRemover $paramTagRemover, PhpDocInfoFactory $phpDocInfoFactory)
{
$this->reflectionResolver = $reflectionResolver;
$this->classChildAnalyzer = $classChildAnalyzer;
$this->paramTagRemover = $paramTagRemover;
$this->phpDocInfoFactory = $phpDocInfoFactory;
}
public function getRuleDefinition() : RuleDefinition
{
return new RuleDefinition('Change mixed docs type to mixed typed', [new CodeSample(<<<'CODE_SAMPLE'
@ -88,54 +55,10 @@ CODE_SAMPLE
*/
public function refactor(Node $node) : ?Node
{
if ($node instanceof ClassMethod && $this->shouldSkipClassMethod($node)) {
return null;
}
$this->hasChanged = \false;
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
$this->refactorParamTypes($node, $phpDocInfo);
$hasChanged = $this->paramTagRemover->removeParamTagsIfUseless($phpDocInfo, $node, new MixedType());
if ($this->hasChanged || $hasChanged) {
return $node;
}
return null;
throw new ShouldNotHappenException(\sprintf('The `%s` is removed. Use "typeDeclarations" set in rector.php instead, to avoid filling mixed on better known types.', self::class));
}
public function provideMinPhpVersion() : int
{
return PhpVersionFeature::MIXED_TYPE;
}
private function shouldSkipClassMethod(ClassMethod $classMethod) : bool
{
$classReflection = $this->reflectionResolver->resolveClassReflection($classMethod);
if (!$classReflection instanceof ClassReflection) {
return \false;
}
$methodName = $this->nodeNameResolver->getName($classMethod);
return $this->classChildAnalyzer->hasParentClassMethod($classReflection, $methodName);
}
/**
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure|\PhpParser\Node\Expr\ArrowFunction $functionLike
*/
private function refactorParamTypes($functionLike, PhpDocInfo $phpDocInfo) : void
{
foreach ($functionLike->params as $param) {
if ($param->type instanceof Node) {
continue;
}
$paramName = (string) $this->getName($param->var);
$paramTagValue = $phpDocInfo->getParamTagValueByName($paramName);
if (!$paramTagValue instanceof ParamTagValueNode) {
continue;
}
$paramType = $phpDocInfo->getParamType($paramName);
if (!$paramType instanceof MixedType) {
continue;
}
$this->hasChanged = \true;
$param->type = new Identifier('mixed');
if ($param->flags !== 0) {
$param->setAttribute(AttributeKey::ORIGINAL_NODE, null);
}
}
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '1013a5ab7ddfc51fd597a4cfb17e1821cd662c5e';
public const PACKAGE_VERSION = 'e81670c70921a4bf29f9de769be1b5cdd6eb2097';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-12-14 21:40:44';
public const RELEASE_DATE = '2024-12-14 23:58:53';
/**
* @var int
*/

12
src/Set/Contract/SetListInterface.php
View File

@ -1,12 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Set\Contract;
/**
* @deprecated This interface needs a reflection to load and uses constant links. Now we changed to services provider architecture that can be used and registerd easily. Use
* @see SetProviderInterface instead
*/
interface SetListInterface
{
}

1
vendor/composer/autoload_classmap.php vendored
View File

@ -2136,7 +2136,6 @@ return array(
'Rector\\Reporting\\DeprecatedRulesReporter' => $baseDir . '/src/Reporting/DeprecatedRulesReporter.php',
'Rector\\Reporting\\MissConfigurationReporter' => $baseDir . '/src/Reporting/MissConfigurationReporter.php',
'Rector\\Set\\Contract\\SetInterface' => $baseDir . '/src/Set/Contract/SetInterface.php',
'Rector\\Set\\Contract\\SetListInterface' => $baseDir . '/src/Set/Contract/SetListInterface.php',
'Rector\\Set\\Contract\\SetProviderInterface' => $baseDir . '/src/Set/Contract/SetProviderInterface.php',
'Rector\\Set\\Enum\\SetGroup' => $baseDir . '/src/Set/Enum/SetGroup.php',
'Rector\\Set\\SetManager' => $baseDir . '/src/Set/SetManager.php',

1
vendor/composer/autoload_static.php vendored
View File

@ -2355,7 +2355,6 @@ class ComposerStaticInit4280c40f0ee92945093567ebf9648fda
'Rector\\Reporting\\DeprecatedRulesReporter' => __DIR__ . '/../..' . '/src/Reporting/DeprecatedRulesReporter.php',
'Rector\\Reporting\\MissConfigurationReporter' => __DIR__ . '/../..' . '/src/Reporting/MissConfigurationReporter.php',
'Rector\\Set\\Contract\\SetInterface' => __DIR__ . '/../..' . '/src/Set/Contract/SetInterface.php',
'Rector\\Set\\Contract\\SetListInterface' => __DIR__ . '/../..' . '/src/Set/Contract/SetListInterface.php',
'Rector\\Set\\Contract\\SetProviderInterface' => __DIR__ . '/../..' . '/src/Set/Contract/SetProviderInterface.php',
'Rector\\Set\\Enum\\SetGroup' => __DIR__ . '/../..' . '/src/Set/Enum/SetGroup.php',
'Rector\\Set\\SetManager' => __DIR__ . '/../..' . '/src/Set/SetManager.php',