Skip to content

Commit 2f1bccf

Browse files
TomasLudvikTomasLudvik
authored
Adapt to doctrine/orm 3.7 with SortDirection enum ordering (#4827)
2 parents 77422b5 + d994097 commit 2f1bccf

8 files changed

Lines changed: 33 additions & 25 deletions

File tree

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"symfony/http-foundation": "^7.4",
4545
"symfony/http-kernel": "^7.4",
4646
"symfony/clock": "^7.4",
47+
"symfony/polyfill-php86": "^1.37.0",
4748
"symfony/security-core": "^7.4",
4849
"symfony/security-http": "^7.4",
4950
"symfony/routing": "^7.4",

‎src/Component/CustomerUploadedFile/CustomerUploadedFileApiRepository.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use Doctrine\ORM\EntityManagerInterface;
88
use Shopsys\FrameworkBundle\Component\CustomerUploadedFile\CustomerUploadedFile;
9+
use SortDirection;
910

1011
class CustomerUploadedFileApiRepository
1112
{
@@ -28,8 +29,8 @@ public function getAllCustomerUploadedFilesIndexedByEntityId(
2829
->createQueryBuilder('cuf')
2930
->andWhere('cuf.entityName = :entityName')->setParameter('entityName', $entityName)
3031
->andWhere('cuf.entityId IN (:entities)')->setParameter('entities', $entityIds)
31-
->addOrderBy('cuf.position', 'asc')
32-
->addOrderBy('cuf.id', 'asc');
32+
->addOrderBy('cuf.position', SortDirection::Ascending)
33+
->addOrderBy('cuf.id', SortDirection::Ascending);
3334

3435
if ($type === null) {
3536
$queryBuilder->andWhere('cuf.type IS NULL');

‎src/Component/Image/ImageApiRepository.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Doctrine\ORM\Query\ResultSetMappingBuilder;
99
use Shopsys\FrameworkBundle\Component\EntityExtension\EntityNameResolver;
1010
use Shopsys\FrameworkBundle\Component\Image\Image;
11+
use SortDirection;
1112

1213
class ImageApiRepository
1314
{
@@ -72,8 +73,8 @@ public function getAllImagesIndexedByEntityId(array $entityIds, string $entityNa
7273
->createQueryBuilder('i')
7374
->andWhere('i.entityName = :entityName')->setParameter('entityName', $entityName)
7475
->andWhere('i.entityId IN (:entities)')->setParameter('entities', $entityIds)
75-
->addOrderBy('i.position', 'asc')
76-
->addOrderBy('i.id', 'asc');
76+
->addOrderBy('i.position', SortDirection::Ascending)
77+
->addOrderBy('i.id', SortDirection::Ascending);
7778

7879
if ($type === null) {
7980
$queryBuilder->andWhere('i.type IS NULL');

‎src/Model/Complaint/ComplaintRepository.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Shopsys\FrameworkBundle\Model\Complaint\Complaint;
1111
use Shopsys\FrameworkBundle\Model\Customer\Customer;
1212
use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUser;
13+
use SortDirection;
1314

1415
class ComplaintRepository
1516
{
@@ -29,8 +30,8 @@ public function getCustomerUserComplaintsLimitedList(
2930
ComplaintFilter $filter,
3031
): array {
3132
$queryBuilder = $this->createCustomerUserComplaintsQueryBuilder($customerUser)
32-
->orderBy('c.createdAt', 'DESC')
33-
->addOrderBy('c.id', 'DESC')
33+
->orderBy('c.createdAt', SortDirection::Descending)
34+
->addOrderBy('c.id', SortDirection::Descending)
3435
->setMaxResults($limit)
3536
->setFirstResult($offset);
3637

@@ -49,8 +50,8 @@ public function getCustomerComplaintsLimitedList(
4950
ComplaintFilter $filter,
5051
): array {
5152
$queryBuilder = $this->createCustomerComplaintsQueryBuilder($customer)
52-
->orderBy('c.createdAt', 'DESC')
53-
->addOrderBy('c.id', 'DESC')
53+
->orderBy('c.createdAt', SortDirection::Descending)
54+
->addOrderBy('c.id', SortDirection::Descending)
5455
->setMaxResults($limit)
5556
->setFirstResult($offset);
5657

‎src/Model/Customer/User/LoginType/CustomerUserLoginTypeRepository.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Doctrine\ORM\EntityManagerInterface;
88
use Doctrine\ORM\QueryBuilder;
99
use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUser;
10+
use SortDirection;
1011

1112
class CustomerUserLoginTypeRepository
1213
{
@@ -57,7 +58,7 @@ protected function getOrderedCustomerUserLoginTypeQueryBuilder(
5758
->createQueryBuilder('cult')
5859
->where('cult.customerUser = :customerUser')
5960
->setParameter('customerUser', $customerUser)
60-
->orderBy('cult.lastLoggedInAt', 'DESC');
61+
->orderBy('cult.lastLoggedInAt', SortDirection::Descending);
6162

6263
if ($excludeType !== null) {
6364
$queryBuilder

‎src/Model/Order/OrderItemApiFacade.php‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Shopsys\FrameworkBundle\Model\Order\Item\OrderItemTypeEnum;
1414
use Shopsys\FrameworkBundle\Model\Order\Withdrawal\WithdrawalRequest;
1515
use Shopsys\FrameworkBundle\Model\Product\Product;
16+
use SortDirection;
1617

1718
class OrderItemApiFacade
1819
{
@@ -73,8 +74,8 @@ protected function createNewestReviewableOrderItemQueryBuilder(Product $product,
7374
->andWhere('os.productReviewsAllowed = TRUE')
7475
->andWhere('oi.product = :product')
7576
->setParameter('product', $product)
76-
->orderBy('o.createdAt', 'DESC')
77-
->addOrderBy('oi.id', 'DESC')
77+
->orderBy('o.createdAt', SortDirection::Descending)
78+
->addOrderBy('oi.id', SortDirection::Descending)
7879
->setMaxResults(1);
7980
}
8081

@@ -110,8 +111,8 @@ public function getCustomerUserOrderItemsLimitedList(
110111
OrderItemsFilter $filter,
111112
): array {
112113
return $this->createCustomerUserOrderItemsLimitedListQueryBuilder($customerUser, $filter)
113-
->orderBy('o.createdAt', 'DESC')
114-
->addOrderBy('oi.id', 'DESC')
114+
->orderBy('o.createdAt', SortDirection::Descending)
115+
->addOrderBy('oi.id', SortDirection::Descending)
115116
->setMaxResults($limit)
116117
->setFirstResult($offset)
117118
->getQuery()
@@ -140,8 +141,8 @@ public function getCustomerOrderItemsLimitedList(
140141
$queryBuilder = $this->createCustomerOrderItemsLimitedListQueryBuilder($customer, $filter);
141142

142143
return $queryBuilder
143-
->orderBy('o.createdAt', 'DESC')
144-
->addOrderBy('oi.id', 'DESC')
144+
->orderBy('o.createdAt', SortDirection::Descending)
145+
->addOrderBy('oi.id', SortDirection::Descending)
145146
->setMaxResults($limit)
146147
->setFirstResult($offset)
147148
->getQuery()
@@ -169,8 +170,8 @@ public function getCustomerUserOrderItemsLimitedSearchList(
169170
OrderItemsFilter $filter,
170171
): array {
171172
return $this->createCustomerUserOrderItemsLimitedSearchListQueryBuilder($customerUser, $search, $filter)
172-
->orderBy('o.createdAt', 'DESC')
173-
->addOrderBy('oi.id', 'DESC')
173+
->orderBy('o.createdAt', SortDirection::Descending)
174+
->addOrderBy('oi.id', SortDirection::Descending)
174175
->setMaxResults($limit)
175176
->setFirstResult($offset)
176177
->getQuery()
@@ -199,8 +200,8 @@ public function getCustomerOrderItemsLimitedSearchList(
199200
OrderItemsFilter $filter,
200201
): array {
201202
return $this->createCustomerOrderItemsLimitedSearchListQueryBuilder($customer, $search, $filter)
202-
->orderBy('o.createdAt', 'DESC')
203-
->addOrderBy('oi.id', 'DESC')
203+
->orderBy('o.createdAt', SortDirection::Descending)
204+
->addOrderBy('oi.id', SortDirection::Descending)
204205
->setMaxResults($limit)
205206
->setFirstResult($offset)
206207
->getQuery()

‎src/Model/Order/OrderRepository.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUser;
1212
use Shopsys\FrameworkBundle\Model\Order\Order;
1313
use Shopsys\FrontendApiBundle\Model\Resolver\Order\Exception\OrderNotFoundUserError;
14+
use SortDirection;
1415

1516
class OrderRepository
1617
{
@@ -69,7 +70,7 @@ public function getCustomerUserOrderLimitedList(
6970
}
7071

7172
return $queryBuilder
72-
->orderBy('o.createdAt', 'DESC')
73+
->orderBy('o.createdAt', SortDirection::Descending)
7374
->setFirstResult($offset)
7475
->setMaxResults($limit)
7576
->getQuery()
@@ -141,8 +142,8 @@ public function getCustomerOrderLimitedList(
141142
$queryBuilder = $this->createOrderQueryBuilder()
142143
->andWhere('o.customer = :customer')
143144
->setParameter('customer', $customer)
144-
->orderBy('o.createdAt', 'DESC')
145-
->addOrderBy('o.id', 'DESC')
145+
->orderBy('o.createdAt', SortDirection::Descending)
146+
->addOrderBy('o.id', SortDirection::Descending)
146147
->setFirstResult($offset)
147148
->setMaxResults($limit);
148149

‎src/Model/Store/StoreRepository.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Shopsys\FrameworkBundle\Component\String\DatabaseSearchingHelper;
1010
use Shopsys\FrameworkBundle\Model\Store\OpeningHours\StoreOpeningHoursProvider;
1111
use Shopsys\FrameworkBundle\Model\Store\Store;
12+
use SortDirection;
1213

1314
class StoreRepository
1415
{
@@ -52,7 +53,7 @@ public function findStoreCoordinatesBySearchText(int $domainId, string $searchTe
5253
->select('s.latitude AS latitude, s.longitude AS longitude')
5354
->andWhere('s.latitude IS NOT NULL')
5455
->andWhere('s.longitude IS NOT NULL')
55-
->orderBy('s.position, s.id', 'ASC')
56+
->orderBy('s.position, s.id', SortDirection::Ascending)
5657
->setMaxResults(1);
5758

5859
/** @var array{latitude: string|null, longitude: string|null}|null $coordinates */
@@ -92,15 +93,15 @@ public function getFilteredQueryBuilder(
9293
?int $offset = null,
9394
): array {
9495
$queryBuilder = $this->getBasicFilteredQueryBuilder($domainId, $storesFilterOptions);
95-
$queryBuilder->orderBy('s.position, s.id', 'ASC');
96+
$queryBuilder->orderBy('s.position, s.id', SortDirection::Ascending);
9697

9798
if ($storesFilterOptions->getCoordinates() !== null) {
9899
$coordinates = $storesFilterOptions->getCoordinates();
99100

100101
$queryBuilder->addSelect('DISTANCE(s.latitude, s.longitude, :latitude, :longitude) AS distance')
101102
->setParameter('latitude', (float)$coordinates['latitude'])
102103
->setParameter('longitude', (float)$coordinates['longitude'])
103-
->orderBy('distance', 'ASC');
104+
->orderBy('distance', SortDirection::Ascending);
104105
}
105106

106107
if ($limit !== null) {

0 commit comments

Comments
 (0)