Fixed specs

Author: dantleech

CHANGELOG.md

@@ -4,6 +4,11 @@ Changelog
 dev-master
 ----------
 
+### BC Break
+
+- [DoctrinePhpcrBundle] Shell must now be initiated in a different way in
+  embedded mode. The DoctrinePhpcrBundle will need to be updated.
+
 ### Bug fixes
 
 - [config] Do not override CLI options with profile options

spec/PHPCR/Shell/Console/Application/EmbeddedApplicationSpec.php

@@ -5,14 +5,16 @@
 use PhpSpec\ObjectBehavior;
 use PHPCR\Shell\Console\Application\EmbeddedApplication;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use PHPCR\Shell\PhpcrShell;
+use PHPCR\Shell\DependencyInjection\Container;
 
 class EmbeddedApplicationSpec extends ObjectBehavior
 {
     public function let(
-        ContainerInterface $container
+        Container $container
     )
     {
-        $this->beConstructedWith($container, EmbeddedApplication::MODE_COMMAND);
+        $this->beConstructedWith($container);
     }
 
     public function it_is_initializable()

spec/PHPCR/Shell/Console/Application/ShellApplicationSpec.php

@@ -5,14 +5,15 @@
 use PhpSpec\ObjectBehavior;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use PHPCR\Shell\Console\Application\EmbeddedApplication;
+use PHPCR\Shell\PhpcrShell;
 
 class ShellApplicationSpec extends ObjectBehavior
 {
     public function let(
         ContainerInterface $container
     )
     {
-        $this->beConstructedWith($container, EmbeddedApplication::MODE_COMMAND);
+        $this->beConstructedWith($container, PhpcrShell::MODE_EMBEDDED_COMMAND);
     }
 
     public function it_is_initializable()

src/PHPCR/Shell/Config/Config.php

@@ -36,11 +36,12 @@ public function offsetGet($offset)
     {
         if (isset($this->data[$offset])) {
             $value = $this->data[$offset];
+
             if (is_array($value)) {
                 return new self($value);
-            } else {
-                return $value;
             }
+
+            return $value;
         }
     }
 

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

@@ -18,7 +18,6 @@ class Shell
     private $output;
     private $hasReadline;
     private $prompt;
-    private $processIsolation;
 
     /**
      * Constructor.
@@ -35,7 +34,6 @@ public function __construct(Application $application)
         $this->history = getenv('HOME').'/.history_'.$application->getName();
         $this->output = new ConsoleOutput();
         $this->prompt = $application->getName().' > ';
-        $this->processIsolation = false;
     }
 
     /**
@@ -129,14 +127,4 @@ private function readline()
 
         return $line;
     }
-
-    public function getProcessIsolation()
-    {
-        return $this->processIsolation;
-    }
-
-    public function setProcessIsolation($processIsolation)
-    {
-        $this->processIsolation = (Boolean) $processIsolation;
-    }
 }

src/PHPCR/Shell/Test/EmbeddedContext.php

@@ -4,23 +4,25 @@
 
 use PHPCR\Shell\Console\Application\EmbeddedApplication;
 use PHPCR\Shell\Phpcr\PhpcrSession;
+use PHPCR\Shell\PhpcrShell;
+use PHPCR\Shell\DependencyInjection\Container;
 
 /**
- * Features context.
+ * Features context
+ *
+ * Start the shell in the embedded context
  */
 class EmbeddedContext extends ContextBase
 {
-    private $application;
-
     protected function createTester()
     {
         // embbed a new session
         $session = $this->getSession(null, true);
+        $container = new Container(PhpcrShell::MODE_EMBEDDED_SHELL);
+        $container->get('phpcr.session_manager')->setSession(new PhpcrSession($session));
+        $application = $container->get('application');
 
-        $this->application = new EmbeddedApplication(EmbeddedApplication::MODE_SHELL);
-        $this->application->getHelperSet()->get('phpcr')->setSession(new PhpcrSession($session));
-
-        $tester = new ApplicationTester($this->application);
+        $tester = new ApplicationTester($application);
 
         return $tester;
     }