Merge branch 'phpstan'

teambank · Aug 3, 2023 · f2f8be7 · f2f8be7
2 parents edad5f6 + 0089248
commit f2f8be7
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
     - 'main'
-    - 'automate'
+    - 'phpstan'
 
 jobs:
   ci-current:

diff --git a/src/Frontend/NetzkollektivEasyCredit/Api/Quote/ItemBuilder.php b/src/Frontend/NetzkollektivEasyCredit/Api/Quote/ItemBuilder.php
@@ -4,10 +4,8 @@
 class ItemBuilder
 {
     private $db;
-    private $rawItem;
 
-    private $categoryId;
-    private $articleId;
+    private $product;
 
     private $categoryName;
 

diff --git a/src/Frontend/NetzkollektivEasyCredit/Api/QuoteBuilder.php b/src/Frontend/NetzkollektivEasyCredit/Api/QuoteBuilder.php
@@ -59,8 +59,11 @@ public function getIsClickAndCollect() {
 
     public function getGrandTotal() {
         if ($this->grandTotal === null) {
-            /** @var Shopware_Controllers_Frontend_Checkout $checkoutController */
-            $basket = (new FakeCheckoutController())->setFront(Shopware()->Front())->getBasket();
+            /** @var \Shopware_Controllers_Frontend_Checkout $checkoutController */
+            $checkoutController = new FakeCheckoutController();
+            $checkoutController->setFront(Shopware()->Front());
+
+            $basket = $checkoutController->getBasket();
             $this->grandTotal = empty($basket['AmountWithTaxNumeric']) ? $basket['AmountNumeric'] : $basket['AmountWithTaxNumeric'];
         }
         return $this->grandTotal;

diff --git a/src/Frontend/NetzkollektivEasyCredit/Bootstrap.php b/src/Frontend/NetzkollektivEasyCredit/Bootstrap.php
@@ -100,8 +100,6 @@ public function afterInit()
     /**
      * Activate the plugin easycredit plugin.
      * Sets the active flag in the payment row.
-     *
-     * @return bool
      */
     public function enable()
     {

diff --git a/src/Frontend/NetzkollektivEasyCredit/Controllers/Backend/EasycreditMerchant.php b/src/Frontend/NetzkollektivEasyCredit/Controllers/Backend/EasycreditMerchant.php
@@ -9,7 +9,7 @@
 abstract class Shopware_Controllers_Backend_EasycreditMerchant_Abstract extends Shopware_Controllers_Backend_Application {
 
     /**
-     * @var string
+     * {@inheritdoc}
      */
     protected $model = Order::class;
 

diff --git a/src/Frontend/NetzkollektivEasyCredit/Subscriber/Frontend.php b/src/Frontend/NetzkollektivEasyCredit/Subscriber/Frontend.php
@@ -417,7 +417,7 @@ protected function getRedirectUrl() {
                 if ($e->getResponseObject() instanceof PaymentConstraintViolation) {
                     $errors = [];
                     foreach ($e->getResponseObject()->getViolations() as $violation) {
-                        $errors[$violation['field']] = $violation['messageDE'] ?? $violation['message'];
+                        $errors[$violation->getField()] = $violation->getMessageDE() ? $violation->getMessageDE() :  $violation->getMessage();
                     }
                     if (in_array('orderDetails.invoiceAddress', array_keys($errors)) ||
                         in_array('orderDetails.shippingAddress', array_keys($errors))

diff --git a/src/Frontend/NetzkollektivEasyCredit/Subscriber/OrderRefunded.php b/src/Frontend/NetzkollektivEasyCredit/Subscriber/OrderRefunded.php
@@ -36,7 +36,7 @@ public function _onOrderStatusChanged(PreUpdateEventArgs $eventArgs) {
                 if ($e->getResponseObject() instanceof ConstraintViolation) {
                     $error = 'easyCredit-Ratenkauf: ';
                     foreach ($e->getResponseObject()->getViolations() as $violation) {
-                        $error .= $violation['message'];
+                        $error .= $violation->getMessage();
                     }
                     return $this->handleError($error);
                 }

diff --git a/src/Frontend/NetzkollektivEasyCredit/Subscriber/OrderShipped.php b/src/Frontend/NetzkollektivEasyCredit/Subscriber/OrderShipped.php
@@ -35,7 +35,7 @@ public function _onOrderStatusChanged(PreUpdateEventArgs $eventArgs) {
                 if ($e->getResponseObject() instanceof ConstraintViolation) {
                     $error = 'easyCredit-Ratenkauf: ';
                     foreach ($e->getResponseObject()->getViolations() as $violation) {
-                        $error .= $violation['message'];
+                        $error .= $violation->getMessage();
                     }
                     return $this->handleError($error);
                 }

diff --git a/src/Frontend/NetzkollektivEasyCredit/phpstan.neon.dist b/src/Frontend/NetzkollektivEasyCredit/phpstan.neon.dist
@@ -1,7 +1,7 @@
 parameters:
   checkMissingIterableValueType: false
   reportUnmatchedIgnoredErrors: false
-  level: 2
+  level: 3
   scanDirectories:
     - vendor
     - ../../../../../../vendor