Repaired embedded application

Author: dantleech

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

@@ -4,6 +4,7 @@
 
 use PHPCR\Shell\Subscriber;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use PHPCR\Shell\DependencyInjection\Container;
 
 /**
  * Subclass of the full ShellApplication for running as an EmbeddedApplication
@@ -13,10 +14,15 @@
  */
 class EmbeddedApplication extends ShellApplication
 {
-    const MODE_SHELL = 'shell';
-    const MODE_COMMAND = 'command';
+    /**
+     * @deprecated remove after DoctrinePhpcrBundle is upgraded
+     */
+    const MODE_COMMAND = Container::MODE_EMBEDDED_COMMAND;
 
-    protected $mode = self::MODE_SHELL;
+    /**
+     * @deprecated remove after DoctrinePhpcrBundle is upgraded
+     */
+    const MODE_SHELL = Container::MODE_EMBEDDED_SHELL;
 
     /**
      * The $mode can be one of EmbeddedApplication::MODE_SHELL or EmbeddedApplication::MODE_COMMAND.
@@ -26,10 +32,10 @@ class EmbeddedApplication extends ShellApplication
      *
      * @param string $mode
      */
-    public function __construct(ContainerInterface $container, $mode)
+    public function __construct($mode)
     {
+        $container = new Container($mode);
         parent::__construct($container, SessionApplication::APP_NAME, SessionApplication::APP_VERSION);
-        $this->mode = $mode;
         $this->setAutoExit(false);
     }
 
@@ -44,7 +50,7 @@ public function init()
 
         $this->registerPhpcrCommands();
 
-        if ($this->mode === self::MODE_SHELL) {
+        if ($this->container->getMode() === self::MODE_SHELL) {
             $this->registerShellCommands();
         }
 
@@ -58,16 +64,4 @@ protected function getDefaultCommand()
     {
         return 'shell:path:show';
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function registerEventListeners()
-    {
-        throw new \Exception('Implement me');
-        $this->dispatcher->addSubscriber(new Subscriber\ProfileFromSessionInputSubscriber());
-        $this->dispatcher->addSubscriber(new Subscriber\ExceptionSubscriber());
-        $this->dispatcher->addSubscriber(new Subscriber\AliasSubscriber($this->getHelperSet()));
-        $this->dispatcher->addSubscriber(new Subscriber\AutoSaveSubscriber());
-    }
 }

src/PHPCR/Shell/DependencyInjection/Container.php

@@ -7,6 +7,12 @@
 
 class Container extends ContainerBuilder
 {
+    const MODE_EMBEDDED_SHELL = 'shell';
+    const MODE_EMBEDDED_COMMAND = 'command';
+    const MODE_STANDALONE = 'standalon';
+
+    protected $mode;
+
     /**
      * @var array Transports
      */
@@ -15,9 +21,11 @@ class Container extends ContainerBuilder
         'transport.transport.jackrabbit' => 'PHPCR\Shell\Transport\Transport\Jackrabbit',
     );
 
-    public function __construct()
+    public function __construct($mode = self::MODE_STANDALONE)
     {
         parent::__construct();
+        $this->mode = $mode;
+
         $this->registerHelpers();
         $this->registerConfig();
         $this->registerPhpcr();
@@ -75,27 +83,11 @@ public function registerEvent()
     {
         $ids = array();
         $subscribers = array();
+
         $subscribers[] = $this->register(
             $ids[] = 'event.subscriber.profile_from_session_input', 
             'PHPCR\Shell\Subscriber\ProfileFromSessionInputSubscriber'
         );
-        $subscribers[] = $this->register(
-            $ids[] = 'event.subscriber.profile_writer', 
-            'PHPCR\Shell\Subscriber\ProfileWriterSubscriber'
-        )
-            ->addArgument(new Reference('config.profile_loader'))
-            ->addArgument(new Reference('helper.question'));
-        $subscribers[] = $this->register(
-            $ids[] = 'event.subscriber.profile_loader', 
-            'PHPCR\Shell\Subscriber\ProfileLoaderSubscriber'
-        )
-            ->addArgument(new Reference('config.profile_loader'))
-            ->addArgument(new Reference('helper.question'));
-        $subscribers[] = $this->register(
-            $ids[] = 'event.subscriber.config_init', 
-            'PHPCR\Shell\Subscriber\ConfigInitSubscriber'
-        )
-            ->addArgument(new Reference('config.manager'));
         $subscribers[] = $this->register(
             $ids[] = 'event.subscriber.exception', 
             'PHPCR\Shell\Subscriber\ExceptionSubscriber'
@@ -104,12 +96,37 @@ public function registerEvent()
             $ids[] = 'event.subscriber.alias', 
             'PHPCR\Shell\Subscriber\AliasSubscriber'
         )
-            ->addArgument(new Reference('config.manager'));
+        ->addArgument(new Reference('config.manager'));
+
+        if ($this->mode === self::MODE_STANDALONE) {
+            $subscribers[] = $this->register(
+                $ids[] = 'event.subscriber.profile_writer', 
+                'PHPCR\Shell\Subscriber\ProfileWriterSubscriber'
+            )
+                ->addArgument(new Reference('config.profile_loader'))
+                ->addArgument(new Reference('helper.question'));
+            $subscribers[] = $this->register(
+                $ids[] = 'event.subscriber.profile_loader', 
+                'PHPCR\Shell\Subscriber\ProfileLoaderSubscriber'
+            )
+                ->addArgument(new Reference('config.profile_loader'))
+                ->addArgument(new Reference('helper.question'));
+            $subscribers[] = $this->register(
+                $ids[] = 'event.subscriber.config_init', 
+                'PHPCR\Shell\Subscriber\ConfigInitSubscriber'
+            )
+                ->addArgument(new Reference('config.manager'));
+        }
 
         $dispatcher = $this->register('event.dispatcher', 'Symfony\Component\EventDispatcher\EventDispatcher');
 
         foreach ($ids as $id) {
             $dispatcher->addMethodCall('addSubscriber', array(new Reference($id)));
         }
     }
+
+    public function getMode()
+    {
+        return $this->mode;
+    }
 }