Various fixes

Author: dantleech

src/PHPCR/Shell/Config/ConfigManager.php

@@ -214,12 +214,11 @@ public function initConfig(OutputInterface $output = null, $noInteraction = fals
                     );
 
                     if (!$confirmed) {
-                        return;
+                        continue;
                     }
+                } 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/Command/Phpcr/SessionExportCommand.php

@@ -22,7 +22,7 @@ class SessionExportCommand extends BasePhpcrCommand
     protected function configure()
     {
         $this->setName('session:export');
-        $this->setDescription('Export the to XML');
+        $this->setDescription('Export the session to XML');
         $this->addArgument('absPath', InputArgument::REQUIRED, 'Path of node to export');
         $this->addArgument('file', InputArgument::REQUIRED, 'File to export to');
         $this->addOption('no-recurse', null, InputOption::VALUE_NONE, 'Do not recurse');

src/PHPCR/Shell/Console/Command/Shell/ConfigInitCommand.php

@@ -33,6 +33,6 @@ public function execute(InputInterface $input, OutputInterface $output)
     {
         $this->output = $output;
         $configHelper = $this->get('config.manager');
-        $configHelper->initConfig($output, $this->get('helper.question'), $input->getOption('no-interaction'));
+        $configHelper->initConfig($output, $input->getOption('no-interaction'));
     }
 }

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

@@ -87,7 +87,7 @@ public function formatQueryResult(QueryResultInterface $result, OutputInterface
 
         $table->render($output);
 
-        if (true === $this->config['execution_time']['query']) {
+        if (true === $this->config['show_execution_time_query']) {
             $output->writeln(sprintf(
                 '%s rows in set (%s sec)',
                 count($result->getRows()),

src/PHPCR/Shell/Resources/config.dist/alias.yml

@@ -56,4 +56,6 @@ versions: version:history {arg1}
 
 # Session commands
 save: session:save
+s: session:save
 refresh: session:refresh
+r: session:refresh