Merge pull request #101 from BitBagCommerce/SHOP-44/Update_inpost_plugin_to_shopware_6_5

Update plugin to shopware 6.5

Author: Cholin2000

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ "7.4" ]
+                php: [ "8.1" ]
 
         steps:
             -

composer.json

@@ -10,11 +10,11 @@
         }
     ],
     "require": {
-        "shopware/core": "6.4.*",
-        "shopware/storefront": "6.4.*"
+        "shopware/core": "6.5.*",
+        "shopware/storefront": "6.5.*"
     },
     "require-dev": {
-        "psalm/plugin-symfony": "^3.1",
+        "psalm/plugin-symfony": "^4.0.4",
         "bitbag/coding-standard": "^1.0",
         "phpunit/phpunit": "^9.5"
     },
@@ -44,7 +44,8 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "symfony/runtime": true
         }
     }
 }

src/Calculator/OrderWeightCalculator.php

@@ -41,11 +41,14 @@ public function calculate(OrderEntity $order, Context $context): float
         $products = array_map(fn (OrderLineItemEntity $item) => $item->getProduct(), $orderLineItems);
         $products = array_filter($products);
         $parentIds = array_filter($products, fn (ProductEntity $product) => null !== $product->getParentId());
-        $parentProducts = $this->productRepository->search(
-            new Criteria(array_column($parentIds, 'parentId')),
-            $context
-        );
-        $parentProducts = $parentProducts->getElements();
+
+        if ($parentIds) {
+            $parentProducts = $this->productRepository->search(
+                new Criteria(array_column($parentIds, 'parentId')),
+                $context
+            );
+            $parentProducts = $parentProducts->getElements();
+        }
 
         foreach ($orderLineItems as $item) {
             $product = $item->getProduct();

src/Controller/Api/InPostApiController.php

@@ -19,7 +19,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * @RouteScope(scopes={"api"})
+ * @Route(defaults={"_routeScope"={"api"}})
  */
 final class InPostApiController
 {

src/Controller/Api/LabelController.php

@@ -24,7 +24,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * @RouteScope(scopes={"api"})
+ * @Route(defaults={"_routeScope"={"api"}})
  */
 final class LabelController
 {

src/Controller/Api/OrderCourierController.php

@@ -28,7 +28,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * @RouteScope(scopes={"api"})
+ * @Route(defaults={"_routeScope"={"api"}})
  */
 final class OrderCourierController
 {

src/Controller/Api/PackageController.php

@@ -24,7 +24,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * @RouteScope(scopes={"api"})
+ * @Route(defaults={"_routeScope"={"api"}})
  */
 final class PackageController
 {

src/Core/Checkout/Cart/Validator/CartValidator.php

@@ -53,7 +53,7 @@ public function validate(
             return;
         }
 
-        $postCode = $address->getZipcode();
+        $postCode = $address->getZipcode() ?? '';
 
         $this->checkPostCodeValidity($postCode, $address->getId(), $errors);
 

src/Finder/CashOnDeliveryPaymentMethodFinder.php

@@ -12,16 +12,16 @@
 
 use Shopware\Core\Checkout\Payment\Cart\PaymentHandler\CashPayment;
 use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\IdSearchResult;
 
 final class CashOnDeliveryPaymentMethodFinder implements CashOnDeliveryPaymentMethodFinderInterface
 {
-    private EntityRepositoryInterface $paymentMethodRepository;
+    private EntityRepository $paymentMethodRepository;
 
-    public function __construct(EntityRepositoryInterface $paymentMethodRepository)
+    public function __construct(EntityRepository $paymentMethodRepository)
     {
         $this->paymentMethodRepository = $paymentMethodRepository;
     }

src/Finder/OrderFinder.php

@@ -44,11 +44,11 @@ public function getWithAssociations(string $orderId, Context $context): OrderEnt
 
         $order = $this->orderRepository->search($orderCriteria, $context)->first();
 
-        if (null === $order) {
-            throw new OrderNotFoundException('order.notFound');
+        if ($order instanceof OrderEntity) {
+            return $order;
         }
 
-        return $order;
+        throw new OrderNotFoundException('order.notFound');
     }
 
     public function getWithAssociationsByOrdersIds(array $ordersIds, Context $context): EntitySearchResult