allow settings refs when deleting stuff

ezecosystem · Jun 6, 2017 · ebc9dde · ebc9dde
1 parent ea8ca57
commit ebc9dde
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 6 deletions.
diff --git a/Core/Executor/ContentManager.php b/Core/Executor/ContentManager.php
@@ -304,10 +304,12 @@ protected function update($step)
      */
     protected function delete($step)
     {
-        $contentService = $this->repository->getContentService();
-
         $contentCollection = $this->matchContents('delete', $step);
 
+        $this->setReferences($contentCollection, $step);
+
+        $contentService = $this->repository->getContentService();
+
         foreach ($contentCollection as $content) {
             try {
                 $contentService->deleteContent($content->contentInfo);

diff --git a/Core/Executor/ContentTypeGroupManager.php b/Core/Executor/ContentTypeGroupManager.php
@@ -86,6 +86,8 @@ protected function delete($step)
     {
         $groupsCollection = $this->matchContentTypeGroups('delete', $step);
 
+        $this->setReferences($groupsCollection, $step);
+
         $contentTypeService = $this->repository->getContentTypeService();
 
         foreach ($groupsCollection as $contentTypeGroup) {

diff --git a/Core/Executor/ContentTypeManager.php b/Core/Executor/ContentTypeManager.php
@@ -252,6 +252,8 @@ protected function delete($step)
     {
         $contentTypeCollection = $this->matchContentTypes('delete', $step);
 
+        $this->setReferences($contentTypeCollection, $step);
+
         $contentTypeService = $this->repository->getContentTypeService();
 
         foreach ($contentTypeCollection as $contentType) {

diff --git a/Core/Executor/LocationManager.php b/Core/Executor/LocationManager.php
@@ -203,10 +203,12 @@ protected function update($step)
      */
     protected function delete($step)
     {
-        $locationService = $this->repository->getLocationService();
-
         $locationCollection = $this->matchLocations('delete', $step);
 
+        $this->setReferences($locationCollection, $step);
+
+        $locationService = $this->repository->getLocationService();
+
         foreach ($locationCollection as $location) {
             $locationService->deleteLocation($location);
         }

diff --git a/Core/Executor/ObjectStateGroupManager.php b/Core/Executor/ObjectStateGroupManager.php
@@ -113,6 +113,8 @@ protected function delete($step)
     {
         $groupsCollection = $this->matchObjectStateGroups('delete', $step);
 
+        $this->setReferences($groupsCollection, $step);
+
         $objectStateService = $this->repository->getObjectStateService();
 
         foreach ($groupsCollection as $objectStateGroup) {

diff --git a/Core/Executor/ObjectStateManager.php b/Core/Executor/ObjectStateManager.php
@@ -129,6 +129,8 @@ protected function delete($step)
     {
         $stateCollection = $this->matchObjectStates('delete', $step);
 
+        $this->setReferences($stateCollection, $step);
+
         $objectStateService = $this->repository->getObjectStateService();
 
         foreach ($stateCollection as $state) {

diff --git a/Core/Executor/RoleManager.php b/Core/Executor/RoleManager.php
@@ -119,6 +119,8 @@ protected function delete($step)
     {
         $roleCollection = $this->matchRoles('delete', $step);
 
+        $this->setReferences($roleCollection, $step);
+
         $roleService = $this->repository->getRoleService();
 
         foreach ($roleCollection as $role) {

diff --git a/Core/Executor/SectionManager.php b/Core/Executor/SectionManager.php
@@ -82,6 +82,8 @@ protected function delete($step)
     {
         $sectionCollection = $this->matchSections('delete', $step);
 
+        $this->setReferences($sectionCollection, $step);
+
         $sectionService = $this->repository->getSectionService();
 
         foreach ($sectionCollection as $section) {

diff --git a/Core/Executor/TagManager.php b/Core/Executor/TagManager.php
@@ -85,6 +85,8 @@ protected function delete($step)
 
         $tagsCollection = $this->matchTags('delete', $step);
 
+        $this->setReferences($tagsCollection, $step);
+
         foreach ($tagsCollection as $tag) {
             $this->tagService->deleteTag($tag);
         }

diff --git a/Core/Executor/UserGroupManager.php b/Core/Executor/UserGroupManager.php
@@ -143,6 +143,8 @@ protected function delete($step)
     {
         $userGroupCollection = $this->matchUserGroups('delete', $step);
 
+        $this->setReferences($userGroupCollection, $step);
+
         $userService = $this->repository->getUserService();
 
         foreach ($userGroupCollection as $userGroup) {

diff --git a/Core/Executor/UserManager.php b/Core/Executor/UserManager.php
@@ -160,6 +160,8 @@ protected function delete($step)
     {
         $userCollection = $this->matchUsers('delete', $step);
 
+        $this->setReferences($userCollection, $step);
+
         $userService = $this->repository->getUserService();
 
         foreach ($userCollection as $user) {

diff --git a/WHATSNEW.md b/WHATSNEW.md
@@ -3,16 +3,18 @@ Version 4.0 RC-4 (unreleased)
 
 * New: added 'append' action to 'file' executor
 
+* New: it is now possible to match contents based on what other contents they relate to/from
+
 * New: it is now possible to set a reference to a Content State by using a syntax similar to f.e. `object_state.ez_lock` to
     specify the desired State Group
 
 * New: allow to use a reference for Migration/Suspend when comparing to a date 
 
-* New: it is now possible to match contents based on what other contents they relate to/from
-
 * New: allow to set references to the number of items matched whenever updating/deleting any entity from the repository
     (contents, locations, etc...)
 
+* New: allow to set references when deleting any entity from the repository
+
 * New: allow to install along newer with Nikic/php- parser
 
 * Fix the Migration/Cancel step