Merge pull request #137 from phpcr/profile_overwritten

Load the profile after setting the config from the Input

Author: dantleech

.travis.yml

@@ -9,6 +9,7 @@ php:
     - 5.4
 
 before_script:
+    - composer self-update
     - composer require "symfony/symfony" "2.6.*" --no-update
     - composer install
     - bash tests/bin/travis_jackrabbit.sh

CHANGELOG.md

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

behat.yml

@@ -14,3 +14,8 @@ default:
                 - PHPCR\Shell\Test\EmbeddedContext
             paths:
                 - features/all
+        cli:
+            contexts:
+                - PHPCR\Shell\Test\CliContext
+            paths:
+                - features/cli

features/all/phpcr_node_edit.feature

@@ -7,7 +7,7 @@ Feature: Edit a node
         Given that I am logged in as "testuser"
         And the "cms.xml" fixtures are loaded
 
-    Scenario: Make a nutral edit
+    Scenario: Make a neutral edit
         Given I have an editor which produces the following:
         """"
         weight:
@@ -91,7 +91,7 @@ Feature: Edit a node
         And I save the session
         Then the command should not fail
         And the property "/cms/products/product1/weight" should have type "Long" and value "10"
-        And the property "/cms/products/product1/cost" should have type "Long" and value "100"
+        And the property "/cms/products/product1/cost" should have type "Double" and value "100"
         And the property "/cms/products/product1/size" should have type "String" and value "XXL"
         And the property "/cms/products/product1/name" should have type "String" and value "Product One"
         And the property "/cms/products/product1/jcr:primaryType" should have type "Name" and value "nt:unstructured"

features/cli/doctrine-dbal.feature

@@ -0,0 +1,31 @@
+Feature: Connect to a doctrine dbal repository
+    In order to use the jackalope doctrine-dbal repository
+    As a user
+    I need to be able to connect to it
+
+    Background:
+        Given I initialize doctrine dbal
+
+    Scenario: Connect to doctrine-dbal session
+        Given I run PHPCR shell with "--transport=doctrine-dbal --db-driver=pdo_sqlite --db-path=./app.sqlite --command='ls'"
+        Then the command should not fail
+
+    Scenario: Connect to doctrine-dbal session create a new profile
+        Given I run PHPCR shell with "--transport=doctrine-dbal --db-driver=pdo_sqlite --db-path=./app.sqlite --profile=new --no-interaction --command='ls'"
+        Then the command should not fail
+
+    Scenario: Connect to an existing profile
+        Given the following profile "phpcrtest" exists:
+        """
+        transport:
+            name: doctrine-dbal
+            db_name: phpcrtest
+            db_path: app.sqlite
+            db_driver: pdo_sqlite
+        phpcr:
+            workspace: default
+            username: admin
+            password: admin
+        """
+        And I run PHPCR shell with "--profile=phpcrtest --no-interaction --command='ls'"
+        Then the command should not fail

features/fixtures/jackalope-doctrine-dbal-cli-config.php

@@ -0,0 +1,39 @@
+<?php
+$dbConn = \Doctrine\DBAL\DriverManager::getConnection(array(
+    'driver'    => 'pdo_sqlite',
+    'dbname'    => 'test',
+    'path'      => __DIR__.'/app.sqlite',
+));
+
+/*
+ * configuration
+ */
+$workspace  = 'default'; // phpcr workspace to use
+$user       = 'admin';
+$pass       = 'admin';
+
+$factory = new \Jackalope\RepositoryFactoryDoctrineDBAL();
+$repository = $factory->getRepository(array('jackalope.doctrine_dbal_connection' => $dbConn));
+
+$credentials = new \PHPCR\SimpleCredentials($user, $pass);
+
+/* only create a session if this is not about the server control command */
+if (isset($argv[1])
+    && $argv[1] != 'jackalope:init:dbal'
+    && $argv[1] != 'list'
+    && $argv[1] != 'help'
+) {
+    $session = $repository->login($credentials, $workspace);
+
+    $helperSet = new \Symfony\Component\Console\Helper\HelperSet(array(
+        'dialog' => new \Symfony\Component\Console\Helper\DialogHelper(),
+        'phpcr' => new \PHPCR\Util\Console\Helper\PhpcrHelper($session),
+        'phpcr_console_dumper' => new \PHPCR\Util\Console\Helper\PhpcrConsoleDumperHelper(),
+    ));
+} else if (isset($argv[1]) && $argv[1] == 'jackalope:init:dbal') {
+    // special case: the init command needs the db connection, but a session is impossible if the db is not yet initialized
+    $helperSet = new \Symfony\Component\Console\Helper\HelperSet(array(
+        'connection' => new \Jackalope\Tools\Console\Helper\DoctrineDbalHelper($dbConn)
+    ));
+}
+

spec/PHPCR/Shell/Config/ProfileSpec.php

@@ -12,6 +12,7 @@
 namespace spec\PHPCR\Shell\Config;
 
 use PhpSpec\ObjectBehavior;
+use PHPCR\Shell\Config\Config;
 
 class ProfileSpec extends ObjectBehavior
 {
@@ -39,9 +40,7 @@ public function it_has_a_method_to_get_config()
             'foo' => 'bar'
         ));
 
-        $this->get('transport')->shouldReturn(array(
-            'foo' => 'bar'
-        ));
+        $this->get('transport')->shouldHaveType('PHPCR\Shell\Config\Config');
 
         $this->get('transport', 'foo')->shouldReturn('bar');
     }

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/Subscriber/ProfileWriterSubscriber.php

@@ -40,6 +40,7 @@ public function handleProfileInit(ProfileInitEvent $e)
         $profile = $e->getProfile();
         $input = $e->getInput();
         $output = $e->getOutput();
+        $noInteraction = $input->getOption('no-interaction');
         $transport = $input->getOption('transport');
         $profileName = $input->getOption('profile');
 
@@ -50,10 +51,17 @@ public function handleProfileInit(ProfileInitEvent $e)
             $overwrite = false;
 
             if (file_exists($this->profileLoader->getProfilePath($profileName))) {
-                $res = $this->questionHelper->askConfirmation($output, sprintf('Update existing profile "%s"?', $profileName));
+                $res = true;
+                if (false === $noInteraction) {
+                    $res = $this->questionHelper->askConfirmation($output, sprintf('Update existing profile "%s"?', $profileName));
+                }
                 $overwrite = true;
             } else {
-                $res = $this->questionHelper->askConfirmation($output, sprintf('Create new profile "%s"?', $profileName));
+                $res = true;
+
+                if (false === $noInteraction) {
+                    $res = $this->questionHelper->askConfirmation($output, sprintf('Create new profile "%s"?', $profileName));
+                }
             }
 
             if ($res) {