mirror of
https://github.com/rectorphp/rector.git
synced 2025-04-19 06:52:51 +02:00
Updated Rector to commit 01fc91e57548e29d58db7e5c24a555b9d385828e
01fc91e575 [CodeQuality] Add empty array support to InlineArrayReturnAssignRector (#2397)This commit is contained in:
Tomas Votruba
parent
0501290a9d
commit
8506c85563
File diff suppressed because one or more lines are too long
@ -33,32 +33,6 @@ use Rector\Config\RectorConfig;
|
||||
use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
|
||||
use Rector\Transform\Rector\FuncCall\FuncCallToConstFetchRector;
|
||||
return static function (\Rector\Config\RectorConfig $rectorConfig) : void {
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Assign\PHPStormVarAnnotationRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\If_\NullableCompareToNullRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Switch_\BinarySwitchToIfElseRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\FuncCall\ConsistentImplodeRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\ClassConst\SplitGroupedConstantsAndPropertiesRector::class);
|
||||
$rectorConfig->rule(\Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\FuncCall\ConsistentPregDelimiterRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Plus\UseIncrementAssignRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\ClassConst\VarConstantCommentRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Encapsed\WrapEncapsedVariableInCurlyBracesRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Class_\AddArrayDefaultToArrayPropertyRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Property\AddFalseDefaultToBoolPropertyRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector::class);
|
||||
$rectorConfig->ruleWithConfiguration(\Rector\Transform\Rector\FuncCall\FuncCallToConstFetchRector::class, ['php_sapi_name' => 'PHP_SAPI', 'pi' => 'M_PI']);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\ClassMethod\RemoveDoubleUnderscoreInMethodNameRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\ClassMethod\UnSpreadOperatorRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector::class);
|
||||
$rectorConfig->rule(\Rector\CodingStyle\Rector\ClassConst\RemoveFinalFromConstRector::class);
|
||||
$rectorConfig->rules([\Rector\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector::class, \Rector\CodingStyle\Rector\ClassMethod\RemoveDoubleUnderscoreInMethodNameRector::class, \Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector::class, \Rector\CodingStyle\Rector\ClassMethod\UnSpreadOperatorRector::class, \Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector::class, \Rector\CodingStyle\Rector\ClassConst\RemoveFinalFromConstRector::class, \Rector\CodingStyle\Rector\Assign\PHPStormVarAnnotationRector::class, \Rector\CodingStyle\Rector\If_\NullableCompareToNullRector::class, \Rector\CodingStyle\Rector\Switch_\BinarySwitchToIfElseRector::class, \Rector\CodingStyle\Rector\FuncCall\ConsistentImplodeRector::class, \Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector::class, \Rector\CodingStyle\Rector\String_\SymplifyQuoteEscapeRector::class, \Rector\CodingStyle\Rector\ClassConst\SplitGroupedConstantsAndPropertiesRector::class, \Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class, \Rector\CodingStyle\Rector\FuncCall\ConsistentPregDelimiterRector::class, \Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector::class, \Rector\CodingStyle\Rector\Plus\UseIncrementAssignRector::class, \Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector::class, \Rector\CodingStyle\Rector\ClassConst\VarConstantCommentRector::class, \Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector::class, \Rector\CodingStyle\Rector\Encapsed\WrapEncapsedVariableInCurlyBracesRector::class, \Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector::class, \Rector\CodingStyle\Rector\Class_\AddArrayDefaultToArrayPropertyRector::class, \Rector\CodingStyle\Rector\Property\AddFalseDefaultToBoolPropertyRector::class, \Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector::class, \Rector\CodingStyle\Rector\FuncCall\CallUserFuncArrayToVariadicRector::class, \Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector::class]);
|
||||
};
|
||||
|
||||
@ -50,50 +50,52 @@ use Rector\DeadCode\Rector\Ternary\TernaryToBooleanOrFalseToBooleanAndRector;
|
||||
use Rector\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector;
|
||||
use Rector\PHPUnit\Rector\ClassMethod\RemoveEmptyTestMethodRector;
|
||||
return static function (\Rector\Config\RectorConfig $rectorConfig) : void {
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfFunctionExistsRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Cast\RecastingRemovalRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Expression\RemoveDeadStmtRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Expression\SimplifyMirrorAssignRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\FunctionLike\RemoveOverriddenValuesRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\FunctionLike\RemoveDeadReturnRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\For_\RemoveDeadContinueRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\For_\RemoveDeadIfForeachForRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector::class);
|
||||
$rectorConfig->rule(\Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\BinaryOp\RemoveDuplicatedInstanceOfRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\PropertyProperty\RemoveNullPropertyInitializationRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Stmt\RemoveUnreachableStatementRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\If_\SimplifyIfElseWithSameContentRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Ternary\TernaryToBooleanOrFalseToBooleanAndRector::class);
|
||||
$rectorConfig->rule(\Rector\PHPUnit\Rector\ClassMethod\RemoveEmptyTestMethodRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\FunctionLike\RemoveDuplicatedIfReturnRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Return_\RemoveDeadConditionAboveReturnRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\For_\RemoveDeadLoopRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedParamInRequiredAutowireRector::class);
|
||||
// docblock
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector::class);
|
||||
$rectorConfig->rule(\Rector\DeadCode\Rector\ClassMethod\RemoveLastReturnRector::class);
|
||||
$rectorConfig->rules([
|
||||
\Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfFunctionExistsRector::class,
|
||||
\Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector::class,
|
||||
\Rector\DeadCode\Rector\Cast\RecastingRemovalRector::class,
|
||||
\Rector\DeadCode\Rector\Expression\RemoveDeadStmtRector::class,
|
||||
\Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector::class,
|
||||
\Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector::class,
|
||||
\Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector::class,
|
||||
\Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector::class,
|
||||
\Rector\DeadCode\Rector\Expression\SimplifyMirrorAssignRector::class,
|
||||
\Rector\DeadCode\Rector\FunctionLike\RemoveOverriddenValuesRector::class,
|
||||
\Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector::class,
|
||||
\Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveDeadConstructorRector::class,
|
||||
\Rector\DeadCode\Rector\FunctionLike\RemoveDeadReturnRector::class,
|
||||
\Rector\DeadCode\Rector\For_\RemoveDeadContinueRector::class,
|
||||
\Rector\DeadCode\Rector\For_\RemoveDeadIfForeachForRector::class,
|
||||
\Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector::class,
|
||||
\Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector::class,
|
||||
\Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector::class,
|
||||
\Rector\DeadCode\Rector\BinaryOp\RemoveDuplicatedInstanceOfRector::class,
|
||||
\Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector::class,
|
||||
\Rector\DeadCode\Rector\PropertyProperty\RemoveNullPropertyInitializationRector::class,
|
||||
\Rector\DeadCode\Rector\Stmt\RemoveUnreachableStatementRector::class,
|
||||
\Rector\DeadCode\Rector\If_\SimplifyIfElseWithSameContentRector::class,
|
||||
\Rector\DeadCode\Rector\Ternary\TernaryToBooleanOrFalseToBooleanAndRector::class,
|
||||
\Rector\PHPUnit\Rector\ClassMethod\RemoveEmptyTestMethodRector::class,
|
||||
\Rector\DeadCode\Rector\TryCatch\RemoveDeadTryCatchRector::class,
|
||||
\Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector::class,
|
||||
\Rector\DeadCode\Rector\FunctionLike\RemoveDuplicatedIfReturnRector::class,
|
||||
\Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector::class,
|
||||
\Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector::class,
|
||||
\Rector\DeadCode\Rector\Return_\RemoveDeadConditionAboveReturnRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector::class,
|
||||
\Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector::class,
|
||||
\Rector\DeadCode\Rector\For_\RemoveDeadLoopRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedParamInRequiredAutowireRector::class,
|
||||
// docblock
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector::class,
|
||||
\Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector::class,
|
||||
\Rector\DeadCode\Rector\ClassMethod\RemoveLastReturnRector::class,
|
||||
]);
|
||||
};
|
||||
|
||||
@ -47,10 +47,12 @@ final class VariableDimFetchAssignResolver
|
||||
}
|
||||
$assign = $stmtExpr;
|
||||
$keyExpr = $this->matchKeyOnArrayDimFetchOfVariable($assign, $variable);
|
||||
if (!$keyExpr instanceof \PhpParser\Node\Expr) {
|
||||
return [];
|
||||
}
|
||||
$keysAndExprs[] = new \Rector\CodeQuality\ValueObject\KeyAndExpr($keyExpr, $assign->expr);
|
||||
$keysAndExprs[] = new \Rector\CodeQuality\ValueObject\KeyAndExpr($keyExpr, $assign->expr, $stmt->getComments());
|
||||
}
|
||||
// we can only work with same variable
|
||||
// and exclusively various keys or empty keys
|
||||
if (!$this->hasExclusivelyNullKeyOrFilledKey($keysAndExprs)) {
|
||||
return [];
|
||||
}
|
||||
return $keysAndExprs;
|
||||
}
|
||||
@ -71,4 +73,23 @@ final class VariableDimFetchAssignResolver
|
||||
}
|
||||
return $arrayDimFetch->dim;
|
||||
}
|
||||
/**
|
||||
* @param KeyAndExpr[] $keysAndExprs
|
||||
*/
|
||||
private function hasExclusivelyNullKeyOrFilledKey(array $keysAndExprs) : bool
|
||||
{
|
||||
$alwaysNullKey = \true;
|
||||
$alwaysStringKey = \true;
|
||||
foreach ($keysAndExprs as $keyAndExpr) {
|
||||
if ($keyAndExpr->getKeyExpr() !== null) {
|
||||
$alwaysNullKey = \false;
|
||||
} else {
|
||||
$alwaysStringKey = \false;
|
||||
}
|
||||
}
|
||||
if ($alwaysNullKey) {
|
||||
return \true;
|
||||
}
|
||||
return $alwaysStringKey;
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,6 +15,7 @@ use Rector\CodeQuality\NodeAnalyzer\VariableDimFetchAssignResolver;
|
||||
use Rector\CodeQuality\ValueObject\KeyAndExpr;
|
||||
use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
|
||||
use Rector\Core\Rector\AbstractRector;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
|
||||
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
|
||||
/**
|
||||
@ -127,7 +128,9 @@ CODE_SAMPLE
|
||||
{
|
||||
$arrayItems = [];
|
||||
foreach ($keysAndExprs as $keyAndExpr) {
|
||||
$arrayItems[] = new \PhpParser\Node\Expr\ArrayItem($keyAndExpr->getExpr(), $keyAndExpr->getKeyExpr());
|
||||
$arrayItem = new \PhpParser\Node\Expr\ArrayItem($keyAndExpr->getExpr(), $keyAndExpr->getKeyExpr());
|
||||
$arrayItem->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::COMMENTS, $keyAndExpr->getComments());
|
||||
$arrayItems[] = $arrayItem;
|
||||
}
|
||||
return new \PhpParser\Node\Expr\Array_($arrayItems);
|
||||
}
|
||||
|
||||
@ -3,12 +3,13 @@
|
||||
declare (strict_types=1);
|
||||
namespace Rector\CodeQuality\ValueObject;
|
||||
|
||||
use PhpParser\Comment;
|
||||
use PhpParser\Node\Expr;
|
||||
final class KeyAndExpr
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PhpParser\Node\Expr
|
||||
* @var \PhpParser\Node\Expr|null
|
||||
*/
|
||||
private $keyExpr;
|
||||
/**
|
||||
@ -16,12 +17,21 @@ final class KeyAndExpr
|
||||
* @var \PhpParser\Node\Expr
|
||||
*/
|
||||
private $expr;
|
||||
public function __construct(\PhpParser\Node\Expr $keyExpr, \PhpParser\Node\Expr $expr)
|
||||
/**
|
||||
* @var Comment[]
|
||||
* @readonly
|
||||
*/
|
||||
private $comments;
|
||||
/**
|
||||
* @param Comment[] $comments
|
||||
*/
|
||||
public function __construct(?\PhpParser\Node\Expr $keyExpr, \PhpParser\Node\Expr $expr, array $comments)
|
||||
{
|
||||
$this->keyExpr = $keyExpr;
|
||||
$this->expr = $expr;
|
||||
$this->comments = $comments;
|
||||
}
|
||||
public function getKeyExpr() : \PhpParser\Node\Expr
|
||||
public function getKeyExpr() : ?\PhpParser\Node\Expr
|
||||
{
|
||||
return $this->keyExpr;
|
||||
}
|
||||
@ -29,4 +39,11 @@ final class KeyAndExpr
|
||||
{
|
||||
return $this->expr;
|
||||
}
|
||||
/**
|
||||
* @return Comment[]
|
||||
*/
|
||||
public function getComments() : array
|
||||
{
|
||||
return $this->comments;
|
||||
}
|
||||
}
|
||||
|
||||
@ -100,13 +100,7 @@ CODE_SAMPLE
|
||||
*/
|
||||
private function createNewNodes(\PhpParser\Node\Expr $assignVariable, \PhpParser\Node\Expr $eachedVariable) : array
|
||||
{
|
||||
$newNodes = [];
|
||||
$newNodes[] = $this->createDimFetchAssignWithFuncCall($assignVariable, $eachedVariable, 1, 'current');
|
||||
$newNodes[] = $this->createDimFetchAssignWithFuncCall($assignVariable, $eachedVariable, 'value', 'current');
|
||||
$newNodes[] = $this->createDimFetchAssignWithFuncCall($assignVariable, $eachedVariable, 0, self::KEY);
|
||||
$newNodes[] = $this->createDimFetchAssignWithFuncCall($assignVariable, $eachedVariable, self::KEY, self::KEY);
|
||||
$newNodes[] = $this->nodeFactory->createFuncCall('next', [new \PhpParser\Node\Arg($eachedVariable)]);
|
||||
return $newNodes;
|
||||
return [$this->createDimFetchAssignWithFuncCall($assignVariable, $eachedVariable, 1, 'current'), $this->createDimFetchAssignWithFuncCall($assignVariable, $eachedVariable, 'value', 'current'), $this->createDimFetchAssignWithFuncCall($assignVariable, $eachedVariable, 0, self::KEY), $this->createDimFetchAssignWithFuncCall($assignVariable, $eachedVariable, self::KEY, self::KEY), $this->nodeFactory->createFuncCall('next', [new \PhpParser\Node\Arg($eachedVariable)])];
|
||||
}
|
||||
/**
|
||||
* @param string|int $dimValue
|
||||
|
||||
@ -16,11 +16,11 @@ final class VersionResolver
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = 'dc6bd9680c930795d9dd34fac16d5ff8304cc530';
|
||||
public const PACKAGE_VERSION = '01fc91e57548e29d58db7e5c24a555b9d385828e';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2022-05-31 09:11:41';
|
||||
public const RELEASE_DATE = '2022-05-31 07:42:03';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
||||
@ -66,16 +66,16 @@ final class RectorKernel implements \RectorPrefix20220531\Symplify\SymplifyKerne
|
||||
*/
|
||||
private function createCompilerPasses() : array
|
||||
{
|
||||
$compilerPasses = [];
|
||||
// must run before AutowireArrayParameterCompilerPass, as the autowired array cannot contain removed services
|
||||
$compilerPasses[] = new \Rector\Core\DependencyInjection\CompilerPass\RemoveSkippedRectorsCompilerPass();
|
||||
// autowire Rectors by default (mainly for tests)
|
||||
$compilerPasses[] = new \RectorPrefix20220531\Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireInterfacesCompilerPass([\Rector\Core\Contract\Rector\RectorInterface::class]);
|
||||
$compilerPasses[] = new \Rector\Core\DependencyInjection\CompilerPass\MakeRectorsPublicCompilerPass();
|
||||
// add all merged arguments of Rector services
|
||||
$compilerPasses[] = new \Rector\Core\DependencyInjection\CompilerPass\MergeImportedRectorConfigureCallValuesCompilerPass($this->configureCallValuesCollector);
|
||||
$compilerPasses[] = new \RectorPrefix20220531\Symplify\AutowireArrayParameter\DependencyInjection\CompilerPass\AutowireArrayParameterCompilerPass();
|
||||
return $compilerPasses;
|
||||
return [
|
||||
// must run before AutowireArrayParameterCompilerPass, as the autowired array cannot contain removed services
|
||||
new \Rector\Core\DependencyInjection\CompilerPass\RemoveSkippedRectorsCompilerPass(),
|
||||
// autowire Rectors by default (mainly for tests)
|
||||
new \RectorPrefix20220531\Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireInterfacesCompilerPass([\Rector\Core\Contract\Rector\RectorInterface::class]),
|
||||
new \Rector\Core\DependencyInjection\CompilerPass\MakeRectorsPublicCompilerPass(),
|
||||
// add all merged arguments of Rector services
|
||||
new \Rector\Core\DependencyInjection\CompilerPass\MergeImportedRectorConfigureCallValuesCompilerPass($this->configureCallValuesCollector),
|
||||
new \RectorPrefix20220531\Symplify\AutowireArrayParameter\DependencyInjection\CompilerPass\AutowireArrayParameterCompilerPass(),
|
||||
];
|
||||
}
|
||||
/**
|
||||
* @return string[]
|
||||
|
||||
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
|
||||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54::getLoader();
|
||||
return ComposerAutoloaderInitc8691653d72726f9b132ae551a35954b::getLoader();
|
||||
|
||||
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54
|
||||
class ComposerAutoloaderInitc8691653d72726f9b132ae551a35954b
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
@ -22,19 +22,19 @@ class ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54
|
||||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInitc8691653d72726f9b132ae551a35954b', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitc8691653d72726f9b132ae551a35954b', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit73753ed0c20a3e877c59ef54e946ea54::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInitc8691653d72726f9b132ae551a35954b::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInit73753ed0c20a3e877c59ef54e946ea54::$files;
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInitc8691653d72726f9b132ae551a35954b::$files;
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequire73753ed0c20a3e877c59ef54e946ea54($fileIdentifier, $file);
|
||||
composerRequirec8691653d72726f9b132ae551a35954b($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
@ -46,7 +46,7 @@ class ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54
|
||||
* @param string $file
|
||||
* @return void
|
||||
*/
|
||||
function composerRequire73753ed0c20a3e877c59ef54e946ea54($fileIdentifier, $file)
|
||||
function composerRequirec8691653d72726f9b132ae551a35954b($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||
|
||||
8
vendor/composer/autoload_static.php
vendored
8
vendor/composer/autoload_static.php
vendored
@ -4,7 +4,7 @@
|
||||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit73753ed0c20a3e877c59ef54e946ea54
|
||||
class ComposerStaticInitc8691653d72726f9b132ae551a35954b
|
||||
{
|
||||
public static $files = array (
|
||||
'23c18046f52bef3eea034657bafda50f' => __DIR__ . '/..' . '/symfony/polyfill-php81/bootstrap.php',
|
||||
@ -3762,9 +3762,9 @@ class ComposerStaticInit73753ed0c20a3e877c59ef54e946ea54
|
||||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit73753ed0c20a3e877c59ef54e946ea54::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit73753ed0c20a3e877c59ef54e946ea54::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit73753ed0c20a3e877c59ef54e946ea54::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitc8691653d72726f9b132ae551a35954b::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitc8691653d72726f9b132ae551a35954b::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitc8691653d72726f9b132ae551a35954b::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
||||
10
vendor/scoper-autoload.php
vendored
10
vendor/scoper-autoload.php
vendored
@ -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('RectorPrefix20220531\AutoloadIncluder');
|
||||
}
|
||||
if (!class_exists('ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54', false) && !interface_exists('ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54', false) && !trait_exists('ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54', false)) {
|
||||
spl_autoload_call('RectorPrefix20220531\ComposerAutoloaderInit73753ed0c20a3e877c59ef54e946ea54');
|
||||
if (!class_exists('ComposerAutoloaderInitc8691653d72726f9b132ae551a35954b', false) && !interface_exists('ComposerAutoloaderInitc8691653d72726f9b132ae551a35954b', false) && !trait_exists('ComposerAutoloaderInitc8691653d72726f9b132ae551a35954b', false)) {
|
||||
spl_autoload_call('RectorPrefix20220531\ComposerAutoloaderInitc8691653d72726f9b132ae551a35954b');
|
||||
}
|
||||
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('RectorPrefix20220531\Helmich\TypoScriptParser\Parser\AST\Statement');
|
||||
@ -56,9 +56,9 @@ if (!function_exists('print_node')) {
|
||||
return \RectorPrefix20220531\print_node(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('composerRequire73753ed0c20a3e877c59ef54e946ea54')) {
|
||||
function composerRequire73753ed0c20a3e877c59ef54e946ea54() {
|
||||
return \RectorPrefix20220531\composerRequire73753ed0c20a3e877c59ef54e946ea54(...func_get_args());
|
||||
if (!function_exists('composerRequirec8691653d72726f9b132ae551a35954b')) {
|
||||
function composerRequirec8691653d72726f9b132ae551a35954b() {
|
||||
return \RectorPrefix20220531\composerRequirec8691653d72726f9b132ae551a35954b(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('scanPath')) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user