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

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

Hide file tree

Showing 8 changed files with 21 additions and 18 deletions.
diff --git a/src/Spryker/Zed/Oms/Business/OrderStateMachine/OrderStateMachine.php b/src/Spryker/Zed/Oms/Business/OrderStateMachine/OrderStateMachine.php
@@ -867,6 +867,7 @@ protected function getOrderItemsByState(
         }
 
         $omsProcessEntity = $this->queryContainer->queryProcess($process->getName())->findOne();
+        /** @var \Propel\Runtime\Collection\ObjectCollection $omsOrderItemEntityCollection */
         $omsOrderItemEntityCollection = $this->queryContainer->querySalesOrderItemStatesByName($states)->find();
 
         if ($omsProcessEntity === null || $omsOrderItemEntityCollection->count() === 0) {

diff --git a/src/Spryker/Zed/Oms/Business/OrderStateMachine/Timeout.php b/src/Spryker/Zed/Oms/Business/OrderStateMachine/Timeout.php
@@ -17,7 +17,7 @@
 use Orm\Zed\Oms\Persistence\SpyOmsEventTimeout;
 use Orm\Zed\Oms\Persistence\SpyOmsEventTimeoutQuery;
 use Orm\Zed\Sales\Persistence\SpySalesOrderItem;
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 use RuntimeException;
 use Spryker\Zed\Oms\Business\Process\EventInterface;
 use Spryker\Zed\Oms\Business\Process\ProcessInterface;
@@ -239,11 +239,11 @@ protected function getStateFromProcess($stateId, ProcessInterface $process)
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection $orderItems
+     * @param \Propel\Runtime\Collection\Collection $orderItems
      *
      * @return array
      */
-    protected function groupItemsByEvent(ObjectCollection $orderItems)
+    protected function groupItemsByEvent(Collection $orderItems)
     {
         $groupedOrderItems = [];
         foreach ($orderItems as $orderItem) {
@@ -263,7 +263,7 @@ protected function groupItemsByEvent(ObjectCollection $orderItems)
     /**
      * @param \Generated\Shared\Transfer\OmsCheckTimeoutsQueryCriteriaTransfer|null $omsCheckTimeoutsQueryCriteriaTransfer
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection
+     * @return \Propel\Runtime\Collection\Collection
      */
     protected function findItemsWithExpiredTimeouts(?OmsCheckTimeoutsQueryCriteriaTransfer $omsCheckTimeoutsQueryCriteriaTransfer = null)
     {

diff --git a/src/Spryker/Zed/Oms/Business/Reservation/ExportReservation.php b/src/Spryker/Zed/Oms/Business/Reservation/ExportReservation.php
@@ -62,6 +62,7 @@ public function exportReservation()
         $lastExportedVersion = $this->getLastExportedVersion();
 
         $currentStoreTransfer = $this->storeFacade->getCurrentStore();
+        /** @var \Propel\Runtime\Collection\ObjectCollection $reservations */
         $reservations = $this->findReservations($lastExportedVersion, $maxVersion);
 
         if (count($reservations) === 0) {
@@ -166,7 +167,7 @@ protected function exportReservations(array $reservations, StoreTransfer $curren
      * @param int $lastExportedVersion
      * @param int $maxVisibleVersion
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Oms\Persistence\SpyOmsProductReservationChangeVersion>
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Oms\Persistence\SpyOmsProductReservationChangeVersion>
      */
     protected function findReservations($lastExportedVersion, $maxVisibleVersion)
     {

diff --git a/src/Spryker/Zed/Oms/Business/Util/OrderItemMatrix.php b/src/Spryker/Zed/Oms/Business/Util/OrderItemMatrix.php
@@ -143,7 +143,7 @@ protected function formatElement(array $gridInput, int $idProcess, int $idState)
     }
 
     /**
-     * @return \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Oms\Persistence\SpyOmsOrderProcess>
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Oms\Persistence\SpyOmsOrderProcess>
      */
     protected function getActiveProcesses()
     {

diff --git a/src/Spryker/Zed/Oms/Business/Util/TransitionLog.php b/src/Spryker/Zed/Oms/Business/Util/TransitionLog.php
@@ -299,7 +299,7 @@ protected function getEntity()
     /**
      * @param \Orm\Zed\Sales\Persistence\SpySalesOrder $order
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Oms\Persistence\SpyOmsTransitionLog>
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Oms\Persistence\SpyOmsTransitionLog>
      */
     public function getLogForOrder(SpySalesOrder $order)
     {

diff --git a/src/Spryker/Zed/Oms/Communication/Controller/TriggerController.php b/src/Spryker/Zed/Oms/Communication/Controller/TriggerController.php
@@ -116,6 +116,7 @@ public function submitTriggerEventForOrderAction(Request $request)
         /** @var string $redirect */
         $redirect = $request->query->get(static::REQUEST_PARAMETER_REDIRECT, '/');
 
+        /** @var \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem> $orderItems */
         $orderItems = $this->getOrderItemsToTriggerAction($idOrder, $request->query->all(static::REQUEST_PARAMETER_ITEMS) ?: null);
 
         $triggerEventReturnData = $this->getFacade()->triggerEvent($event, $orderItems, []);
@@ -151,7 +152,7 @@ protected function addOmsEventTriggerStatusMessage(?array $triggerEventReturnDat
      * @param int $idOrder
      * @param array|null $itemsList
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem>
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem>
      */
     protected function getOrderItemsToTriggerAction($idOrder, $itemsList = null)
     {

diff --git a/src/Spryker/Zed/Oms/Persistence/Propel/Mapper/OrderItemMapper.php b/src/Spryker/Zed/Oms/Persistence/Propel/Mapper/OrderItemMapper.php
@@ -10,7 +10,7 @@
 use Generated\Shared\Transfer\ItemStateTransfer;
 use Generated\Shared\Transfer\ItemTransfer;
 use Orm\Zed\Sales\Persistence\Map\SpySalesOrderItemTableMap;
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 use Spryker\Zed\Oms\Persistence\OmsQueryContainer;
 
 class OrderItemMapper implements OrderItemMapperInterface
@@ -36,12 +36,12 @@ public function mapOrderItemMatrix(array $orderItemsMatrixResult): array
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Oms\Persistence\SpyOmsOrderItemStateHistory> $omsOrderItemStateHistoryEntities
+     * @param \Propel\Runtime\Collection\Collection<\Orm\Zed\Oms\Persistence\SpyOmsOrderItemStateHistory> $omsOrderItemStateHistoryEntities
      *
      * @return array<\Generated\Shared\Transfer\ItemStateTransfer>
      */
     public function mapOmsOrderItemStateHistoryEntityCollectionToItemStateHistoryTransfers(
-        ObjectCollection $omsOrderItemStateHistoryEntities
+        Collection $omsOrderItemStateHistoryEntities
     ): array {
         $itemStateTransfers = [];
 
@@ -57,12 +57,12 @@ public function mapOmsOrderItemStateHistoryEntityCollectionToItemStateHistoryTra
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem> $salesOrderItemEntityCollection
+     * @param \Propel\Runtime\Collection\Collection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem> $salesOrderItemEntityCollection
      *
      * @return array<\Generated\Shared\Transfer\ItemTransfer>
      */
     public function mapSalesOrderItemEntityCollectionToOrderItemTransfers(
-        ObjectCollection $salesOrderItemEntityCollection
+        Collection $salesOrderItemEntityCollection
     ): array {
         $itemTransfers = [];
 

diff --git a/src/Spryker/Zed/Oms/Persistence/Propel/Mapper/OrderItemMapperInterface.php b/src/Spryker/Zed/Oms/Persistence/Propel/Mapper/OrderItemMapperInterface.php
@@ -7,7 +7,7 @@
 
 namespace Spryker\Zed\Oms\Persistence\Propel\Mapper;
 
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 
 interface OrderItemMapperInterface
 {
@@ -19,20 +19,20 @@ interface OrderItemMapperInterface
     public function mapOrderItemMatrix(array $orderItemsMatrixResult): array;
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Oms\Persistence\SpyOmsOrderItemStateHistory> $omsOrderItemStateHistoryEntities
+     * @param \Propel\Runtime\Collection\Collection<\Orm\Zed\Oms\Persistence\SpyOmsOrderItemStateHistory> $omsOrderItemStateHistoryEntities
      *
      * @return array<\Generated\Shared\Transfer\ItemStateTransfer>
      */
     public function mapOmsOrderItemStateHistoryEntityCollectionToItemStateHistoryTransfers(
-        ObjectCollection $omsOrderItemStateHistoryEntities
+        Collection $omsOrderItemStateHistoryEntities
     ): array;
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem> $salesOrderItemEntityCollection
+     * @param \Propel\Runtime\Collection\Collection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem> $salesOrderItemEntityCollection
      *
      * @return array<\Generated\Shared\Transfer\ItemTransfer>
      */
     public function mapSalesOrderItemEntityCollectionToOrderItemTransfers(
-        ObjectCollection $salesOrderItemEntityCollection
+        Collection $salesOrderItemEntityCollection
     ): array;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * @return \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Oms\Persistence\SpyOmsOrderProcess>
+         * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Oms\Persistence\SpyOmsOrderProcess>
          */
         protected function getActiveProcesses()
         {
@@ Expand Down @@