Load the profile after setting the config from the Input

Author: dantleech

CHANGELOG.md

@@ -8,6 +8,7 @@ dev-master
 ### Bug fixes
 
 - [embedded] No exit code returned
+- [profile] Profile configuration overwritten by session parameters
 
 beta1
 -----

src/PHPCR/Shell/Config/Profile.php

@@ -80,7 +80,7 @@ public function get($domain, $key = null)
         $this->validateDomain($domain);
 
         if (null === $key) {
-            return $this->profile[$domain];
+            return new Config($this->profile[$domain]);
         }
 
         if (!isset($this->profile[$domain][$key])) {

src/PHPCR/Shell/DependencyInjection/Container.php

@@ -104,6 +104,11 @@ public function registerPhpcr()
     public function registerEvent()
     {
         if ($this->mode === PhpcrShell::MODE_STANDALONE) {
+            $this->register(
+                'event.subscriber.profile_from_session_input',
+                'PHPCR\Shell\Subscriber\ProfileFromSessionInputSubscriber'
+            )->addTag('event.subscriber');
+
             $this->register(
                 'event.subscriber.profile_loader',
                 'PHPCR\Shell\Subscriber\ProfileLoaderSubscriber'
@@ -112,11 +117,6 @@ public function registerEvent()
                 ->addArgument(new Reference('helper.question'))
                 ->addTag('event.subscriber');
 
-            $this->register(
-                'event.subscriber.profile_from_session_input',
-                'PHPCR\Shell\Subscriber\ProfileFromSessionInputSubscriber'
-            )->addTag('event.subscriber');
-
             $this->register(
                 'event.subscriber.profile_writer',
                 'PHPCR\Shell\Subscriber\ProfileWriterSubscriber'

src/PHPCR/Shell/Transport/Transport/DoctrineDbal.php

@@ -14,6 +14,7 @@
 use Doctrine\DBAL\DriverManager;
 use Jackalope\RepositoryFactoryDoctrineDBAL;
 use PHPCR\Shell\Transport\TransportInterface;
+use PHPCR\Shell\Config\Config;
 
 class DoctrineDbal implements TransportInterface
 {
@@ -22,7 +23,7 @@ public function getName()
         return 'doctrine-dbal';
     }
 
-    public function getRepository(array $config)
+    public function getRepository(Config $config)
     {
         $connection = DriverManager::getConnection($ops = array(
             'user' => $config['db_username'],

src/PHPCR/Shell/Transport/Transport/JackalopeFs.php

@@ -13,6 +13,7 @@
 
 use PHPCR\Shell\Transport\TransportInterface;
 use Jackalope\RepositoryFactoryFilesystem;
+use PHPCR\Shell\Config\Config;
 
 class JackalopeFs implements TransportInterface
 {
@@ -21,7 +22,7 @@ public function getName()
         return 'jackalope-fs';
     }
 
-    public function getRepository(array $config)
+    public function getRepository(Config $config)
     {
         $params = array(
             'path'  => $config['repo_path'],

src/PHPCR/Shell/Transport/Transport/Jackrabbit.php

@@ -13,6 +13,7 @@
 
 use Jackalope\RepositoryFactoryJackrabbit;
 use PHPCR\Shell\Transport\TransportInterface;
+use PHPCR\Shell\Config\Config;
 
 class Jackrabbit implements TransportInterface
 {
@@ -21,7 +22,7 @@ public function getName()
         return 'jackrabbit';
     }
 
-    public function getRepository(array $config)
+    public function getRepository(Config $config)
     {
         $params = array(
             'jackalope.jackrabbit_uri'  => $config['repo_url'],

src/PHPCR/Shell/Transport/TransportInterface.php

@@ -11,6 +11,8 @@
 
 namespace PHPCR\Shell\Transport;
 
+use PHPCR\Shell\Config\Config;
+
 /**
  * All phpcr-shell transports must implement this interface
  *
@@ -20,5 +22,5 @@ interface TransportInterface
 {
     public function getName();
 
-    public function getRepository(array $config);
+    public function getRepository(Config $config);
 }