Fixed node count

Author: dantleech

CHANGELOG.md

@@ -13,6 +13,7 @@ dev-master
 
 - [embedded] No exit code returned
 - [profile] Profile configuration overwritten by session parameters
+- [node:list] Incorrect node count
 
 beta1
 -----

features/all/phpcr_node_list.feature

@@ -135,3 +135,11 @@ Feature: List properites and chidren of current nodeA
         | numberPropertyNode/ | nt:file | +jcr:content |
         +---------------------+---------+--------------+
         """
+
+    Scenario: Correct node count
+        Given I execute the "node:list /tests_general_base/*/jcr:content" command
+        Then the command should not fail
+        And I should see the following:
+        """
+        5 nodes in set
+        """

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

@@ -100,6 +100,7 @@ public function execute(InputInterface $input, OutputInterface $output)
             $this->renderNode($node, $table, array(), $filter);
 
             if ($table->getNumberOfRows() > 0) {
+                $this->nbNodes++;
                 $output->writeln(sprintf('<path>%s</path> [%s] > %s',
                     $node->getPath(),
                     $node->getPrimaryNodeType()->getName(),
@@ -120,7 +121,6 @@ public function execute(InputInterface $input, OutputInterface $output)
 
     private function renderNode($currentNode, $table, $spacers = array(), $filter = null)
     {
-        $this->nbNodes++;
         if ($this->showChildren) {
             $this->renderChildren($currentNode, $table, $spacers, $filter);
         }
@@ -173,11 +173,12 @@ private function renderChildren($currentNode, $table, $spacers, $filter = null)
             if (count($spacers) < $this->maxLevel) {
                 $newSpacers = $spacers;
                 if ($isLast) {
-                    $newSpacers[] = '  ';
+                    $newSpacers[] = ': ';
                 } else {
                     $newSpacers[] = '| ';
                 }
 
+                $this->nbNodes++;
                 $this->renderNode($child, $table, $newSpacers);
             }
         }