Fixed Reference display in node:list

Author: dantleech

CHANGELOG.md

@@ -16,6 +16,7 @@ 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

src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php

@@ -96,81 +96,68 @@ public function formatQueryResult(QueryResultInterface $result, OutputInterface
         }
     }
 
-    public function normalizeValue($value)
+    public function formatValue(PropertyInterface $property, $showBinary = false)
     {
-        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);
+                    }
 
-        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[] = $this->textHelper->truncate($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)