Merge pull request #132 from phpcr/show_prop_size

Show prop size and primary node type + super-type

Author: dantleech

CHANGELOG.md

@@ -19,6 +19,8 @@ dev-master
 
 ### Enhancements
 
+- [node:list] Show primary node type and super-types
+- [node:list] Show property length
 - [autocomplete] Autocomplete now includes command names
 - [references] Show UUIDs when listing reference properties
 - [import/export] Renamed session import and export to `session:import` &

features/all/phpcr_node_list.feature

@@ -92,23 +92,23 @@ Feature: List properites and chidren of current nodeA
         Then the command should not fail
         And I should see the following:
         """
-/tests_general_base/index.txt
+/tests_general_base/index.txt [nt:file] > nt:hierarchyNode
 +-------------+-----------------+--+
 | jcr:content | nt:unstructured |  |
 +-------------+-----------------+--+
-/tests_general_base/idExample
+/tests_general_base/idExample [nt:file] > nt:hierarchyNode
 +--------------+-----------------+--+
 | jcr:content/ | nt:unstructured |  |
 +--------------+-----------------+--+
-/tests_general_base/numberPropertyNode
+/tests_general_base/numberPropertyNode [nt:file] > nt:hierarchyNode
 +-------------+-----------------+--+
 | jcr:content | nt:unstructured |  |
 +-------------+-----------------+--+
-/tests_general_base/NumberPropertyNodeToCompare1
+/tests_general_base/NumberPropertyNodeToCompare1 [nt:file] > nt:hierarchyNode
 +-------------+-----------------+--+
 | jcr:content | nt:unstructured |  |
 +-------------+-----------------+--+
-/tests_general_base/NumberPropertyNodeToCompare2
+/tests_general_base/NumberPropertyNodeToCompare2 [nt:file] > nt:hierarchyNode
 +-------------+-----------------+--+
 | jcr:content | nt:unstructured |  |
 +-------------+-----------------+--+

features/all/phpcr_version_restore.feature

@@ -21,5 +21,5 @@ Feature: Restore a version
         And I execute the "ls" command
         Then I should see the following:
         """
-        | foo                | STRING    | inital
+        | foo                | STRING (9)     | initalbar
         """

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

@@ -100,7 +100,11 @@ public function execute(InputInterface $input, OutputInterface $output)
             $this->renderNode($node, $table, array(), $filter);
 
             if ($table->getNumberOfRows() > 0) {
-                $output->writeln('<path>' . $node->getPath() . '</path>');
+                $output->writeln(sprintf('<path>%s</path> [%s] > %s',
+                    $node->getPath(),
+                    $node->getPrimaryNodeType()->getName(),
+                    implode(', ', $node->getPrimaryNodeType()->getDeclaredSupertypeNames())
+                ));
                 $table->render($output);
             }
         }
@@ -224,7 +228,11 @@ private function renderProperties($currentNode, $table, $spacers, $filter = null
 
             $table->addRow(array(
                 '<property>' . implode('', $spacers). $name . '</property>',
-                '<property-type>' . $this->formatter->getPropertyTypeName($property->getType()) . '</property-type>',
+                sprintf(
+                    '<property-type>%s (%s)</property-type>',
+                    $this->formatter->getPropertyTypeName($property->getType()),
+                    implode(',', (array) $property->getLength())
+                ),
                 $valueCell,
             ));
         }