diff --git a/src/Spryker/Zed/Acl/Business/Model/Role.php b/src/Spryker/Zed/Acl/Business/Model/Role.php index f9885f1..ab4acaa 100644 --- 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 index aa75a51..41380ff 100644 --- 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 index 301d864..8bc456c 100644 --- 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 index ffe8da0..f091310 100644 --- a/src/Spryker/Zed/Acl/Communication/Form/DataProvider/AclGroupFormDataProvider.php +++ b/src/Spryker/Zed/Acl/Communication/Form/DataProvider/AclGroupFormDataProvider.php @@ -67,9 +67,10 @@ 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'); } /** @@ -77,8 +78,9 @@ protected function getAvailableRoleListByIdGroup($idAclGroup) */ 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 index e71157e..f61dc41 100644 --- 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) {