Merge pull request #153 from phpcr/various_fixes

dantleech · dantleech · commit 9d3aee95e0a8 · 2015-05-01T15:27:58.000+02:00
Various fixes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,12 @@ dev-master
 - [embedded] No exit code returned
 - [profile] Profile configuration overwritten by session parameters
 - [node:list] Incorrect node count
+- [node:list] Single references not showing path
+- [node:edit] Multivalue references encoded as arrays when editing
+- [node:edit] Fixed undefined variable
+- [version] Versioning commands can use relative paths
+- [node:property:show] Text fields are truncated
+- [profile] Workspace given from CLI does not override profile workspace
 
 beta1
 -----
diff --git a/features/all/phpcr_version_history.feature b/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:
         """
diff --git a/features/all/phpcr_version_remove.feature b/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             |
         """
diff --git a/features/all/phpcr_version_restore.feature b/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 |
diff --git a/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php b/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php
@@ -45,6 +45,7 @@ public function it_should_load_data_into_a_given_profile(
         Filesystem $filesystem
     )
     {
+        $profile->get('phpcr', 'workspace')->willReturn('default');
         $profile->getName()->willReturn('one');
         $profile->set('transport', array(
             'name' => 'foobar',
diff --git a/src/PHPCR/Shell/Config/ProfileLoader.php b/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)
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeCopyCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodeCopyCommand.php
@@ -45,7 +45,6 @@ public function execute(InputInterface $input, OutputInterface $output)
         $srcWorkspace = $input->getArgument('srcWorkspace');
 
         $workspace = $session->getWorkspace();
-
         $workspace->copy($srcAbsPath, $destAbsPath, $srcWorkspace);
     }
 }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodePropertyShowCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodePropertyShowCommand.php
@@ -58,10 +58,11 @@ public function execute(InputInterface $input, OutputInterface $output)
 
             foreach ($properties as $property) {
                 $output->writeln(sprintf(
-                    '<path>%s/</path><localname>%s</localname>: %s',
-                    $pathHelper->getParentPath($property->getPath()),
+                    '<path>%s%s</path><localname>%s</localname>: %s',
+                    $parentPath = $pathHelper->getParentPath($property->getPath()),
+                    $parentPath != '/' ? '/' : '',
                     $pathHelper->getNodeName($property->getPath()),
-                    $resultFormatHelper->formatValue($property, true)
+                    $resultFormatHelper->formatValue($property, true, false)
                 ));
             }
         }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckinCommand.php b/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());
     }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckoutCommand.php b/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());
     }
 }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckpointCommand.php b/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());
     }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionHistoryCommand.php b/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();
 
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionRemoveCommand.php b/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);
     }
 }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionRestoreCommand.php b/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());
     }
 }
diff --git a/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php b/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php
@@ -79,7 +79,7 @@ public function formatQueryResult(QueryResultInterface $result, OutputInterface
             ), $row->getValues());
 
             foreach ($values as &$value) {
-                $value = $this->normalizeValue($value);
+                $value = $this->textHelper->truncate($value, 255);
             }
 
             $table->addRow($values);
@@ -96,81 +96,69 @@ public function formatQueryResult(QueryResultInterface $result, OutputInterface
         }
     }
 
