[Order] change logalization of findOneByTokenValue function

AdamKasp · AdamKasp · commit aaabf003311f · 2020-11-10T15:06:11.000+01:00
diff --git a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepository.php b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepository.php
@@ -419,4 +419,16 @@ public function findCartForSelectingPayment($id): ?OrderInterface
 
         return $order;
     }
+
+    public function findOneByTokenValue(string $tokenValue): ?OrderInterface
+    {
+        return $this->createQueryBuilder('o')
+            ->andWhere('o.state != :state')
+            ->andWhere('o.tokenValue = :tokenValue')
+            ->setParameter('state', OrderInterface::STATE_CART)
+            ->setParameter('tokenValue', $tokenValue)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
 }
diff --git a/src/Sylius/Bundle/OrderBundle/Doctrine/ORM/OrderRepository.php b/src/Sylius/Bundle/OrderBundle/Doctrine/ORM/OrderRepository.php
@@ -78,6 +78,7 @@ public function findOneByNumber(string $number): ?OrderInterface
         ;
     }
 
+    /** @deprecated since 1.9 and  will be removed in Sylius 2.0, use src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepository instead */
     public function findOneByTokenValue(string $tokenValue): ?OrderInterface
     {
         return $this->createQueryBuilder('o')
diff --git a/src/Sylius/Component/Core/Repository/OrderRepositoryInterface.php b/src/Sylius/Component/Core/Repository/OrderRepositoryInterface.php
@@ -81,4 +81,6 @@ public function findCartForAddressing($id): ?OrderInterface;
     public function findCartForSelectingShipping($id): ?OrderInterface;
 
     public function findCartForSelectingPayment($id): ?OrderInterface;
+
+    public function findOneByTokenValue(string $tokenValue): ?OrderInterface;
 }
diff --git a/src/Sylius/Component/Order/Repository/OrderRepositoryInterface.php b/src/Sylius/Component/Order/Repository/OrderRepositoryInterface.php
@@ -30,6 +30,7 @@ public function findLatestCart(): ?OrderInterface;
 
     public function findOneByNumber(string $number): ?OrderInterface;
 
+    /** @deprecated since 1.9 and  will be removed in Sylius 2.0, use src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepositoryInterface instead */
     public function findOneByTokenValue(string $tokenValue): ?OrderInterface;
 
     public function findCartByTokenValue(string $tokenValue): ?OrderInterface;

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ public function findOneByNumber(string $number): ?OrderInterface`
`78`	`78`	`;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+ /** @deprecated since 1.9 and will be removed in Sylius 2.0, use src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepository instead */`
`81`	`82`	`public function findOneByTokenValue(string $tokenValue): ?OrderInterface`
`82`	`83`	`{`
`83`	`84`	`return $this->createQueryBuilder('o')`
Original file line number	Diff line number	Diff line change
`@@ -81,4 +81,6 @@ public function findCartForAddressing($id): ?OrderInterface;`
`81`	`81`	`public function findCartForSelectingShipping($id): ?OrderInterface;`
`82`	`82`
`83`	`83`	`public function findCartForSelectingPayment($id): ?OrderInterface;`
	`84`	`+`
	`85`	`+ public function findOneByTokenValue(string $tokenValue): ?OrderInterface;`
`84`	`86`	`}`