Command node:list (ls): Fix wrong node counter

middlebrain · middlebrain · commit 6f811d866775 · 2018-09-02T13:02:05.000+02:00
The displayed node counter for the 'ls' command is always set to 1.
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeListCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodeListCommand.php
@@ -124,7 +124,6 @@ public function execute(InputInterface $input, OutputInterface $output)
             $this->renderNode($node, $table, [], $filter);
 
             if ($table->getNumberOfRows() > 0) {
-                $this->nbNodes++;
                 $output->writeln(sprintf('<pathbold>%s</pathbold> [%s] > %s',
                     $node->getPath(),
                     $node->getPrimaryNodeType()->getName(),
@@ -204,9 +203,10 @@ private function renderChildren($currentNode, $table, $spacers, $filter = null)
                     $newSpacers[] = '| ';
                 }
 
-                $this->nbNodes++;
                 $this->renderNode($child, $table, $newSpacers);
             }
+
+            $this->nbNodes++;
         }
 
         if ($this->showTemplate) {

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,6 @@ public function execute(InputInterface $input, OutputInterface $output)`
`124`	`124`	`$this->renderNode($node, $table, [], $filter);`
`125`	`125`
`126`	`126`	`if ($table->getNumberOfRows() > 0) {`
`127`		`- $this->nbNodes++;`
`128`	`127`	`$output->writeln(sprintf('<pathbold>%s</pathbold> [%s] > %s',`
`129`	`128`	`$node->getPath(),`
`130`	`129`	`$node->getPrimaryNodeType()->getName(),`
`@@ -204,9 +203,10 @@ private function renderChildren($currentNode, $table, $spacers, $filter = null)`
`204`	`203`	`$newSpacers[] = '\| ';`
`205`	`204`	`}`
`206`	`205`
`207`		`- $this->nbNodes++;`
`208`	`206`	`$this->renderNode($child, $table, $newSpacers);`
`209`	`207`	`}`
	`208`	`+`
	`209`	`+ $this->nbNodes++;`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`if ($this->showTemplate) {`