-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor the OrderByKeyToClassConstRector to use the new enum only in…
… Criteria::orderBy method call, and remove usage of Criteria::ASC and Criteria::DESC where not recommended Relates to: - doctrine/collections#389; - doctrine/orm#11313 (comment)
- Loading branch information
1 parent
3ba7adb
commit b41f96c
Showing
22 changed files
with
400 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
...erty/OrderByKeyToClassConstRector/Fixture/criteria_aliased_to_order_mixed_content.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria as SomeAliasedCriteria; | ||
|
||
$crit = new SomeAliasedCriteria(); | ||
$crit->orderBy(['param1' => \Doctrine\Common\Collections\Order::Ascending, 'param2' => SomeAliasedCriteria::DESC, 'param3' => 'asc']); | ||
|
||
?> | ||
----- | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria as SomeAliasedCriteria; | ||
|
||
$crit = new SomeAliasedCriteria(); | ||
$crit->orderBy(['param1' => \Doctrine\Common\Collections\Order::Ascending, 'param2' => \Doctrine\Common\Collections\Order::Descending, 'param3' => \Doctrine\Common\Collections\Order::Ascending]); | ||
|
||
?> |
17 changes: 17 additions & 0 deletions
17
...rty/OrderByKeyToClassConstRector/Fixture/criteria_to_order_from_constant_criteria.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$criteria = new Criteria(); | ||
$criteria->orderBy(['asc' => Criteria::ASC, 'desc' => Criteria::DESC]); | ||
|
||
?> | ||
----- | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$criteria = new Criteria(); | ||
$criteria->orderBy(['asc' => \Doctrine\Common\Collections\Order::Ascending, 'desc' => \Doctrine\Common\Collections\Order::Descending]); | ||
|
||
?> |
17 changes: 17 additions & 0 deletions
17
...Property/OrderByKeyToClassConstRector/Fixture/criteria_to_order_from_string_lower.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$criteria = new Criteria(); | ||
$criteria->orderBy(['asc' => 'asc', 'desc' => 'desc']); | ||
|
||
?> | ||
----- | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$criteria = new Criteria(); | ||
$criteria->orderBy(['asc' => \Doctrine\Common\Collections\Order::Ascending, 'desc' => \Doctrine\Common\Collections\Order::Descending]); | ||
|
||
?> |
17 changes: 17 additions & 0 deletions
17
...Property/OrderByKeyToClassConstRector/Fixture/criteria_to_order_from_string_upper.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$criteria = new Criteria(); | ||
$criteria->orderBy(['asc' => 'ASC', 'desc' => 'DESC']); | ||
|
||
?> | ||
----- | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$criteria = new Criteria(); | ||
$criteria->orderBy(['asc' => \Doctrine\Common\Collections\Order::Ascending, 'desc' => \Doctrine\Common\Collections\Order::Descending]); | ||
|
||
?> |
17 changes: 17 additions & 0 deletions
17
...tor/Property/OrderByKeyToClassConstRector/Fixture/criteria_to_order_mixed_content.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$criteria = new Criteria(); | ||
$criteria->orderBy(['param1' => \Doctrine\Common\Collections\Order::Ascending, 'param2' => Criteria::DESC, 'param3' => 'asc']); | ||
|
||
?> | ||
----- | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$criteria = new Criteria(); | ||
$criteria->orderBy(['param1' => \Doctrine\Common\Collections\Order::Ascending, 'param2' => \Doctrine\Common\Collections\Order::Descending, 'param3' => \Doctrine\Common\Collections\Order::Ascending]); | ||
|
||
?> |
15 changes: 15 additions & 0 deletions
15
...nstRector/Fixture/replace_class_constant_by_string_where_not_in_criteria_order_by.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$query->addOrderBy('someParameter', Criteria::ASC); | ||
|
||
?> | ||
----- | ||
<?php | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
|
||
$query->addOrderBy('someParameter', 'ASC'); | ||
|
||
?> |
25 changes: 0 additions & 25 deletions
25
...derByKeyToClassConstRector/Fixture/replace_order_by_asc_lower_with_class_constant.php.inc
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
...rty/OrderByKeyToClassConstRector/Fixture/replace_order_by_asc_with_class_constant.php.inc
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
...ty/OrderByKeyToClassConstRector/Fixture/replace_order_by_desc_with_class_constant.php.inc
This file was deleted.
Oops, something went wrong.
11 changes: 3 additions & 8 deletions
11
...ity/Rector/Property/OrderByKeyToClassConstRector/Fixture/skip_already_using_const.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,8 @@ | ||
<?php | ||
|
||
namespace Rector\Doctrine\Tests\CodeQuality\Rector\Property\OrderByKeyToClassConstRector\Fixture; | ||
|
||
use Doctrine\Common\Collections\Criteria; | ||
use Doctrine\ORM\Mapping as ORM; | ||
|
||
class SkipAlreadyUsingConst | ||
{ | ||
#[ORM\OrderBy(['createdAt' => Criteria::ASC])] | ||
protected \DateTimeInterface $messages; | ||
} | ||
$criteria = new Criteria(); | ||
$criteria->orderBy(['asc' => \Doctrine\Common\Collections\Order::Ascending, 'desc' => \Doctrine\Common\Collections\Order::Descending]); | ||
|
||
?> |
7 changes: 7 additions & 0 deletions
7
...yToClassConstRector/Fixture/skip_class_constant_ASC_where_not_related_to_criteria.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?php | ||
|
||
use SomeClass; | ||
|
||
$query->addOrderBy('someParameter', SomeClass::ASC); | ||
|
||
?> |
6 changes: 6 additions & 0 deletions
6
...ector/Property/OrderByKeyToClassConstRector/Fixture/skip_order_by_not_on_criteria.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<?php | ||
|
||
$object = new SomeClass(); | ||
$object->orderBy(['someType' => 'ASC']); | ||
|
||
?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
...eringConstantsDeprecations/Fixture/replace_order_by_asc_lower_with_class_constant.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?php | ||
|
||
namespace Rector\Doctrine\Tests\Collection22\Rector\CriteriaOrderingConstantsDeprecations\Fixture; | ||
|
||
use Doctrine\ORM\Mapping as ORM; | ||
|
||
class ReplaceOrderByAscWithClassConstant | ||
{ | ||
#[ORM\OrderBy(['createdAt' => 'asc'])] | ||
protected \DateTimeInterface $messages; | ||
} | ||
?> |
12 changes: 12 additions & 0 deletions
12
...riaOrderingConstantsDeprecations/Fixture/replace_order_by_asc_with_class_constant.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?php | ||
|
||
namespace Rector\Doctrine\Tests\Collection22\Rector\CriteriaOrderingConstantsDeprecations\Fixture; | ||
|
||
use Doctrine\ORM\Mapping as ORM; | ||
|
||
class ReplaceOrderByAscWithClassConstant | ||
{ | ||
#[ORM\OrderBy(['createdAt' => 'ASC'])] | ||
protected \DateTimeInterface $messages; | ||
} | ||
?> |
12 changes: 12 additions & 0 deletions
12
...iaOrderingConstantsDeprecations/Fixture/replace_order_by_desc_with_class_constant.php.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?php | ||
|
||
namespace Rector\Doctrine\Tests\Collection22\Rector\CriteriaOrderingConstantsDeprecations\Fixture; | ||
|
||
use Doctrine\ORM\Mapping as ORM; | ||
|
||
class ReplaceOrderByAscWithClassConstant | ||
{ | ||
#[ORM\OrderBy(['createdAt' => 'desc'])] | ||
protected \DateTimeInterface $messages; | ||
} | ||
?> |
Oops, something went wrong.