Skip to content

Make ConvertStaticPrivateConstantToSelfRector work for non-final classes, make part of code-quality set #4114

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
TomasVotruba merged 3 commits into from
Jun 8, 2023
Merged

Make ConvertStaticPrivateConstantToSelfRector work for non-final classes, make part of code-quality set #4114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be5c552
remove deprecated rule interface, as unused
TomasVotruba Jun 8, 2023
f883994
Make ConvertStaticPrivateConstantToSelfRector work for non-final clas…
TomasVotruba Jun 8, 2023
9d5506e
make ConvertStaticPrivateConstantToSelfRector part of code-quality set
TomasVotruba Jun 8, 2023
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: 2 additions & 0 deletions config/set/code-quality.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Rector\CodeQuality\Rector\Catch_\ThrowWithPreviousExceptionRector;
use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
use Rector\CodeQuality\Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector;
use Rector\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector;
use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
use Rector\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
Expand Down Expand Up @@ -186,5 +187,6 @@
SwitchTrueToIfRector::class,
CleanupUnneededNullsafeOperatorRector::class,
DisallowedEmptyRuleFixerRector::class,
ConvertStaticPrivateConstantToSelfRector::class,
]);
};
28 changes: 0 additions & 28 deletions ...teConstantToSelfRector/ConvertStaticPrivateConstantToSelfRectorForNonFinalClassesTest.php
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...stant-with-static-should-use-self.php.inc → ...ector/Fixture/change-in-non-final.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Utils\Rector\Tests\Rector\UseDateTimeImmutableRector\Fixture;
namespace Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;

final class Foo
class Foo
{
private const BAR = 1;
public function baz(): void
Expand All @@ -14,9 +14,9 @@ final class Foo
-----
<?php

namespace Utils\Rector\Tests\Rector\UseDateTimeImmutableRector\Fixture;
namespace Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;

final class Foo
class Foo
{
private const BAR = 1;
public function baz(): void
Expand Down
16 changes: 0 additions & 16 deletions ...tantToSelfRector/Fixture/const-in-class-with-final-annotation-will-not-be-changed.php.inc
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ...cPrivateConstantToSelfRector/Fixture/const-in-non-final-class-will-not-be-changed.php.inc
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...cPrivateConstantToSelfRector/Fixture/constants-from-other-classes-are-not-changed.php.inc
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ...rivateConstantToSelfRector/Fixture/private-constant-with-self-will-not-be-changed.php.inc
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions ...tch/ConvertStaticPrivateConstantToSelfRector/Fixture/private-constant-with-static.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

namespace Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;

final class PrivateConstantWithStatic
{
private const BAR = 1;

public function baz(): void
{
echo static::BAR;
}
}

?>
-----
<?php

namespace Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;

final class PrivateConstantWithStatic
{
private const BAR = 1;

public function baz(): void
{
echo self::BAR;
}
}

?>
4 changes: 2 additions & 2 deletions ...Fetch/ConvertStaticPrivateConstantToSelfRector/Fixture/replace-in-private-methods.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Utils\Rector\Tests\Rector\UseDateTimeImmutableRector\Fixture;
namespace Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;

class Foo
{
Expand All @@ -14,7 +14,7 @@ class Foo
-----
<?php

namespace Utils\Rector\Tests\Rector\UseDateTimeImmutableRector\Fixture;
namespace Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;

class Foo
{
Expand Down
13 changes: 13 additions & 0 deletions ...lassConstFetch/ConvertStaticPrivateConstantToSelfRector/Fixture/skip-already-self.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

namespace Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;

final class SkipAlreadySelf
{
private const BAR = 1;

public function baz(): void
{
echo self::BAR;
}
}
11 changes: 11 additions & 0 deletions ...h/ConvertStaticPrivateConstantToSelfRector/Fixture/skip-constant-from-other-class.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;

final class SkipConstantFromOtherClass
{
public function run(): void
{
echo \DateTimeInterface::ATOM;
}
}
7 changes: 4 additions & 3 deletions ...ther-visibilities-are-not-changed.php.inc → ...tor/Fixture/skip-other-visibility.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<?php

namespace Utils\Rector\Tests\Rector\UseDateTimeImmutableRector\Fixture;
namespace Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector\Fixture;

final class Foo
final class SkipOtherVisibility
{
protected const BAR = 1;

public const BAZ = 1;

public function run(): void
{
echo static::BAR;
echo static::BAZ;
}
}
?>
18 changes: 0 additions & 18 deletions ...tureEnableForNonFinalClasses/do-not-replace-if-used-in-child-classes-as-protected.php.inc
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions ...FixtureEnableForNonFinalClasses/do-not-replace-if-used-in-child-classes-as-public.php.inc
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions ...ToSelfRector/FixtureEnableForNonFinalClasses/replace-if-not-used-in-child-classes.php.inc
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...ssConstFetch/ConvertStaticPrivateConstantToSelfRector/config/config_non_final_classes.php
View file
Open in desktop

This file was deleted.

Loading