update tests for php8.1 and code style

OXID-eSales · Dec 3, 2024 · d2066b5 · d2066b5
1 parent bc158cd
commit d2066b5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 24 deletions.
diff --git a/Tests/Codeception/Acceptance/AbortAndCancelPaymentCest.php b/Tests/Codeception/Acceptance/AbortAndCancelPaymentCest.php
@@ -61,7 +61,8 @@ public function testUserClicksBrowserBackOnPaypal(AcceptanceTester $I)
         // login page
         $I->makeScreenshot("before_back");
         $I->waitForElement($this->loginInput);
-        $I->amOnPage(Configuration::config()['modules']['config']['WebDriver']['url'] . $currentUrl);
+
+        $I->amOnPage($currentUrl);
         $templateString = Translator::translate('OSCUNZER_CANCEL_DURING_CHECKOUT');
         $I->wait(60);
         $I->makeScreenshot("after_back");

diff --git a/Tests/Integration/Model/PaymentTest.php b/Tests/Integration/Model/PaymentTest.php
@@ -7,7 +7,6 @@
 
 namespace OxidSolutionCatalysts\Unzer\Tests\Integration\Model;
 
-
 use OxidEsales\Eshop\Application\Model\Payment;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;

diff --git a/Tests/PhpStan/phpstan.neon b/Tests/PhpStan/phpstan.neon
@@ -13,3 +13,9 @@ parameters:
         - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::getUnzerInvoiceNr\(\)#'
         - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::setUnzerTransId\(\)#'
         - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Order::finalizeTmpOrder\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::canCollectFully\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::canCollectPartially\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::canRefundFully\(\)#'
+
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::canRevertPartially\(\)#'
+        - '#Call to an undefined method OxidEsales\\Eshop\\Application\\Model\\Payment::isUnzerSecuredPayment\(\)#'
diff --git a/Tests/Unit/Service/BasketPayableServiceTest.php b/Tests/Unit/Service/BasketPayableServiceTest.php
@@ -5,7 +5,6 @@
 use OxidEsales\Eshop\Application\Model\Payment;
 use OxidEsales\Eshop\Core\Registry;
 use OxidSolutionCatalysts\Unzer\Core\UnzerDefinitions as CoreUnzerDefinitions;
-
 use OxidEsales\Eshop\Application\Model\Basket;
 use OxidSolutionCatalysts\Unzer\Service\BasketPayableService;
 use PHPUnit\Framework\TestCase;

diff --git a/src/Controller/Admin/AdminOrderController.php b/src/Controller/Admin/AdminOrderController.php
@@ -453,42 +453,29 @@ public function isUnzerOrder(): bool
 
     public function canCollectFully(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
         return $this->oPayment->canCollectFully();
     }
+
     public function canCollectPartially(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
         return $this->oPayment->canCollectPartially();
     }
+
     public function canRefundFully(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
         return $this->oPayment->canRefundFully();
     }
+
     public function canRefundPartially(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
-        return $this->oPayment->canRefundPartially();
+        /** This is fix for phpStan */
+        /** @var \OxidSolutionCatalysts\Unzer\Model\Payment $payment */
+        $payment = $this->oPayment;
+        return $payment->canRefundPartially();
     }
+
     public function canRevertPartially(): bool
     {
-        if (!($this->oPayment instanceof Payment)) {
-            return false;
-        }
-
         return $this->oPayment->canRevertPartially();
     }