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

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

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/Spryker/Zed/Acl/Business/Model/Role.php b/src/Spryker/Zed/Acl/Business/Model/Role.php
@@ -248,6 +248,7 @@ public function findRoleById(int $id): ?RoleTransfer
      */
     public function removeRoleById($idRole)
     {
+        /** @var \Propel\Runtime\Collection\ObjectCollection $aclRules */
         $aclRules = $this->queryContainer->queryRuleByRoleId($idRole)->find();
         $aclRules->delete();
 

diff --git a/src/Spryker/Zed/Acl/Business/Model/Rule.php b/src/Spryker/Zed/Acl/Business/Model/Rule.php
@@ -205,6 +205,7 @@ public function findByRoles(
      */
     public function getRulesForGroupId($idGroup)
     {
+        /** @var \Propel\Runtime\Collection\ObjectCollection $relationshipCollection */
         $relationshipCollection = $this->queryContainer->queryGroupHasRole($idGroup)->find();
         /** @var array<\Orm\Zed\Acl\Persistence\SpyAclRole> $roleCollection */
         $roleCollection = $this->queryContainer->queryGroupRules($relationshipCollection)->find();

diff --git a/src/Spryker/Zed/Acl/Communication/AclCommunicationFactory.php b/src/Spryker/Zed/Acl/Communication/AclCommunicationFactory.php
@@ -58,15 +58,15 @@ public function createGroupTable()
      */
     public function getGroupRoleListByGroupId($idAclGroup)
     {
+        /** @var \Propel\Runtime\Collection\ObjectCollection $roleCollection */
         $roleCollection = $this->getQueryContainer()
             ->queryGroupRoles($idAclGroup)
-            ->find()
-            ->toArray();
+            ->find();
 
         return [
             'code' => Response::HTTP_OK,
             'idGroup' => $idAclGroup,
-            'data' => $roleCollection,
+            'data' => $roleCollection->toArray(),
         ];
     }
 

diff --git a/src/Spryker/Zed/Acl/Communication/Form/DataProvider/AclGroupFormDataProvider.php b/src/Spryker/Zed/Acl/Communication/Form/DataProvider/AclGroupFormDataProvider.php
@@ -67,18 +67,20 @@ public function getOptions()
      */
     protected function getAvailableRoleListByIdGroup($idAclGroup)
     {
-        $roleCollection = $this->queryContainer->queryGroupHasRole($idAclGroup)->find()->toArray();
+        /** @var \Propel\Runtime\Collection\ObjectCollection $roleCollection */
+        $roleCollection = $this->queryContainer->queryGroupHasRole($idAclGroup)->find();
 
-        return array_column($roleCollection, 'FkAclRole');
+        return array_column($roleCollection->toArray(), 'FkAclRole');
     }
 
     /**
      * @return array
      */
     protected function getAvailableRoleList()
     {
-        $roleCollection = $this->queryContainer->queryRole()->find()->toArray();
+        /** @var \Propel\Runtime\Collection\ObjectCollection $roleCollection */
+        $roleCollection = $this->queryContainer->queryRole()->find();
 
-        return array_column($roleCollection, 'IdAclRole', 'Name');
+        return array_column($roleCollection->toArray(), 'IdAclRole', 'Name');
     }
 }
diff --git a/src/Spryker/Zed/Acl/Persistence/Propel/Mapper/AclMapper.php b/src/Spryker/Zed/Acl/Persistence/Propel/Mapper/AclMapper.php
@@ -15,7 +15,7 @@
 use Orm\Zed\Acl\Persistence\SpyAclGroup;
 use Orm\Zed\Acl\Persistence\SpyAclRole;
 use Orm\Zed\Acl\Persistence\SpyAclUserHasGroup;
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 
 class AclMapper
 {
@@ -72,13 +72,13 @@ public function mapAclRoleTransferToRoleEntity(RoleTransfer $roleTransfer, SpyAc
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection<\Orm\Zed\Acl\Persistence\SpyAclUserHasGroup> $aclUserHasGroupEntities
+     * @param \Propel\Runtime\Collection\Collection<\Orm\Zed\Acl\Persistence\SpyAclUserHasGroup> $aclUserHasGroupEntities
      * @param \Generated\Shared\Transfer\AclUserHasGroupCollectionTransfer $aclUserHasGroupCollectionTransfer
      *
      * @return \Generated\Shared\Transfer\AclUserHasGroupCollectionTransfer
      */
     public function mapAclUserHasGroupEntitiesToAclUserHasGroupCollectionTransfer(
-        ObjectCollection $aclUserHasGroupEntities,
+        Collection $aclUserHasGroupEntities,
         AclUserHasGroupCollectionTransfer $aclUserHasGroupCollectionTransfer
     ): AclUserHasGroupCollectionTransfer {
         foreach ($aclUserHasGroupEntities as $aclUserHasGroupEntity) {