FRW-7400 Upgraded PHPStan to 1.10.*. (#10911)

FRW-7400 Update PHPStan to 1.10.*
spryker · May 6, 2024 · bddeb5d · bddeb5d
1 parent 0c84519
commit bddeb5d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/src/Spryker/Client/ProductBundle/Grouper/ProductBundleGrouper.php b/src/Spryker/Client/ProductBundle/Grouper/ProductBundleGrouper.php
@@ -148,9 +148,9 @@ protected function buildGroupKey(ItemTransfer $itemTransfer): string
     }
 
     /**
-     * @param array<string, mixed> $options
+     * @param array<int, mixed> $options
      *
-     * @return array<string, mixed>
+     * @return array<int, mixed>
      */
     protected function sortOptions(array $options)
     {

diff --git a/src/Spryker/Zed/ProductBundle/Business/ProductBundle/ProductBundleReader.php b/src/Spryker/Zed/ProductBundle/Business/ProductBundle/ProductBundleReader.php
@@ -144,7 +144,7 @@ public function expandProductConcreteTransfersWithBundledProducts(array $product
     /**
      * @param int $idProductConcrete
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle>
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle>
      */
     protected function findBundledProducts($idProductConcrete)
     {

diff --git a/src/Spryker/Zed/ProductBundle/Business/ProductBundle/Stock/ProductBundleStockWriter.php b/src/Spryker/Zed/ProductBundle/Business/ProductBundle/Stock/ProductBundleStockWriter.php
@@ -10,7 +10,7 @@
 use Generated\Shared\Transfer\ProductConcreteTransfer;
 use Generated\Shared\Transfer\StockProductTransfer;
 use Orm\Zed\Stock\Persistence\SpyStockProduct;
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 use Spryker\DecimalObject\Decimal;
 use Spryker\Zed\ProductBundle\Business\ProductBundle\Availability\ProductBundleAvailabilityHandlerInterface;
 use Spryker\Zed\ProductBundle\Dependency\Facade\ProductBundleToStoreFacadeInterface;
@@ -143,11 +143,11 @@ protected function updateBundleStock(
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle> $bundleItems
+     * @param \Propel\Runtime\Collection\Collection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle> $bundleItems
      *
      * @return array<int, array<string, mixed>>
      */
-    protected function calculateBundleStockPerWarehouse(ObjectCollection $bundleItems)
+    protected function calculateBundleStockPerWarehouse(Collection $bundleItems)
     {
         $bundledItemStock = [];
         $bundledItemQuantity = [];
@@ -261,7 +261,7 @@ protected function findProductBundleBySku($sku)
     /**
      * @param int $idProductConcrete
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle>
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle>
      */
     protected function findBundledItemsByIdBundleProduct($idProductConcrete)
     {
@@ -305,7 +305,7 @@ protected function mapStockTransfer(
     /**
      * @param int $idProduct
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Stock\Persistence\SpyStockProduct>
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Stock\Persistence\SpyStockProduct>
      */
     protected function findProductStocks($idProduct)
     {

diff --git a/src/Spryker/Zed/ProductBundle/Persistence/ProductBundleRepository.php b/src/Spryker/Zed/ProductBundle/Persistence/ProductBundleRepository.php
@@ -173,7 +173,8 @@ public function getBundleItemsBySalesOrderItemIds(array $salesOrderItemIds): arr
      */
     public function getProductConcretesRawDataByProductConcreteSkus(array $productConcreteSkus): array
     {
-        return $this->getFactory()
+        /** @var \Propel\Runtime\Collection\ArrayCollection $productConcretesRawDataByProductConcreteSkus */
+        $productConcretesRawDataByProductConcreteSkus = $this->getFactory()
             ->createProductBundleQuery()
             ->useSpyProductRelatedByFkProductQuery()
                 ->filterBySku_In($productConcreteSkus)
@@ -186,8 +187,9 @@ public function getProductConcretesRawDataByProductConcreteSkus(array $productCo
                 ItemTransfer::ID_PRODUCT_ABSTRACT,
                 ItemTransfer::SKU,
             ])
-            ->find()
-            ->toArray(ItemTransfer::SKU);
+            ->find();
+
+        return $productConcretesRawDataByProductConcreteSkus->toArray(ItemTransfer::SKU);
     }
 
     /**

diff --git a/src/Spryker/Zed/ProductBundle/Persistence/Propel/Mapper/ProductBundleMapper.php b/src/Spryker/Zed/ProductBundle/Persistence/Propel/Mapper/ProductBundleMapper.php
@@ -15,7 +15,6 @@
 use Generated\Shared\Transfer\ProductForBundleTransfer;
 use Orm\Zed\ProductBundle\Persistence\SpySalesOrderItemBundle;
 use Propel\Runtime\Collection\Collection;
-use Propel\Runtime\Collection\ObjectCollection;
 
 class ProductBundleMapper
 {
@@ -61,7 +60,7 @@ public function mapProductBundleEntitiesToProductBundleCollectionTransfer(
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle> $productBundleEntities
+     * @param \Propel\Runtime\Collection\Collection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle> $productBundleEntities
      * @param \Generated\Shared\Transfer\ProductBundleCollectionTransfer $productBundleCollectionTransfer
      *
      * @return \Generated\Shared\Transfer\ProductBundleCollectionTransfer
@@ -84,11 +83,11 @@ public function mapProductBundleEntityCollectionToProductBundleCollectionTransfe
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection $salesOrderItemBundleEntities
+     * @param \Propel\Runtime\Collection\Collection $salesOrderItemBundleEntities
      *
      * @return array<\Generated\Shared\Transfer\ItemTransfer>
      */
-    public function mapSalesOrderItemBundleEntitiesToItemTransfers(ObjectCollection $salesOrderItemBundleEntities): array
+    public function mapSalesOrderItemBundleEntitiesToItemTransfers(Collection $salesOrderItemBundleEntities): array
     {
         $bundleItemTransfers = [];
 
@@ -141,7 +140,7 @@ protected function mapSalesOrderItemBundleEntityToItemTransfer(SpySalesOrderItem
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle> $productBundleEntities
+     * @param \Propel\Runtime\Collection\Collection<\Orm\Zed\ProductBundle\Persistence\SpyProductBundle> $productBundleEntities
      *
      * @return array<array<\Generated\Shared\Transfer\ProductForBundleTransfer>>
      */

diff --git a/tests/SprykerTest/Zed/ProductBundle/Business/Cart/ProductBundleCartExpanderTest.php b/tests/SprykerTest/Zed/ProductBundle/Business/Cart/ProductBundleCartExpanderTest.php
@@ -168,6 +168,7 @@ public function testExpandBundleItemsShouldSkipCopyFromBundleItemToBundledItems(
      * @param \Spryker\Zed\ProductBundle\Dependency\Facade\ProductBundleToPriceProductFacadeInterface|null $priceProductFacadeMock
      * @param \Spryker\Zed\ProductBundle\Dependency\Facade\ProductBundleToProductFacadeInterface|null $productFacadeMock
      * @param \Spryker\Zed\ProductBundle\Dependency\Facade\ProductBundleToLocaleFacadeInterface|null $localeFacadeMock
+     * @param \Spryker\Zed\ProductBundle\ProductBundleConfig|null $productBundleConfigMock
      *
      * @return \PHPUnit\Framework\MockObject\MockObject|\Spryker\Zed\ProductBundle\Business\ProductBundle\Cart\ProductBundleCartExpander
      */