Misc fixes

Author: dantleech

src/PHPCR/Shell/Config/ConfigManager.php

@@ -207,20 +207,19 @@ public function initConfig(OutputInterface $output = null, $noInteraction = fals
             }
 
             if ($this->filesystem->exists($destFile)) {
-                if (null !== $this->questionHelper) {
-                    if (false === $noInteraction) {
-                        $confirmed = $this->questionHelper->askConfirmation(
-                            $output,
-                            '"' . $configFilename . '" already exists, do you want to overwrite it?'
-                        );
-
-                        if (!$confirmed) {
-                            return;
-                        }
+                if (false === $noInteraction) {
+                    $confirmed = $this->questionHelper->askConfirmation(
+                        $output,
+                        '"' . $configFilename . '" already exists, do you want to overwrite it?'
+                    );
+
+                    if (!$confirmed) {
+                        return;
                     }
-                } else {
-                    $log(sprintf('<info>File</info> %s <info> already exists, not overwriting.', $destFile));
                 }
+
+                $log(sprintf('<info>File</info> %s <info> already exists, not overwriting.', $destFile));
+                return;
             }
 
             $this->filesystem->copy($srcFile, $destFile);

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

@@ -22,15 +22,8 @@
  */
 class EmbeddedApplication extends ShellApplication
 {
-    protected $mode;
-
     /**
-     * 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
+     * @param Container $container
      */
     public function __construct(Container $container)
     {
@@ -55,6 +48,6 @@ public function init()
      */
     protected function getDefaultCommand()
     {
-        return $this->mode === PhpcrShell::MODE_EMBEDDED_SHELL ? 'shell:path:show' : 'list';
+        return $this->container->getMode() === PhpcrShell::MODE_EMBEDDED_SHELL ? 'shell:path:show' : 'list';
     }
 }

src/PHPCR/Shell/PhpcrShell.php

@@ -15,6 +15,7 @@
 use PHPCR\SessionInterface;
 use PHPCR\Shell\DependencyInjection\Container;
 use PHPCR\Shell\Console\Application\Shell;
+use PHPCR\Shell\Phpcr\PhpcrSession;
 
 /**
  * PHPCRShell entry point