-    public function normalizeValue($value)
+    public function formatValue(PropertyInterface $property, $showBinary = false, $truncate = true)
     {
-        if (is_array($value)) {
-            if (empty($value)) {
-                return '';
-            }
-            $array = $value;
-            $values = array();
-
-            foreach ($array as $i => $value) {
-                if ($value instanceof NodeInterface) {
-                    $uuid = $value->getIdentifier();
-                    $value = $value->getPath();
-                    if ($uuid) {
-                        $value .= ' (' . $uuid . ')';
-                    }
-                } elseif (is_object($value)) {
-                    $value = '<UNKNOWN OBJECT>';
-                } else {
-                    $value = $value;
-                }
-                $value = '[' . $i . '] ' . $this->textHelper->truncate($value, 255);
-                $values[] = $value;
-            }
-
-            return implode("\n", $values);
+        $values = $property->getValue();
+        if (false === $property->isMultiple()) {
+            $values = array($values);
         }
+        $return = array();
+
+        foreach ($values as $value) {
+            switch (intval($property->getType())) {
+                case PropertyType::UNDEFINED :
+                    $return[] = '#UNDEFINED#';
+                case PropertyType::BINARY :
+                    if ($showBinary) {
+                        $lines = array();
+                        $pointer = $value;
+                        while (($line = fgets($pointer)) !== false) {
+                            $lines[] = $line;
+                        }
+
+                        $return[] = implode('', $lines);
+                        break;
+                    }
 
-        if ($value instanceof \DateTime) {
-            return $value->format('c');
+                    return '(binary data)';
+                case PropertyType::BOOLEAN :
+                    $return[] = $value ? 'true' : 'false';
+                    break;
+                case PropertyType::DATE :
+                    $return[] = $value->format('c');
+                    break;
+                case PropertyType::REFERENCE :
+                case PropertyType::WEAKREFERENCE :
+                    $return[] = sprintf(
+                        '%s (%s)',
+                        $this->textHelper->truncate($value->getPath(), 255),
+                        $value->getIdentifier()
+                    );
+                    break;
+                case PropertyType::URI :
+                case PropertyType::STRING :
+                    $return[] = $truncate ? $this->textHelper->truncate($value) : $value;
+                    break;
+                case PropertyType::NAME :
+                case PropertyType::LONG :
+                case PropertyType::DOUBLE :
+                case PropertyType::DECIMAL :
+                case PropertyType::PATH :
+                    $return[] = $value;
+                    break;
+                default:
+                    throw new \RuntimeException('Unknown type ' . $property->getType());
+            }
         }
 
-        return $this->textHelper->truncate($value);
-    }
-
-    public function formatValue(PropertyInterface $value, $showBinary = false)
-    {
-        if (is_array($value->getValue())) {
-            return $this->normalizeValue($value->getValue());
+        if ($property->isMultiple()) {
+            return implode("\n", array_map(function ($value) {
+                static $index = 0;
+                return sprintf('<comment>[%d]</comment> %s', $index++, $value);
+            }, $return));
         }
 
-        switch (intval($value->getType())) {
-            case PropertyType::UNDEFINED :
-                return '#UNDEFINED#';
-            case PropertyType::BINARY :
-                if ($showBinary) {
-                    $lines = array();
-                    $pointer = $value->getValue();
-                    while (($line = fgets($pointer)) !== false) {
-                        $lines[] = $line;
-                    }
-
-                    return implode('', $lines);
-                }
-
-                return '(binary data)';
-            case PropertyType::BOOLEAN :
-                return $value->getValue() ? 'true' : 'false';
-            case PropertyType::DATE :
-                return $value->getValue()->format('c');
-            case PropertyType::REFERENCE :
-            case PropertyType::WEAKREFERENCE :
-                return $value->getValue()->getIdentifier();
-            case PropertyType::URI :
-            case PropertyType::STRING :
-                return $this->textHelper->truncate($value->getValue());
-            case PropertyType::NAME :
-            case PropertyType::LONG :
-            case PropertyType::DOUBLE :
-            case PropertyType::DECIMAL :
-            case PropertyType::PATH :
-                return $value->getValue();
-            default:
-                throw new \RuntimeException('Unknown type ' . $value->getType());
-        }
+        return implode("\n", $return);
     }
 
     public function formatNodePropertiesInline(NodeInterface $node)
diff --git a/src/PHPCR/Shell/Serializer/NodeNormalizer.php b/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(

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public function it_should_load_data_into_a_given_profile(`
`45`	`45`	`Filesystem $filesystem`
`46`	`46`	`)`
`47`	`47`	`{`
	`48`	`+ $profile->get('phpcr', 'workspace')->willReturn('default');`
`48`	`49`	`$profile->getName()->willReturn('one');`
`49`	`50`	`$profile->set('transport', array(`
`50`	`51`	`'name' => 'foobar',`
Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,15 @@ public function loadProfile(Profile $profile)`
`80`	`80`	`$profile->set('transport', $data['transport']);`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ $profileWorkspace = $profile->get('phpcr', 'workspace');`
`83`	`84`	`if (isset($data['phpcr'])) {`
`84`	`85`	`$profile->set('phpcr', $data['phpcr']);`
`85`	`86`	`}`
	`87`	`+`
	`88`	`+ // workspace argument overrides profile workspace`
	`89`	`+ if ($profileWorkspace && $profileWorkspace !== 'default') {`
	`90`	`+ $profile->set('phpcr', 'workspace', $profileWorkspace);`
	`91`	`+ }`
`86`	`92`	`}`
`87`	`93`
`88`	`94`	`public function saveProfile(Profile $profile, $overwrite = false)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ public function execute(InputInterface $input, OutputInterface $output)`
`45`	`45`	`$srcWorkspace = $input->getArgument('srcWorkspace');`
`46`	`46`
`47`	`47`	`$workspace = $session->getWorkspace();`
`48`		`-`
`49`	`48`	`$workspace->copy($srcAbsPath, $destAbsPath, $srcWorkspace);`
`50`	`49`	`}`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,11 @@ public function execute(InputInterface $input, OutputInterface $output)`
`58`	`58`
`59`	`59`	`foreach ($properties as $property) {`
`60`	`60`	`$output->writeln(sprintf(`
`61`		`- '<path>%s/</path><localname>%s</localname>: %s',`
`62`		`- $pathHelper->getParentPath($property->getPath()),`
	`61`	`+ '<path>%s%s</path><localname>%s</localname>: %s',`
	`62`	`+ $parentPath = $pathHelper->getParentPath($property->getPath()),`
	`63`	`+ $parentPath != '/' ? '/' : '',`
`63`	`64`	`$pathHelper->getNodeName($property->getPath()),`
`64`		`- $resultFormatHelper->formatValue($property, true)`
	`65`	`+ $resultFormatHelper->formatValue($property, true, false)`
`65`	`66`	`));`
`66`	`67`	`}`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function execute(InputInterface $input, OutputInterface $output)`
`68`	`68`	`$node = $session->getNodeByPathOrIdentifier($path);`
`69`	`69`	`$nodeHelper->assertNodeIsVersionable($node);`
`70`	`70`
`71`		`- $version = $versionManager->checkin($path);`
	`71`	`+ $version = $versionManager->checkin($node->getPath());`
`72`	`72`
`73`	`73`	`$output->writeln('Version: ' . $version->getName());`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,6 @@ public function execute(InputInterface $input, OutputInterface $output)`
`54`	`54`	`$nodeHelper->assertNodeIsVersionable($node);`
`55`	`55`
`56`	`56`	`$versionManager = $workspace->getVersionManager();`
`57`		`- $version = $versionManager->checkout($absPath);`
	`57`	`+ $version = $versionManager->checkout($node->getPath());`
`58`	`58`	`}`
`59`	`59`	`}`