Encapsualte instantiation in PhpcrShell class

Author: dantleech

bin/phpcrsh

@@ -12,5 +12,5 @@ if (file_exists($file)) {
     exit(1);
 }
 
-$shell = new PHPCR\Shell\Console\Application\SessionApplication();
+$shell = \PHPCR\Shell\PhpcrShell::createShell();
 $shell->run();

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

@@ -4,6 +4,7 @@
 
 use PHPCR\Shell\DependencyInjection\Container;
 use PHPCR\Shell\Console\Helper\PhpcrHelper;
+use PHPCR\Shell\PhpcrShell;
 
 /**
  * Subclass of the full ShellApplication for running as an EmbeddedApplication
@@ -13,35 +14,20 @@
  */
 class EmbeddedApplication extends ShellApplication
 {
-    /**
-     * @deprecated remove after DoctrinePhpcrBundle is upgraded
-     */
-    const MODE_COMMAND = Container::MODE_EMBEDDED_COMMAND;
-
-    /**
-     * @deprecated remove after DoctrinePhpcrBundle is upgraded
-     */
-    const MODE_SHELL = Container::MODE_EMBEDDED_SHELL;
-
     protected $mode;
 
     /**
-     * The $mode can be one of EmbeddedApplication::MODE_SHELL or EmbeddedApplication::MODE_COMMAND.
+     * The $mode can be one of PhpcrShell::MODE_SHELL or PhpcrShell::MODE_COMMAND.
      *
      * - Shell mode initializes the whole environement
      * - Command mode initailizes only enough to run commands
      *
      * @param string $mode
      */
-    public function __construct($mode)
+    public function __construct(Container $container)
     {
-        $this->mode = $mode;
-        $container = new Container($this->mode);
-        parent::__construct($container, SessionApplication::APP_NAME, SessionApplication::APP_VERSION);
+        parent::__construct($container);
         $this->setAutoExit(false);
-
-        // @deprecated This will be removed in 1.0
-        $this->getHelperSet()->set(new PhpcrHelper($container->get('phpcr.session_manager')));
     }
 
     /**
@@ -51,7 +37,7 @@ public function init()
     {
         $this->registerPhpcrCommands();
 
-        if ($this->container->getMode() === self::MODE_SHELL) {
+        if ($this->container->getMode() === PhpcrShell::MODE_EMBEDDED_SHELL) {
             $this->registerShellCommands();
         }
     }
@@ -61,6 +47,6 @@ public function init()
      */
     protected function getDefaultCommand()
     {
-        return $this->mode === self::MODE_SHELL ? 'shell:path:show' : 'list';
+        return $this->mode === PhpcrShell::MODE_EMBEDDED_SHELL ? 'shell:path:show' : 'list';
     }
 }

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

@@ -7,6 +7,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use PHPCR\Shell\Console\Command\ShellCommand;
 use PHPCR\Shell\DependencyInjection\Container;
