Cleaning up

Author: dantleech

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -10,11 +10,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\OutputInterface;
-
-use PHPCR\SimpleCredentials;
-
-use PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper;
-use PHPCR\Util\Console\Helper\PhpcrHelper;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 
 use PHPCR\Shell\Console\Command\Phpcr as CommandPhpcr;
 use PHPCR\Shell\Console\Command\Shell as CommandShell;
@@ -25,13 +21,13 @@
 use PHPCR\Shell\Console\Helper\RepositoryHelper;
 use PHPCR\Shell\Console\Helper\ResultFormatterHelper;
 use PHPCR\Shell\Console\Helper\TextHelper;
+use PHPCR\Shell\Console\Helper\PhpcrHelper;
 
-use PHPCR\Shell\Subscriber;
 use PHPCR\Shell\Event;
-use PHPCR\Shell\PhpcrSession;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use PHPCR\Shell\Event\PhpcrShellEvents;
 use PHPCR\Shell\Event\ApplicationInitEvent;
+use PHPCR\Shell\Event\PhpcrShellEvents;
+use PHPCR\Shell\PhpcrSession;
+use PHPCR\Shell\Subscriber;
 
 /**
  * Main application for PHPCRSH
@@ -41,11 +37,8 @@
 class ShellApplication extends Application
 {
     /**
-     * @var \PHPCR\TransportInterface[]
-     */
-    protected $transports;
-
-    /**
+     * True when application has been initialized once
+     *
      * @var boolean
      */
     protected $initialized;
@@ -56,18 +49,16 @@ class ShellApplication extends Application
     protected $sessionInput;
 
     /**
-     * @var SessionInterface
+     * Constructor - name and version inherited from SessionApplication
+     *
+     * {@inheritDoc}
      */
-    private $session;
-
     public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
     {
         parent::__construct($name, $version);
-
         $this->dispatcher = new EventDispatcher();
     }
 
-
     /**
      * The SessionInput is the input used to intialize the shell.
      * It contains the connection parameters.
@@ -94,9 +85,6 @@ public function init()
             );
         }
 
-
-        $this->initializeTransports();
-        $this->initSession();
         $this->registerHelpers();
         $this->registerCommands();
         $this->registerEventListeners();
@@ -112,16 +100,18 @@ public function init()
      */
     private function registerHelpers()
     {
+        $phpcrHelper = new PhpcrHelper($this->sessionInput);
+
         $helpers = array(
             new ConfigHelper(),
-            new EditorHelper($this->getSession()),
-            new NodeHelper($this->getSession()),
-            new PathHelper($this->getSession()),
+            new EditorHelper(),
+            new NodeHelper(),
+            new PathHelper(),
             new PhpcrConsoleDumperHelper(),
-            new PhpcrHelper($this->getSession()),
-            new RepositoryHelper($this->getSession()->getRepository()),
+            new RepositoryHelper($phpcrHelper),
             new ResultFormatterHelper(),
             new TextHelper(),
+            $phpcrHelper,
         );
 
         foreach ($helpers as $helper) {

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

@@ -19,7 +19,7 @@ protected function configure()
         $this->setDescription('Remove the node at path');
         $this->addArgument('path', InputArgument::REQUIRED, 'Path of node');
         $this->setHelp(<<<HERE
-Remove the current node
+Remove the node at the given path.
 HERE
         );
     }

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

@@ -26,6 +26,6 @@ public function execute(InputInterface $input, OutputInterface $output)
         $username = $input->getArgument('userId');
         $password = $input->getArgument('password');
         $workspaceName = $input->getArgument('workspaceName');
-        $this->getApplication()->relogin($username, $password, $workspaceName);
+        $this->getHelper('phpcr')->relogin($username, $password, $workspaceName);
     }
 }

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

@@ -24,6 +24,6 @@ protected function configure()
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $workspaceName = $input->getArgument('name');
-        $this->getApplication()->changeWorkspace($workspaceName);
+        $this->getHelper('phpcr')->changeWorkspace($workspaceName);
     }
 }

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

@@ -5,7 +5,6 @@
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Console\Helper\Helper;
 use PHPCR\NodeInterface;
