Skip to content

Remove min php version from OptionalParametersAfterRequiredRector #1814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 15, 2022
Merged

Remove min php version from OptionalParametersAfterRequiredRector #1814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c63ec36
Remove min php version from `OptionalParametersAfterRequiredRector`
leighman Feb 14, 2022
f77dec9
Move to `CodeQuality` namespace
leighman Feb 14, 2022
7b79132
Update sets
leighman Feb 14, 2022
9f4fb61
Re-instate rule for php80 set
leighman Feb 15, 2022
6880058
Remove from `code-quality` set
leighman Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/set/php80.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
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;
Expand Down
4 changes: 2 additions & 2 deletions ...fterRequiredRector/Fixture/mashup.php.inc → ...fterRequiredRector/Fixture/mashup.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

class Mashup
{
Expand All @@ -13,7 +13,7 @@ class Mashup
-----
<?php

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

class Mashup
{
Expand Down
4 changes: 2 additions & 2 deletions ...ector/Fixture/new_the_constructor.php.inc → ...ector/Fixture/new_the_constructor.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

final class NewTheConstructor
{
Expand All @@ -22,7 +22,7 @@ final class NewTheConstructor

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

final class NewTheConstructor
{
Expand Down
2 changes: 1 addition & 1 deletion ...Rector/Fixture/skip_correct_order.php.inc → ...Rector/Fixture/skip_correct_order.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

final class SkipCorrectOrder
{
Expand Down
15 changes: 15 additions & 0 deletions ...ector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/skip_external_new.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

declare(strict_types=1);

namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

use Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Source\vendor\SomeOutsideClass;

final class SkipExternalNew
{
public function create()
{
return new SomeOutsideClass(1, 5);
}
}
2 changes: 1 addition & 1 deletion ...Rector/Fixture/skip_func_get_args.php.inc → ...Rector/Fixture/skip_func_get_args.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

final class SkipFuncGetArgs
{
Expand Down
10 changes: 10 additions & 0 deletions ...y/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/skip_no_params.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

final class SkipNoParams
{
public function run()
{
}
}
25 changes: 25 additions & 0 deletions ...lity/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/some_object.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

class SomeObject
{
public function run($optional = 1, $required)
{
}
}

?>
-----
<?php

namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

class SomeObject
{
public function run($required, $optional = 1)
{
}
}

?>
0 ...at_variadic_parameter_as_optional.php.inc → ...at_variadic_parameter_as_optional.php.inc
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...Rector/Fixture/update_method_call.php.inc → ...Rector/Fixture/update_method_call.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

final class UpdateMethodCall
{
Expand All @@ -22,7 +22,7 @@ final class UpdateMethodCall

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

final class UpdateMethodCall
{
Expand Down
4 changes: 2 additions & 2 deletions ...tor/Fixture/uses_with_less_params.php.inc → ...tor/Fixture/uses_with_less_params.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

final class UsesWithLess
{
Expand All @@ -23,7 +23,7 @@ final class UsesWithLess

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;

final class UsesWithLess
{
Expand Down
2 changes: 1 addition & 1 deletion ...onalParametersAfterRequiredRectorTest.php → ...onalParametersAfterRequiredRectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;

use Iterator;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
Expand Down
2 changes: 1 addition & 1 deletion ...Rector/Source/vendor/SomeOutsideClass.php → ...Rector/Source/vendor/SomeOutsideClass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Tests\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Source\vendor;
namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Source\vendor;

final class SomeOutsideClass
{
Expand Down
2 changes: 1 addition & 1 deletion ...RequiredRector/config/configured_rule.php → ...RequiredRector/config/configured_rule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

use Rector\Php80\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
Expand Down
15 changes: 0 additions & 15 deletions ...ector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/skip_external_new.php.inc
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions ...0/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/skip_no_params.php.inc
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions ...hp80/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/some_object.php.inc
View file
Open in desktop

This file was deleted.

12 changes: 3 additions & 9 deletions ...OptionalParametersAfterRequiredRector.php → ...OptionalParametersAfterRequiredRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Php80\Rector\ClassMethod;
namespace Rector\CodeQuality\Rector\ClassMethod;

use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
Expand All @@ -16,16 +16,15 @@
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 AbstractRector implements MinPhpVersionInterface
final class OptionalParametersAfterRequiredRector extends AbstractRector
{
/**
* @var string
Expand All @@ -40,11 +39,6 @@ public function __construct(
) {
}

public function provideMinPhpVersion(): int
{
return PhpVersionFeature::DEPRECATE_REQUIRED_PARAMETER_AFTER_OPTIONAL;
}

public function getRuleDefinition(): RuleDefinition
{
return new RuleDefinition('Move required parameters after optional ones', [
Expand Down