Minor style fixes

CommerceWeavers · Oct 31, 2024 · 2d659be · 2d659be
1 parent a5a4fa7
commit 2d659be
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/src/Model/GatewayConfigInterface.php b/src/Model/GatewayConfigInterface.php
diff --git a/src/Repository/FindByChannelWithGatewayConfigTrait.php b/src/Repository/FindByChannelWithGatewayConfigTrait.php
@@ -16,10 +16,9 @@ public function findByChannelAndGatewayConfigNameWithGatewayConfig(ChannelInterf
     {
         return $this->createQueryBuilder('o')
             ->addSelect('gatewayConfig')
-            ->leftJoin('o.gatewayConfig', 'gatewayConfig')
+            ->innerJoin('o.gatewayConfig', 'gatewayConfig', Join::WITH, 'gatewayConfig.gatewayName = :gatewayName')
             ->where('o.enabled = :enabled')
             ->andWhere(':channel MEMBER OF o.channels')
-            ->andWhere('gatewayConfig.gatewayName = :gatewayName')
             ->setParameter('enabled', true)
             ->setParameter('channel', $channel)
             ->setParameter('gatewayName', $gatewayConfigName)

diff --git a/src/Tpay/Provider/ValidTpayChannelListProvider.php b/src/Tpay/Provider/ValidTpayChannelListProvider.php
@@ -5,11 +5,12 @@
 namespace CommerceWeavers\SyliusTpayPlugin\Tpay\Provider;
 
 use App\Repository\PaymentMethodRepositoryInterface;
-use CommerceWeavers\SyliusTpayPlugin\Model\GatewayConfigInterface;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Exception\UnableToGetBankListException;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\PayGroup;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\PaymentType;
+use Payum\Core\Security\CryptedInterface;
 use Payum\Core\Security\CypherInterface;
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Webmozart\Assert\Assert;
@@ -39,7 +40,7 @@ public function provide(): array
         $paymentMethodsToRemoveByGroupId = [];
         $hasPblPaymentAvailable = false;
         foreach ($paymentMethods as $paymentMethod) {
-            /** @var GatewayConfigInterface|null $tpayGatewayConfig */
+            /** @var (GatewayConfigInterface&CryptedInterface)|null $tpayGatewayConfig */
             $tpayGatewayConfig = $paymentMethod->getGatewayConfig();
 
             if (null === $tpayGatewayConfig) {

diff --git a/tests/Unit/Tpay/Provider/ValidTpayChannelListProviderTest.php b/tests/Unit/Tpay/Provider/ValidTpayChannelListProviderTest.php
@@ -5,14 +5,14 @@
 namespace Tests\CommerceWeavers\SyliusTpayPlugin\Unit\Tpay\Provider;
 
 use App\Repository\PaymentMethodRepositoryInterface;
-use CommerceWeavers\SyliusTpayPlugin\Model\GatewayConfigInterface;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Exception\UnableToGetBankListException;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\AvailableTpayChannelListProviderInterface;
 use CommerceWeavers\SyliusTpayPlugin\Tpay\Provider\ValidTpayChannelListProvider;
 use Payum\Core\Security\CypherInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;