+use PHPCR\Shell\PhpcrShell;
 
 /**
  * This application wraps a single command which accepts
@@ -16,9 +17,6 @@
  */
 class SessionApplication extends BaseApplication
 {
-    const APP_NAME = 'PHPCRSH';
-    const APP_VERSION = '1.0.0-alpha6';
-
     protected $shellApplication;
 
     /**
@@ -27,10 +25,10 @@ class SessionApplication extends BaseApplication
      */
     public function __construct()
     {
-        parent::__construct(self::APP_NAME, self::APP_VERSION);
+        parent::__construct(PhpcrShell::APP_NAME, PhpcrShell::APP_VERSION);
 
         $container = new Container();
-        $this->shellApplication = $container->get('console.application.shell');
+        $this->shellApplication = $container->get('application');
 
         $command = new ShellCommand($this->shellApplication);
         $command->setApplication($this);

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

@@ -20,6 +20,7 @@
 use PHPCR\Shell\Event\PhpcrShellEvents;
 use PHPCR\Shell\Console\Command\Phpcr\PhpcrShellCommand;
 use PHPCR\Shell\Config\Profile;
+use PHPCR\Shell\PhpcrShell;
 
 /**
  * Main application for PHPCRSH
@@ -50,7 +51,7 @@ class ShellApplication extends Application
      */
     public function __construct($container)
     {
-        parent::__construct(SessionApplication::APP_NAME, SessionApplication::APP_VERSION);
+        parent::__construct(PhpcrShell::APP_NAME, PhpcrShell::APP_VERSION);
         $this->dispatcher = $container->get('event.dispatcher') ? : new EventDispatcher();
         $this->setDispatcher($this->dispatcher);
         $this->container = $container;

src/PHPCR/Shell/DependencyInjection/Container.php

@@ -4,13 +4,10 @@
 
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use PHPCR\Shell\PhpcrShell;
 
 class Container extends ContainerBuilder
 {
-    const MODE_EMBEDDED_SHELL = 'shell';
-    const MODE_EMBEDDED_COMMAND = 'command';
-    const MODE_STANDALONE = 'standalon';
-
     protected $mode;
 
     /**
@@ -22,7 +19,7 @@ class Container extends ContainerBuilder
         'transport.transport.fs' => 'PHPCR\Shell\Transport\Transport\JackalopeFs',
     );
 
-    public function __construct($mode = self::MODE_STANDALONE)
+    public function __construct($mode = PhpcrShell::MODE_STANDALONE)
     {
         parent::__construct();
         $this->mode = $mode;
@@ -97,7 +94,7 @@ public function registerPhpcr()
 
     public function registerEvent()
     {
-        if ($this->mode === self::MODE_STANDALONE) {
+        if ($this->mode === PhpcrShell::MODE_STANDALONE) {
             $this->register(
                 'event.subscriber.profile_loader',
                 'PHPCR\Shell\Subscriber\ProfileLoaderSubscriber'
@@ -148,10 +145,16 @@ public function registerEvent()
 
     public function registerConsole()
     {
-        $this->register('console.application.shell', 'PHPCR\Shell\Console\Application\ShellApplication')
-            ->addArgument(new Reference('container'));
+        if ($this->mode === PhpcrShell::MODE_STANDALONE) {
+            $this->register('application', 'PHPCR\Shell\Console\Application\ShellApplication')
+                ->addArgument(new Reference('container'));
+        } else {
+            $this->register('application', 'PHPCR\Shell\Console\Application\EmbeddedApplication')
+                ->addArgument(new Reference('container'));
+        }
+
         $this->register('console.input.autocomplete', 'PHPCR\Shell\Console\Input\AutoComplete')
-            ->addArgument(new Reference('console.application.shell'))
+            ->addArgument(new Reference('application'))
             ->addArgument(new Reference('phpcr.session'));
     }
 

src/PHPCR/Shell/PhpcrShell.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace PHPCR\Shell;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use PHPCR\Shell\Console\Application\SessionApplication;
+use PHPCR\Shell\PhpcrShell;
+use PHPCR\SessionInterface;
+use PHPCR\Shell\DependencyInjection\Container;
+use PHPCR\Shell\Console\Application\Shell;
+
+/**
+ * PHPCRShell entry point
+ *
+ * @author Daniel Leech <daniel@dantleech.com>
+ */
+class PhpcrShell
+{
+    const APP_NAME = 'PHPCRSH';
+    const APP_VERSION = 'dev-master';
+
+    const MODE_EMBEDDED_SHELL = 'shell';
+    const MODE_EMBEDDED_COMMAND = 'command';
+    const MODE_STANDALONE = 'standalon';
+
+    /**
+     * Create a new embedded shell
+     *
+     * @param SessionInterface $session
+     * @return Shell
+     */
+    public static function createEmbeddedShell(SessionInterface $session)
+    {
+        $container = new Container(self::MODE_EMBEDDED_SHELL);
+        $container->get('phpcr.session_manager')->setSession(new PhpcrSession($session));
+        $application = $container->get('application');
+
+        return new Shell($application);
+    }
+
+    /**
+     * Create a new (non-interactive) embedded application (e.g. for running
+     * single commands)
+     *
+     * @param SessionInterface $session
+     * @return EmbeddedApplication
+     */
+    public static function createEmbeddedApplication(SessionInterface $session)
+    {
+        $container = new Container(self::MODE_EMBEDDED_COMMAND);
+        $container->get('phpcr.session_manager')->setSession(new PhpcrSession($session));
+        $application = $container->get('application');
+
+        return $application;
+    }
+
+    /**
+     * Create a new standalone shell application
+     *
+     * @return SessionApplication
+     */
+    public static function createShell()
+    {
+        return new SessionApplication();
+    }
+}