Instantiate helper in-class

- Do not rely on helper being defined "outside" of the phpcr context.

Author: dantleech

src/PHPCR/Util/Console/Command/BaseCommand.php

@@ -8,10 +8,12 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use PHPCR\Util\Console\Helper\PhpcrCliHelper;
+use PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper;
 
 abstract class BaseCommand extends Command
 {
     protected $phpcrCliHelper;
+    protected $phpcrConsoleDumperHelper;
 
     /**
      * @return SessionInterface
@@ -33,6 +35,23 @@ protected function getPhpcrCliHelper()
         return $this->phpcrCliHelper;
     }
 
+    /** 
+     * @return PhpcrConsoleDumperHelper 
+     */
+    protected function getPhpcrConsoleDumperHelper()
+    {
+        if (!$this->phpcrConsoleDumperHelper) {
+            $this->phpcrConsoleDumperHelper = new PhpcrConsoleDumperHelper();
+        }
+
+        return $this->phpcrConsoleDumperHelper;
+    }
+
+    public function setPhpcrConsoleDumperHelper($consoleDumperHelper)
+    {
+        $this->phpcrConsoleDumperHelper = $consoleDumperHelper;
+    }
+
     /**
      * Hack to enable overriding for unit tests.
      */

src/PHPCR/Util/Console/Command/NodeDumpCommand.php

@@ -76,8 +76,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getPhpcrSession();
-        /** @var $dumperHelper PhpcrConsoleDumperHelper */
-        $dumperHelper = $this->getHelper('phpcr_console_dumper');
+        $dumperHelper = $this->getPhpcrConsoleDumperHelper();
 
         // node to dump
         $identifier = $input->getArgument('identifier');

tests/PHPCR/Tests/Util/Console/Command/BaseCommandTest.php

@@ -82,7 +82,6 @@ public function setUp()
 
         $this->helperSet = new HelperSet(array(
             'session' => new PhpcrHelper($this->session),
-            'phpcr_console_dumper' => $this->dumperHelper,
         ));
 
         $this->phpcrCliHelper = $this->getMockBuilder('PHPCR\Util\Console\Helper\PhpcrCliHelper')

tests/PHPCR/Tests/Util/Console/Command/NodeDumpCommandTest.php

@@ -22,6 +22,13 @@ public function setUp()
         )->disableOriginalConstructor()->getMock();
     }
 
+    protected function addCommand()
+    {
+        $ndCommand = new NodeDumpCommand();
+        $ndCommand->setPhpcrConsoleDumperHelper($this->dumperHelper);
+        $this->application->add($ndCommand);
+    }
+
     public function testCommand()
     {
         $this->dumperHelper
@@ -41,8 +48,7 @@ public function testCommand()
             ->with($this->node1)
         ;
 
-        $this->application->add(new NodeDumpCommand());
-
+        $this->addCommand();
         $this->executeCommand('phpcr:node:dump', array());
     }
 
@@ -67,14 +73,13 @@ public function testCommandIdentifier()
             ->with($this->node1)
         ;
 
-        $this->application->add(new NodeDumpCommand());
-
+        $this->addCommand();
         $this->executeCommand('phpcr:node:dump', array('identifier' => $uuid));
     }
 
     public function testInvalidRefFormat()
     {
-        $this->application->add(new NodeDumpCommand());
+        $this->addCommand();
 
         try {
             $this->executeCommand('phpcr:node:dump', array('--ref-format' => 'xy'));
@@ -93,7 +98,8 @@ public function testNotFound()
             ->will($this->throwException(new ItemNotFoundException()))
         ;
 
-        $this->application->add(new NodeDumpCommand());
+
+        $this->addCommand();
 
         $ct = $this->executeCommand('phpcr:node:dump', array(), 1);
         $this->assertContains('does not exist', $ct->getDisplay());