Merge pull request #1446 from spryker-shop/bugfix/frw-1162/dev-fix-do…

…cblock-for-collections Auto-merge based on green CI result.
spryker-shop · Nov 20, 2023 · 0913b69 · 0913b69
2 parents 29f3316 + 0c9c67c
commit 0913b69
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 37 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Pyz/Zed/DataImport/Business/Model/MerchantUser/MerchantUserWriterStep.php b/src/Pyz/Zed/DataImport/Business/Model/MerchantUser/MerchantUserWriterStep.php
@@ -108,6 +108,8 @@ protected function getIdUserByUsername(string $username): int
     }
 
     /**
+     * @psalm-suppress MissingTemplateParam
+     *
      * @param int $idUser
      *
      * @return \Generated\Shared\Transfer\UserTransfer|null

diff --git a/...Pyz/Zed/DataImport/Business/Model/ProductStock/Writer/ProductStockPropelDataSetWriter.php b/...Pyz/Zed/DataImport/Business/Model/ProductStock/Writer/ProductStockPropelDataSetWriter.php
@@ -508,6 +508,8 @@ protected function updateAbstractAvailabilityQuantity(
     }
 
     /**
+     * @psalm-suppress MissingTemplateParam
+     *
      * @return array<string>
      */
     protected function getBundleProductAbstractSkus(): array

diff --git a/.../Zed/MerchantSalesOrder/Communication/Plugin/Oms/Condition/IsOrderPaidConditionPlugin.php b/.../Zed/MerchantSalesOrder/Communication/Plugin/Oms/Condition/IsOrderPaidConditionPlugin.php
@@ -29,6 +29,8 @@ class IsOrderPaidConditionPlugin extends AbstractPlugin implements ConditionInte
      *
      * @api
      *
+     * @psalm-suppress MissingTemplateParam
+     *
      * @param \Orm\Zed\Sales\Persistence\SpySalesOrderItem $orderItem
      *
      * @return bool

diff --git a/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductConcretePageSearchPublisher.php b/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductConcretePageSearchPublisher.php
@@ -113,6 +113,8 @@ public function __construct(
     }
 
     /**
+     * @psalm-suppress MissingTemplateParam
+     *
      * @param array<\Generated\Shared\Transfer\ProductConcreteTransfer> $productConcreteTransfers
      * @param array<\Generated\Shared\Transfer\ProductConcretePageSearchTransfer> $productConcretePageSearchTransfers
      *
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
+         * @psalm-suppress MissingTemplateParam
+         *
          * @param int $idUser
          *
          * @return \Generated\Shared\Transfer\UserTransfer|null
@@ Expand Down @@