-use PHPCR\SessionInterface;
 
 /**
  * Helper for nodes
@@ -14,13 +13,6 @@
  */
 class NodeHelper extends Helper
 {
-    protected $session;
-
-    public function __construct(SessionInterface $session)
-    {
-        $this->session = $session;
-    }
-
     public function nodeHasMixinType($node, $mixinTypeName)
     {
         $mixinTypes = $node->getMixinNodeTypes();

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

@@ -3,6 +3,9 @@
 namespace PHPCR\Shell\Console\Helper;
 
 use PHPCR\Shell\PhpcrSession;
+use Symfony\Component\Console\Helper\Helper;
+use Symfony\Component\Console\Input\InputInterface;
+use PHPCR\SimpleCredentials;
 
 /**
  * Helper for managing PHPCR sessions
@@ -32,6 +35,13 @@ class PhpcrHelper extends Helper
      */
     protected $transports = array();
 
+    /**
+     * Lazy initialize PHPCR session
+     *
+     * @var boolean
+     */
+    protected $initialized = false;
+
     /**
      * @param InputInterface $sessionInput
      */
@@ -48,8 +58,19 @@ public function getName()
         return 'phpcr';
     }
 
+    private function init()
+    {
+        if (false === $this->initialized) {
+            $this->initializeTransports();
+            $this->initSession();
+            $this->initialized = true;
+        }
+    }
+
     /**
      * Initialize the PHPCR session
+     *
+     * @access private
      */
     private function initSession()
     {
@@ -62,20 +83,60 @@ private function initSession()
 
         $session = $repository->login($credentials, $this->sessionInput->getOption('phpcr-workspace'));
 
+        // if you are wondering wtf here -- we wrap the PhpcrSession
         if (!$this->session) {
             $this->session = new PhpcrSession($session);
         } else {
             $this->session->setPhpcrSession($session);
         }
     }
 
+    /**
+     * Return the transport as defined in the sessionInput
+     *
+     * @access private
+     */
+    private function getTransport()
+    {
+        $transportName = $this->sessionInput->getOption('transport');
+
+        if (!isset($this->transports[$transportName])) {
+            throw new \InvalidArgumentException(sprintf(
+                'Unknown transport "%s", I have "%s"',
+                $transportName, implode(', ', array_keys($this->transports))
+            ));
+        }
+
+        $transport = $this->transports[$transportName];
+
+        return $transport;
+    }
+
+    /**
+     * Initialize the supported transports.
+     *
+     * @access private
+     */
+    private function initializeTransports()
+    {
+        $transports = array(
+            new \PHPCR\Shell\Transport\DoctrineDbal($this->sessionInput),
+            new \PHPCR\Shell\Transport\Jackrabbit($this->sessionInput),
+        );
+
+        foreach ($transports as $transport) {
+            $this->transports[$transport->getName()] = $transport;;
+        }
+    }
+
     /**
      * Change the current workspace
      *
      * @param string $workspaceName
      */
     public function changeWorkspace($workspaceName)
     {
+        $this->init();
         $this->session->logout();
         $this->sessionInput->setOption('phpcr-workspace', $workspaceName);
         $this->initSession($this->sessionInput);
@@ -90,49 +151,42 @@ public function changeWorkspace($workspaceName)
      */
     public function relogin($username, $password, $workspaceName = null)
     {
-        $this->session->logout();
+        if ($this->session) {
+            $this->session->logout();
+        }
+
         $this->sessionInput->setOption('phpcr-username', $username);
         $this->sessionInput->setOption('phpcr-password', $password);
 
         if ($workspaceName) {
             $this->sessionInput->setOption('phpcr-workspace', $workspaceName);
         }
-        $this->initSession($this->sessionInput);
+
+        $this->init();
     }
 
     /**
-     * Return the transport as defined in the sessionInput
+     * Return the current PHPCR session. We lazy call
+     * initialize.
+     *
+     * @return \PHPCR\SessionInterface
      */
-    private function getTransport()
+    public function getSession()
     {
-        $transportName = $this->sessionInput->getOption('transport');
-
-        if (!isset($this->transports[$transportName])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Unknown transport "%s", I have "%s"',
-                $transportName, implode(', ', array_keys($this->transports))
-            ));
-        }
-
-        $transport = $this->transports[$transportName];
+        $this->init();
 
-        return $transport;
+        return $this->session;
     }
 
     /**
-     * Initialize the supported transports.
+     * Proxy for getting the repository (make mocking easier)
      *
-     * @todo Do this in a lazy way
+     * @return \PHPCR\RepositoryInterface
      */
-    private function initializeTransports()
+    public function getRepository()
     {
-        $transports = array(
-            new \PHPCR\Shell\Transport\DoctrineDbal($this->sessionInput),
-            new \PHPCR\Shell\Transport\Jackrabbit($this->sessionInput),
-        );
+        $this->init();
 
-        foreach ($transports as $transport) {
-            $this->transports[$transport->getName()] = $transport;;
-        }
+        return $this->session->getRepository();
     }
 }

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

@@ -8,22 +8,22 @@
 class RepositoryHelper extends Helper
 {
     /**
-     * @var RepositoryInterface
+     * @var PhpcrHelper
      */
-    protected $repository;
+    protected $phpcrHelper;
 
     /**
      * @var array
      */
     protected $descriptors;
 
-    public function __construct(RepositoryInterface $repository)
+    public function __construct(PhpcrHelper $phpcrHelper)
     {
-        $this->repository = $repository;
+        $this->phpcrHelper = $phpcrHelper;
     }
 
     /**
-     * Return true if the repository supports the given descriptor
+     * Return true if the phpcrHelper supports the given descriptor
      * which relates to a descriptor key
      *
      * @param string $descriptor
@@ -62,8 +62,10 @@ public function hasDescriptor($descriptor, $value = null)
     private function loadDescriptors()
     {
         if (null === $this->descriptors) {
-            foreach ($this->repository->getDescriptorKeys() as $key) {
-                $this->descriptors[$key] = $this->repository->getDescriptor($key);
+            $repository = $this->phpcrHelper->getRepository();
+
+            foreach ($repository->getDescriptorKeys() as $key) {
+                $this->descriptors[$key] = $repository->getDescriptor($key);
             }
         }
     }