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

Updated Rector to commit 5f21af7a492f8be43972c1d89fa150ae9e37475c

Browse Source 
5f21af7a49 Remove unused AssignVariableNameResolverInterface instances (#6631)
This commit is contained in:
Tomas Votruba 2024-12-27 13:23:06 +00:00
parent df5de7b80d
commit 59d44f7985
8 changed files with 10 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
rules/Naming/AssignVariableNameResolver/NewAssignVariableNameResolver.php
View File

@ -1,39 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Naming\AssignVariableNameResolver;
use PhpParser\Node;
use PhpParser\Node\Expr\New_;
use Rector\Exception\NotImplementedYetException;
use Rector\Naming\Contract\AssignVariableNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
/**
* @implements AssignVariableNameResolverInterface<New_>
*/
final class NewAssignVariableNameResolver implements AssignVariableNameResolverInterface
{
/**
* @readonly
*/
private NodeNameResolver $nodeNameResolver;
public function __construct(NodeNameResolver $nodeNameResolver)
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function match(Node $node) : bool
{
return $node instanceof New_;
}
/**
* @param New_ $node
*/
public function resolve(Node $node) : string
{
$className = $this->nodeNameResolver->getName($node->class);
if ($className === null) {
throw new NotImplementedYetException();
}
return $this->nodeNameResolver->getShortName($className);
}
}

46
rules/Naming/AssignVariableNameResolver/PropertyFetchAssignVariableNameResolver.php
View File

@ -1,46 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Naming\AssignVariableNameResolver;
use PhpParser\Node;
use PhpParser\Node\Expr\PropertyFetch;
use Rector\Exception\NotImplementedYetException;
use Rector\Naming\Contract\AssignVariableNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
/**
* @implements AssignVariableNameResolverInterface<PropertyFetch>
*/
final class PropertyFetchAssignVariableNameResolver implements AssignVariableNameResolverInterface
{
/**
* @readonly
*/
private NodeNameResolver $nodeNameResolver;
public function __construct(NodeNameResolver $nodeNameResolver)
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function match(Node $node) : bool
{
return $node instanceof PropertyFetch;
}
/**
* @param PropertyFetch $node
*/
public function resolve(Node $node) : string
{
$varName = $this->nodeNameResolver->getName($node->var);
if (!\is_string($varName)) {
throw new NotImplementedYetException();
}
$propertyName = $this->nodeNameResolver->getName($node->name);
if (!\is_string($propertyName)) {
throw new NotImplementedYetException();
}
if ($varName === 'this') {
return $propertyName;
}
return $varName . \ucfirst($propertyName);
}
}

17
rules/Naming/Contract/AssignVariableNameResolverInterface.php
View File

@ -1,17 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Naming\Contract;
use PhpParser\Node;
/**
* @template TNode as Node
*/
interface AssignVariableNameResolverInterface
{
public function match(Node $node) : bool;
/**
* @param TNode $node
*/
public function resolve(Node $node) : string;
}

105
rules/Naming/Naming/VariableNaming.php
View File

@ -3,46 +3,12 @@
declare (strict_types=1);
namespace Rector\Naming\Naming;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\Cast;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\NullsafeMethodCall;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\Ternary;
use PhpParser\Node\Scalar\String_;
use PHPStan\Analyser\Scope;
use PHPStan\Type\ThisType;
use PHPStan\Type\Type;
use Rector\Naming\AssignVariableNameResolver\NewAssignVariableNameResolver;
use Rector\Naming\AssignVariableNameResolver\PropertyFetchAssignVariableNameResolver;
use Rector\Naming\Contract\AssignVariableNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\NodeTypeResolver;
/**
* @api used in downgrade
*/
final class VariableNaming
{
/**
* @readonly
*/
private NodeNameResolver $nodeNameResolver;
/**
* @readonly
*/
private NodeTypeResolver $nodeTypeResolver;
/**
* @var AssignVariableNameResolverInterface[]
*/
private array $assignVariableNameResolvers = [];
public function __construct(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, PropertyFetchAssignVariableNameResolver $propertyFetchAssignVariableNameResolver, NewAssignVariableNameResolver $newAssignVariableNameResolver)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->nodeTypeResolver = $nodeTypeResolver;
$this->assignVariableNameResolvers = [$propertyFetchAssignVariableNameResolver, $newAssignVariableNameResolver];
}
/**
* @api used in downgrade
*/
@ -64,75 +30,4 @@ final class VariableNaming
}
return $valueName;
}
private function resolveFromNodeAndType(Node $node, Type $type) : ?string
{
$variableName = $this->resolveBareFromNode($node);
if ($variableName === null) {
return null;
}
// adjust static to specific class
if ($variableName === 'this' && $type instanceof ThisType) {
$shortClassName = $this->nodeNameResolver->getShortName($type->getClassName());
return \lcfirst($shortClassName);
}
return $this->nodeNameResolver->getShortName($variableName);
}
private function resolveFromNode(Node $node) : ?string
{
$nodeType = $this->nodeTypeResolver->getType($node);
return $this->resolveFromNodeAndType($node, $nodeType);
}
private function resolveBareFromNode(Node $node) : ?string
{
$unwrappedNode = $this->unwrapNode($node);
if (!$unwrappedNode instanceof Node) {
return null;
}
foreach ($this->assignVariableNameResolvers as $assignVariableNameResolver) {
if ($assignVariableNameResolver->match($unwrappedNode)) {
return $assignVariableNameResolver->resolve($unwrappedNode);
}
}
if ($unwrappedNode instanceof MethodCall || $unwrappedNode instanceof NullsafeMethodCall || $unwrappedNode instanceof StaticCall) {
return $this->resolveFromMethodCall($unwrappedNode);
}
if ($unwrappedNode instanceof FuncCall) {
return $this->resolveFromNode($unwrappedNode->name);
}
$paramName = $this->nodeNameResolver->getName($unwrappedNode);
if ($paramName !== null) {
return $paramName;
}
if ($unwrappedNode instanceof String_) {
return $unwrappedNode->value;
}
return null;
}
/**
* @param \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\NullsafeMethodCall|\PhpParser\Node\Expr\StaticCall $node
*/
private function resolveFromMethodCall($node) : ?string
{
if ($node->name instanceof MethodCall) {
return $this->resolveFromMethodCall($node->name);
}
$methodName = $this->nodeNameResolver->getName($node->name);
if (!\is_string($methodName)) {
return null;
}
return $methodName;
}
private function unwrapNode(Node $node) : ?Node
{
if ($node instanceof Arg) {
return $node->value;
}
if ($node instanceof Cast) {
return $node->expr;
}
if ($node instanceof Ternary) {
return $node->if;
}
return $node;
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '2.0.4';
public const PACKAGE_VERSION = '5f21af7a492f8be43972c1d89fa150ae9e37475c';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-12-26 11:05:12';
public const RELEASE_DATE = '2024-12-27 20:20:25';
/**
* @var int
*/

3
vendor/composer/autoload_classmap.php vendored
View File

@ -1544,9 +1544,6 @@ return array(
'Rector\\FileSystem\\JsonFileSystem' => $baseDir . '/src/FileSystem/JsonFileSystem.php',
'Rector\\Git\\RepositoryHelper' => $baseDir . '/src/Git/RepositoryHelper.php',
'Rector\\Instanceof_\\Rector\\Ternary\\FlipNegatedTernaryInstanceofRector' => $baseDir . '/rules/Instanceof_/Rector/Ternary/FlipNegatedTernaryInstanceofRector.php',
'Rector\\Naming\\AssignVariableNameResolver\\NewAssignVariableNameResolver' => $baseDir . '/rules/Naming/AssignVariableNameResolver/NewAssignVariableNameResolver.php',
'Rector\\Naming\\AssignVariableNameResolver\\PropertyFetchAssignVariableNameResolver' => $baseDir . '/rules/Naming/AssignVariableNameResolver/PropertyFetchAssignVariableNameResolver.php',
'Rector\\Naming\\Contract\\AssignVariableNameResolverInterface' => $baseDir . '/rules/Naming/Contract/AssignVariableNameResolverInterface.php',
'Rector\\Naming\\ExpectedNameResolver\\InflectorSingularResolver' => $baseDir . '/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php',
'Rector\\Naming\\ExpectedNameResolver\\MatchParamTypeExpectedNameResolver' => $baseDir . '/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php',
'Rector\\Naming\\ExpectedNameResolver\\MatchPropertyTypeExpectedNameResolver' => $baseDir . '/rules/Naming/ExpectedNameResolver/MatchPropertyTypeExpectedNameResolver.php',

3
vendor/composer/autoload_static.php vendored
View File

@ -1763,9 +1763,6 @@ class ComposerStaticInite1459f150f08d0eee2804dfc37f818db
'Rector\\FileSystem\\JsonFileSystem' => __DIR__ . '/../..' . '/src/FileSystem/JsonFileSystem.php',
'Rector\\Git\\RepositoryHelper' => __DIR__ . '/../..' . '/src/Git/RepositoryHelper.php',
'Rector\\Instanceof_\\Rector\\Ternary\\FlipNegatedTernaryInstanceofRector' => __DIR__ . '/../..' . '/rules/Instanceof_/Rector/Ternary/FlipNegatedTernaryInstanceofRector.php',
'Rector\\Naming\\AssignVariableNameResolver\\NewAssignVariableNameResolver' => __DIR__ . '/../..' . '/rules/Naming/AssignVariableNameResolver/NewAssignVariableNameResolver.php',
'Rector\\Naming\\AssignVariableNameResolver\\PropertyFetchAssignVariableNameResolver' => __DIR__ . '/../..' . '/rules/Naming/AssignVariableNameResolver/PropertyFetchAssignVariableNameResolver.php',
'Rector\\Naming\\Contract\\AssignVariableNameResolverInterface' => __DIR__ . '/../..' . '/rules/Naming/Contract/AssignVariableNameResolverInterface.php',
'Rector\\Naming\\ExpectedNameResolver\\InflectorSingularResolver' => __DIR__ . '/../..' . '/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php',
'Rector\\Naming\\ExpectedNameResolver\\MatchParamTypeExpectedNameResolver' => __DIR__ . '/../..' . '/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php',
'Rector\\Naming\\ExpectedNameResolver\\MatchPropertyTypeExpectedNameResolver' => __DIR__ . '/../..' . '/rules/Naming/ExpectedNameResolver/MatchPropertyTypeExpectedNameResolver.php',

16
vendor/composer/installed.json vendored
View File

@ -2119,12 +2119,12 @@
"time": "2024-09-25T14:20:29+00:00",
"type": "library",
"extra": {
"thanks": {
"url": "https:\/\/github.com\/symfony\/contracts",
"name": "symfony\/contracts"
},
"branch-alias": {
"dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony\/contracts",
"url": "https:\/\/github.com\/symfony\/contracts"
}
},
"installation-source": "dist",
@ -2477,12 +2477,12 @@
"time": "2024-09-25T14:20:29+00:00",
"type": "library",
"extra": {
"thanks": {
"url": "https:\/\/github.com\/symfony\/contracts",
"name": "symfony\/contracts"
},
"branch-alias": {
"dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony\/contracts",
"url": "https:\/\/github.com\/symfony\/contracts"
}
},
"installation-source": "dist",