Skip to content

Commit 4e05cbb

Browse files
authored
Remove deprecations (#144)
1 parent 0ae6227 commit 4e05cbb

13 files changed

+61
-5
lines changed

src/Rector/Assign/CallOnAppArrayAccessToStandaloneAssignRector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PhpParser\Node\Stmt\Nop;
1515
use PHPStan\Type\ObjectType;
1616
use Rector\Comments\NodeDocBlock\DocBlockUpdater;
17+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
1718
use Rector\Core\Rector\AbstractRector;
1819
use RectorLaravel\NodeFactory\AppAssignFactory;
1920
use RectorLaravel\ValueObject\ServiceNameTypeAndVariableName;
@@ -33,6 +34,7 @@ final class CallOnAppArrayAccessToStandaloneAssignRector extends AbstractRector
3334
public function __construct(
3435
private readonly AppAssignFactory $appAssignFactory,
3536
private readonly DocBlockUpdater $docBlockUpdater,
37+
private readonly ValueResolver $valueResolver,
3638
) {
3739
$this->serviceNameTypeAndVariableNames[] = new ServiceNameTypeAndVariableName(
3840
'validator',

src/Rector/ClassMethod/AddGenericReturnTypeToRelationsRector.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
use PHPStan\Type\Generic\GenericClassStringType;
1818
use PHPStan\Type\Generic\GenericObjectType;
1919
use PHPStan\Type\ObjectType;
20+
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
2021
use Rector\BetterPhpDocParser\ValueObject\Type\FullyQualifiedIdentifierTypeNode;
2122
use Rector\Comments\NodeDocBlock\DocBlockUpdater;
23+
use Rector\Core\PhpParser\Node\BetterNodeFinder;
2224
use Rector\Core\Rector\AbstractScopeAwareRector;
2325
use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
2426
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -41,6 +43,8 @@ class AddGenericReturnTypeToRelationsRector extends AbstractScopeAwareRector
4143
public function __construct(
4244
private readonly TypeComparator $typeComparator,
4345
private readonly DocBlockUpdater $docBlockUpdater,
46+
private readonly PhpDocInfoFactory $phpDocInfoFactory,
47+
private readonly BetterNodeFinder $betterNodeFinder,
4448
) {
4549
}
4650

src/Rector/ClassMethod/MigrateToSimplifiedAttributeRector.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,19 @@
2323
use PhpParser\Node\Stmt\Return_;
2424
use PhpParser\NodeTraverser;
2525
use PHPStan\Type\ObjectType;
26+
use Rector\Core\PhpParser\Node\BetterNodeFinder;
2627
use Rector\Core\Rector\AbstractRector;
2728
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
2829
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
2930

3031
/** @see \RectorLaravel\Tests\Rector\ClassMethod\MigrateToSimplifiedAttributeRector\MigrateToSimplifiedAttributeRectorTest */
3132
final class MigrateToSimplifiedAttributeRector extends AbstractRector
3233
{
34+
public function __construct(
35+
private readonly BetterNodeFinder $betterNodeFinder
36+
) {
37+
}
38+
3339
/**
3440
* @return array<class-string<Node>>
3541
*/

src/Rector/Class_/AddExtendsAnnotationToModelFactoriesRector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
1515
use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
1616
use PHPStan\Type\ObjectType;
17+
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
1718
use Rector\BetterPhpDocParser\ValueObject\Type\FullyQualifiedIdentifierTypeNode;
1819
use Rector\Comments\NodeDocBlock\DocBlockUpdater;
1920
use Rector\Core\Rector\AbstractRector;
@@ -33,6 +34,7 @@ final class AddExtendsAnnotationToModelFactoriesRector extends AbstractRector
3334

3435
public function __construct(
3536
private readonly DocBlockUpdater $docBlockUpdater,
37+
private readonly PhpDocInfoFactory $phpDocInfoFactory,
3638
) {
3739
}
3840

src/Rector/Class_/AddMockConsoleOutputFalseToConsoleTestsRector.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
use PHPStan\Type\ObjectType;
1717
use Rector\Core\Enum\ObjectReference;
1818
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
19+
use Rector\Core\PhpParser\Node\BetterNodeFinder;
20+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
1921
use Rector\Core\Rector\AbstractRector;
2022
use Rector\Core\ValueObject\MethodName;
2123
use Rector\PHPUnit\NodeAnalyzer\SetUpMethodDecorator;
@@ -34,7 +36,9 @@ final class AddMockConsoleOutputFalseToConsoleTestsRector extends AbstractRector
3436
public function __construct(
3537
private readonly PropertyFetchAnalyzer $propertyFetchAnalyzer,
3638
private readonly SetUpMethodDecorator $setUpMethodDecorator,
37-
private readonly VisibilityManipulator $visibilityManipulator
39+
private readonly VisibilityManipulator $visibilityManipulator,
40+
private readonly BetterNodeFinder $betterNodeFinder,
41+
private readonly ValueResolver $valueResolver,
3842
) {
3943
}
4044

src/Rector/Class_/PropertyDeferToDeferrableProviderToRector.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use PhpParser\Node\Stmt\Class_;
1111
use PhpParser\Node\Stmt\Property;
1212
use PHPStan\Type\ObjectType;
13+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
1314
use Rector\Core\Rector\AbstractRector;
1415
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1516
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -21,6 +22,11 @@
2122
*/
2223
final class PropertyDeferToDeferrableProviderToRector extends AbstractRector
2324
{
25+
public function __construct(
26+
private readonly ValueResolver $valueResolver,
27+
) {
28+
}
29+
2430
public function getRuleDefinition(): RuleDefinition
2531
{
2632
return new RuleDefinition(

src/Rector/Class_/UnifyModelDatesWithCastsRector.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
use PhpParser\Node\Stmt\Class_;
1212
use PhpParser\Node\Stmt\Property;
1313
use PHPStan\Type\ObjectType;
14+
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
1415
use Rector\Core\NodeManipulator\ClassInsertManipulator;
16+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
1517
use Rector\Core\Rector\AbstractRector;
1618
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1719
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -25,7 +27,9 @@
2527
final class UnifyModelDatesWithCastsRector extends AbstractRector
2628
{
2729
public function __construct(
28-
private readonly ClassInsertManipulator $classInsertManipulator
30+
private readonly ClassInsertManipulator $classInsertManipulator,
31+
private readonly ValueResolver $valueResolver,
32+
private readonly PhpDocInfoFactory $phpDocInfoFactory,
2933
) {
3034
}
3135

src/Rector/Expr/SubStrToStartsWithOrEndsWithStaticMethodCallRector/SubStrToStartsWithOrEndsWithStaticMethodCallRector.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use PhpParser\Node\Expr\BinaryOp\Identical;
1111
use PhpParser\Node\Expr\FuncCall;
1212
use PhpParser\Node\Expr\StaticCall;
13+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
1314
use Rector\Core\Rector\AbstractRector;
1415
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1516
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -19,6 +20,11 @@
1920
*/
2021
class SubStrToStartsWithOrEndsWithStaticMethodCallRector extends AbstractRector
2122
{
23+
public function __construct(
24+
private readonly ValueResolver $valueResolver,
25+
) {
26+
}
27+
2228
public function getRuleDefinition(): RuleDefinition
2329
{
2430
return new RuleDefinition('Use Str::startsWith() or Str::endsWith() instead of substr() === $str', [

src/Rector/MethodCall/ChangeQueryWhereDateValueWithCarbonRector.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PhpParser\Node\Scalar\String_;
1515
use PhpParser\Node\Stmt\Expression;
1616
use PHPStan\Type\ObjectType;
17+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
1718
use Rector\Core\Rector\AbstractRector;
1819
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1920
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -26,6 +27,11 @@
2627
*/
2728
final class ChangeQueryWhereDateValueWithCarbonRector extends AbstractRector
2829
{
30+
public function __construct(
31+
private readonly ValueResolver $valueResolver,
32+
) {
33+
}
34+
2935
public function getRuleDefinition(): RuleDefinition
3036
{
3137
return new RuleDefinition(

src/Rector/MethodCall/FactoryApplyingStatesRector.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use PhpParser\Node\Expr\MethodCall;
1111
use PhpParser\Node\VariadicPlaceholder;
1212
use PHPStan\Type\ObjectType;
13+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
1314
use Rector\Core\Rector\AbstractRector;
1415
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1516
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -23,6 +24,11 @@
2324
*/
2425
final class FactoryApplyingStatesRector extends AbstractRector
2526
{
27+
public function __construct(
28+
private readonly ValueResolver $valueResolver,
29+
) {
30+
}
31+
2632
public function getRuleDefinition(): RuleDefinition
2733
{
2834
return new RuleDefinition('Call the state methods directly instead of specify the name of state.', [

src/Rector/PropertyFetch/OptionalToNullsafeOperatorRector.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use PhpParser\Node\Expr\PropertyFetch;
1818
use PhpParser\Node\Scalar;
1919
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
20+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
2021
use Rector\Core\Rector\AbstractRector;
2122
use Rector\Core\ValueObject\PhpVersion;
2223
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -48,6 +49,11 @@ final class OptionalToNullsafeOperatorRector extends AbstractRector implements M
4849
*/
4950
private array $excludeMethods = [];
5051

52+
public function __construct(
53+
private readonly ValueResolver $valueResolver,
54+
) {
55+
}
56+
5157
public function getRuleDefinition(): RuleDefinition
5258
{
5359
return new RuleDefinition(

src/Rector/StaticCall/Redirect301ToPermanentRedirectRector.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use PhpParser\Node\Expr\StaticCall;
1010
use PhpParser\Node\Identifier;
1111
use PHPStan\Type\ObjectType;
12+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
1213
use Rector\Core\Rector\AbstractRector;
1314
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
1415
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -24,8 +25,9 @@ final class Redirect301ToPermanentRedirectRector extends AbstractRector
2425
*/
2526
private array $routerObjectTypes = [];
2627

27-
public function __construct()
28-
{
28+
public function __construct(
29+
private readonly ValueResolver $valueResolver,
30+
) {
2931
$this->routerObjectTypes = [
3032
new ObjectType('Illuminate\Support\Facades\Route'),
3133
new ObjectType('Illuminate\Routing\Route'),

src/Rector/StaticCall/RouteActionCallableRector.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use PHPStan\Analyser\Scope;
1717
use PHPStan\Reflection\Php\PhpMethodReflection;
1818
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
19+
use Rector\Core\PhpParser\Node\Value\ValueResolver;
1920
use Rector\Core\Rector\AbstractRector;
2021
use Rector\Core\Reflection\ReflectionResolver;
2122
use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -55,7 +56,8 @@ final class RouteActionCallableRector extends AbstractRector implements Configur
5556

5657
public function __construct(
5758
private readonly ReflectionResolver $reflectionResolver,
58-
private readonly RouterRegisterNodeAnalyzer $routerRegisterNodeAnalyzer
59+
private readonly RouterRegisterNodeAnalyzer $routerRegisterNodeAnalyzer,
60+
private readonly ValueResolver $valueResolver,
5961
) {
6062
}
6163

0 commit comments

Comments
 (0)