Always check for references when running node:remove

- Help prevent transaction failure when calling save
- Also allow the removal of node by UUID

Author: dantleech

Diff for: CHANGELOG.md

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+dev-master
+----------
+
+### Features
+
+- Immediately fail when trying to delete a node which is referenced
+
+### Bug Fixes
+
+- Cannot `node:remove` by UUID
+
 alpha-6
 -------
 

Diff for: features/fixtures/cms.xml

@@ -57,6 +57,23 @@
         </sv:node>
     </sv:node>
 
+    <sv:node sv:name="users">
+        <sv:property sv:name="jcr:primaryType" sv:type="Name">
+            <sv:value>nt:unstructured</sv:value>
+        </sv:property>
+        <sv:node sv:name="daniel">
+            <sv:property sv:name="jcr:primaryType" sv:type="Name">
+                <sv:value>nt:unstructured</sv:value>
+            </sv:property>
+            <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+                <sv:value>mix:referenceable</sv:value>
+            </sv:property>
+            <sv:property sv:name="jcr:uuid" sv:type="String">
+                <sv:value>88888888-1abf-4708-bfcc-e49511754b40</sv:value>
+            </sv:property>
+        </sv:node>
+    </sv:node>
+
     <sv:node sv:name="articles">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
             <sv:value>nt:unstructured</sv:value>

Diff for: features/phpcr_node_remove.feature

@@ -5,23 +5,23 @@ Feature: Remove a node
 
     Background:
         Given that I am logged in as "testuser"
-        And the "session_data.xml" fixtures are loaded
+        And the "cms.xml" fixtures are loaded
 
     Scenario: Remove the current node
-        Given the current node is "/tests_general_base"
+        Given the current node is "/cms/test"
         And I execute the "node:remove ." command
         Then the command should not fail
         And I save the session
-        And there should not exist a node at "/tests_general_base"
-        And the current node should be "/"
+        And there should not exist a node at "/cms/test"
+        And the current node should be "/cms"
 
     Scenario: Remove a non-current node
-        Given the current node is "/tests_general_base"
-        And I execute the "node:remove daniel" command
+        Given the current node is "/cms"
+        And I execute the "node:remove /cms/users/daniel" command
         Then the command should not fail
         And I save the session
-        And there should not exist a node at "/tests_general_base/daniel"
-        And the current node should be "/tests_general_base"
+        And there should not exist a node at "/cms/users/daniel"
+        And the current node should be "/cms"
 
     Scenario: Delete root node
         Given the current node is "/"
@@ -32,3 +32,15 @@ Feature: Remove a node
         You cannot delete the root node
         """
 
+    Scenario: Delete node by UUID
+        Given the current node is "/"
+        And I execute the "node:remove 88888888-1abf-4708-bfcc-e49511754b40" command
+        Then the command should not fail
+
+    Scenario: Delete referenced node
+        Given I execute the "node:remove /cms/articles/article1" command
+        Then the command should fail
+        And I should see the following:
+        """
+        The node "/cms/articles/article1" is referenced by the following properties
+        """

Diff for: src/PHPCR/Shell/Console/Command/Phpcr/NodeRemoveCommand.php

@@ -35,7 +35,22 @@ public function execute(InputInterface $input, OutputInterface $output)
             );
         }
 
-        $session->removeItem($targetPath);
+        $references = $targetNode->getReferences();
+
+        if (count($references) > 0) {
+            $paths = array();
+            foreach ($references as $reference) {
+                $paths[] = $reference->getPath();
+            }
+
+            throw new \InvalidArgumentException(sprintf(
+                'The node "%s" is referenced by the following properties: "%s"',
+                $targetNode->getPath(),
+                implode('", "', $paths)
+            ));
+        }
+
+        $targetNode->remove();
 
         // if we deleted the current path, switch back to the parent node
         if ($currentPath == $session->getAbsPath($targetPath)) {