Various fixes:

Closes #146, #148

Author: dantleech

CHANGELOG.md

@@ -16,6 +16,9 @@ dev-master
 - [embedded] No exit code returned
 - [profile] Profile configuration overwritten by session parameters
 - [node:list] Incorrect node count
+- [node:edit] Multivalue references encoded as arrays when editing
+- [node:edit] Fixed undefined variable
+- [version] Versioning commands can use relative paths
 
 beta1
 -----

features/all/phpcr_version_history.feature

@@ -7,14 +7,14 @@ Feature: Node Version History
         Given that I am logged in as "testuser"
         And the "versionable.xml" fixtures are loaded
 
-    Scenario: Checkout a a given node
-        Given I execute the "version:history /tests_version_base/versioned" command
+    Scenario: Show history for a node
+        When I execute the "version:history /tests_version_base/versioned" command
         Then the command should not fail
         And I should see a table containing the following rows:
             | Name            | Created             |
 
     Scenario: History on a non versionable node
-        Given I execute the "version:history /tests_version_base" command
+        When I execute the "version:history /tests_version_base" command
         Then the command should fail
         And I should see the following:
         """

features/all/phpcr_version_remove.feature

@@ -8,7 +8,7 @@ Feature: Remove node version
         And the "versionable.xml" fixtures are loaded
 
     Scenario: Checkout a a given node
-        Given I execute the following commands:
+        When I execute the following commands:
             | cd /tests_version_base/versioned |
             | version:checkout /tests_version_base/versioned |
             | node:property:set foo baz |
@@ -21,7 +21,7 @@ Feature: Remove node version
         And I execute the "version:remove /tests_version_base/versioned 1.0" command
         Then the command should not fail
         And I execute the "version:history /tests_version_base/versioned" command
-        Then I should not see the following:
+        And I should not see the following:
         """
         | 1.0             |
         """

features/all/phpcr_version_restore.feature

@@ -8,7 +8,7 @@ Feature: Restore a version
         And the "versionable.xml" fixtures are loaded
 
     Scenario: Restore node version
-        Given I execute the following commands:
+        When I execute the following commands:
             | cd /tests_version_base/versioned |
             | node:property:set foo initalbar |
             | session:save |

src/PHPCR/Shell/Config/ProfileLoader.php

@@ -80,9 +80,15 @@ public function loadProfile(Profile $profile)
             $profile->set('transport', $data['transport']);
         }
 
+        $profileWorkspace = $profile->get('phpcr', 'workspace');
         if (isset($data['phpcr'])) {
             $profile->set('phpcr', $data['phpcr']);
         }
+
+        // workspace argument overrides profile workspace
+        if ($profileWorkspace && $profileWorkspace !== 'default') {
+            $profile->set('phpcr', 'workspace', $profileWorkspace);
+        }
     }
 
     public function saveProfile(Profile $profile, $overwrite = false)

src/PHPCR/Shell/Console/Command/Phpcr/NodeCopyCommand.php

@@ -46,6 +46,9 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         $workspace = $session->getWorkspace();
 
+        $start = microtime(true);
         $workspace->copy($srcAbsPath, $destAbsPath, $srcWorkspace);
+        $end = microtime(true) - $start;
+        $output->writeln(number_format($end, 6));
     }
 }

src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckinCommand.php

@@ -68,7 +68,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $node = $session->getNodeByPathOrIdentifier($path);
         $nodeHelper->assertNodeIsVersionable($node);
 
-        $version = $versionManager->checkin($path);
+        $version = $versionManager->checkin($node->getPath());
 
         $output->writeln('Version: ' . $version->getName());
     }

src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckoutCommand.php

@@ -54,6 +54,6 @@ public function execute(InputInterface $input, OutputInterface $output)
         $nodeHelper->assertNodeIsVersionable($node);
 
         $versionManager = $workspace->getVersionManager();
-        $version = $versionManager->checkout($absPath);
+        $version = $versionManager->checkout($node->getPath());
     }
 }

src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckpointCommand.php

@@ -43,7 +43,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $node = $session->getNodeByPathOrIdentifier($path);
         $nodeHelper->assertNodeIsVersionable($node);
         $versionManager = $workspace->getVersionManager();
-        $version = $versionManager->checkpoint($path);
+        $version = $versionManager->checkpoint($node->getPath());
 
         $output->writeln('Version: ' . $version->getName());
     }

src/PHPCR/Shell/Console/Command/Phpcr/VersionHistoryCommand.php

@@ -40,9 +40,10 @@ public function execute(InputInterface $input, OutputInterface $output)
         $workspace = $session->getWorkspace();
 
         $node = $session->getNodeByPathOrIdentifier($path);
+
         $nodeHelper->assertNodeIsVersionable($node);
         $versionManager = $workspace->getVersionManager();
-        $history = $versionManager->getVersionHistory($path);
+        $history = $versionManager->getVersionHistory($node->getPath());
 
         $versions = $history->getAllVersions();
 

src/PHPCR/Shell/Console/Command/Phpcr/VersionRemoveCommand.php

@@ -48,13 +48,17 @@ protected function configure()
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->get('phpcr.session');
+        $nodeHelper = $this->get('helper.node');
+        $path = $input->getArgument('path');
 
         $versionName = $input->getArgument('versionName');
-        $path = $session->getAbsPath($input->getArgument('path'));
+        $node = $session->getNodeByPathOrIdentifier($path);
+        $nodeHelper->assertNodeIsVersionable($node);
+
         $workspace = $session->getWorkspace();
         $versionManager = $workspace->getVersionManager();
 
-        $history = $versionManager->getVersionHistory($path);
+        $history = $versionManager->getVersionHistory($node->getPath());
         $history->removeVersion($versionName);
     }
 }

src/PHPCR/Shell/Console/Command/Phpcr/VersionRestoreCommand.php

@@ -42,12 +42,16 @@ protected function configure()
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->get('phpcr.session');
+        $nodeHelper = $this->get('helper.node');
+        $path = $input->getArgument('path');
+
+        $node = $session->getNodeByPathOrIdentifier($path);
+        $nodeHelper->assertNodeIsVersionable($node);
 
-        $path = $session->getAbsPath($input->getArgument('path'));
         $versionName = $input->getArgument('versionName');
         $removeExisting = $input->getOption('remove-existing');
         $workspace = $session->getWorkspace();
         $versionManager = $workspace->getVersionManager();
-        $versionManager->restore($removeExisting, $versionName, $path);
+        $versionManager->restore($removeExisting, $versionName, $node->getPath());
     }
 }

src/PHPCR/Shell/Serializer/NodeNormalizer.php

@@ -56,7 +56,7 @@ public function normalize($node, $format = null, array $context = array())
             $propertyName = $property->getName();
 
             if (in_array($property->getType(), array(PropertyType::REFERENCE, PropertyType::WEAKREFERENCE))) {
-                $nodesUuids = array();
+                $nodeUuids = array();
 
                 if (false === is_array($propertyValue)) {
                     $propertyValue = array($propertyValue);
@@ -66,6 +66,10 @@ public function normalize($node, $format = null, array $context = array())
                     $nodeUuids[] = $node->getIdentifier();
                 }
                 $propertyValue = $nodeUuids;
+
+                if (false === $property->isMultiple()) {
+                    $propertyValue = reset($propertyValue);
+                }
             }
 
             $res[$propertyName] = array(