MP-5701 Deprecated misdeclared AclRoleCriteria.reference transfer fie…

…ld. (#8658) MP-5701 Deprecated misdeclared AclRoleCriteria.reference transfer field.
spryker · Jul 12, 2022 · 3a16173 · 3a16173
1 parent e7ed571
commit 3a16173
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/Spryker/Shared/Acl/Transfer/acl.transfer.xml b/src/Spryker/Shared/Acl/Transfer/acl.transfer.xml
@@ -47,7 +47,7 @@
     <transfer name="AclRoleCriteria">
         <property name="names" type="string[]" singular="name"/>
         <property name="name" type="string"/>
-        <property name="reference" type="string"/>
+        <property name="reference" type="string" deprecated="Will be removed with next major release."/>
     </transfer>
 
     <transfer name="GroupCriteria">

diff --git a/tests/SprykerTest/Zed/Acl/_support/Helper/AclHelper.php b/tests/SprykerTest/Zed/Acl/_support/Helper/AclHelper.php
@@ -74,9 +74,8 @@ public function deleteRoles(AclRoleCriteriaTransfer $aclRoleCriteriaTransfer): v
         if ($aclRoleCriteriaTransfer->getName()) {
             $aclRoleQuery->filterByName($aclRoleCriteriaTransfer->getName());
         }
-        if ($aclRoleCriteriaTransfer->getReference()) {
-            $aclRoleQuery->filterByReference($aclRoleCriteriaTransfer->getReference());
-        }
+
+        $aclRoleQuery = $this->filterAclRoleByReference($aclRoleCriteriaTransfer, $aclRoleQuery);
 
         $aclRoleQuery->delete();
     }
@@ -95,6 +94,7 @@ public function deleteGroups(GroupCriteriaTransfer $groupCriteriaTransfer): void
         if ($groupCriteriaTransfer->getName()) {
             $aclGroupQuery->filterByName($groupCriteriaTransfer->getName());
         }
+
         if ($groupCriteriaTransfer->getReference()) {
             $aclGroupQuery->filterByReference($groupCriteriaTransfer->getReference());
         }
@@ -141,4 +141,23 @@ protected function getAclGroupQuery(): SpyAclGroupQuery
     {
         return SpyAclGroupQuery::create();
     }
+
+    /**
+     * @deprecated Will be removed in the next major without replacement.
+     *
+     * @param \Generated\Shared\Transfer\AclRoleCriteriaTransfer $aclRoleCriteriaTransfer
+     * @param \Orm\Zed\Acl\Persistence\SpyAclRoleQuery $aclRoleQuery
+     *
+     * @return \Orm\Zed\Acl\Persistence\SpyAclRoleQuery
+     */
+    protected function filterAclRoleByReference(
+        AclRoleCriteriaTransfer $aclRoleCriteriaTransfer,
+        SpyAclRoleQuery $aclRoleQuery
+    ): SpyAclRoleQuery {
+        if ($aclRoleCriteriaTransfer->getReference()) {
+            $aclRoleQuery->filterByReference($aclRoleCriteriaTransfer->getReference());
+        }
+
+        return $aclRoleQuery;
+    }
 }