Merge pull request #114 from phpcr/dicontainer

[WIP] Refactoring to use container

Author: dantleech

.travis.yml

@@ -1,13 +1,18 @@
 language: php
 
+env:
+    - BEHAT_SUITE=standalone
+    - BEHAT_SUITE=embedded
+
+
 php:
     - 5.4
 
 before_script:
-    - composer install
+    - composer install --dev
     - bash tests/bin/travis_jackrabbit.sh
 
 script: 
   - phpunit
-  - php vendor/behat/behat/bin/behat
   - php vendor/bin/phpspec run
+  - php vendor/behat/behat/bin/behat --suite=$BEHAT_SUITE

CHANGELOG.md

@@ -0,0 +1,16 @@
+default:
+    suites:
+        standalone:
+            contexts:
+                - PHPCR\Shell\Test\StandaloneContext
+            paths:
+                - features/all
+                - features/standalone
+                - features/shell
+        embedded:
+            filter:
+                tag: "~@standalone"
+            contexts:
+                - PHPCR\Shell\Test\EmbeddedContext
+            paths:
+                - features/all

behat.yml

@@ -8,14 +8,16 @@
         "phpcr/phpcr-utils": "~1.2",
         "symfony/finder": "~2.3",
         "symfony/serializer": "~2.3",
-        "symfony/yaml": "~2.3"
+        "symfony/yaml": "~2.3",
+        "symfony/dependency-injection": "~2.3"
     },
     "minimum-stability": "dev",
     "require-dev": {
+        "symfony/symfony": "2.6",
         "symfony/process": "~2.3",
         "symfony/filesystem": "~2.3",
         "phpunit/phpunit": "~3.7.28",
-        "behat/behat": "~2.5",
+        "behat/behat": "~3.0.0",
         "phpspec/phpspec": "2.0",
         "jackalope/jackalope-doctrine-dbal": "~1.1",
         "jackalope/jackalope-jackrabbit": "~1.1"

composer.json

@@ -5,26 +5,26 @@ Feature: Move a node in the current session
 
     Background:
         Given that I am logged in as "testuser"
-        And the "session_data.xml" fixtures are loaded
+        And the "cms.xml" fixtures are loaded
 
     Scenario: Move node
-        Given I execute the "node:move /tests_general_base/index.txt /foobar" command
+        Given I execute the "node:move /cms/test /foobar" command
         Then the command should not fail
         And I execute the "session:save" command
         And there should exist a node at "/foobar"
         And there should not exist a node at "/tests_general_base/index.txt"
 
     Scenario: Move node relative paths
-        Given the current node is "/tests_general_base/index.txt"
+        Given the current node is "/cms/test"
         And I execute the "node:move . /barfoo" command
         Then the command should not fail
         And I execute the "session:save" command
         And there should exist a node at "/barfoo"
         And there should not exist a node at "/tests_general_base/index.txt"
 
     Scenario: Move onto existing target
-        Given the current node is "/tests_general_base/index.txt"
-        And I execute the "node:move . /tests_general_base/daniel" command
+        Given the current node is "/cms/test"
+        And I execute the "node:move . /cms/products" command
         Then the command should not fail
         And I execute the "session:save" command
-        And there should exist a node at "/tests_general_base/daniel/index.txt"
+        And there should exist a node at "/cms/products/test"

features/phpcr_access_control_privilege_list.feature renamed to features/all/phpcr_access_control_privilege_list.feature

@@ -14,7 +14,7 @@ Feature: Remove a single property at a specified path
         And there should not exist a property at "/cms/articles/article1/title"
 
     Scenario: Try and remove a node
-        And I execute the "node:property:remove /tests_general_base" command
+        Given I execute the "node:property:remove /tests_general_base" command
         Then the command should fail
         And I should see the following:
         """

features/phpcr_file_import.feature renamed to features/all/phpcr_file_import.feature

@@ -3,17 +3,15 @@ Feature: Unregister a node type
     As a user that is logged into the shell
     I need to be able to do that
 
+    # This is not currently implemented by Jackrabbit
+
     Background:
         Given that I am logged in as "testuser"
 
     Scenario: Unregister a node type
         Given the "example.cnd" node type is loaded
         And I execute the "node-type:unregister ns:NodeType" command
         Then the command should fail
-        And I should see the following:
-        """
-        NodeType not found
-        """
 
     Scenario: Attempt to unregister a non-registered node type
         Given the "example.cnd" node type is loaded

features/phpcr_lock_info.feature renamed to features/all/phpcr_lock_info.feature

@@ -18,7 +18,6 @@ Feature: Command aliases
 
         Examples:
             | command | 
-            | use default |
             | select * from [nt:unstructured] |
             | cd cms |
             | rm cms |

features/phpcr_lock_lock.feature renamed to features/all/phpcr_lock_lock.feature

@@ -1,3 +1,4 @@
+@standlone
 Feature: Login to the session
     In order to reconnect as a different user from a session
     As a user logged into the shell

features/phpcr_lock_refresh.feature renamed to features/all/phpcr_lock_refresh.feature

@@ -1,40 +1,40 @@
 <?php
 
-namespace spec\PHPCR\Shell\Console\Helper;
+namespace spec\PHPCR\Shell\Config;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use Symfony\Component\Filesystem\Filesystem;
 
-class ConfigHelperSpec extends ObjectBehavior
+class ConfigManagerSpec extends ObjectBehavior
 {
-    function let(
+    public function let(
         Filesystem $filesystem
     )
     {
         $this->beConstructedWith($filesystem);
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
-        $this->shouldHaveType('PHPCR\Shell\Console\Helper\ConfigHelper');
+        $this->shouldHaveType('PHPCR\Shell\Config\ConfigManager');
     }
 
-    function it_should_have_a_method_to_get_the_users_config_directory()
+    public function it_should_have_a_method_to_get_the_users_config_directory()
     {
         putenv('PHPCRSH_HOME=/home/foobar');
         $this->getConfigDir()->shouldReturn('/home/foobar');
     }
 
-    function it_should_be_able_to_parse_a_config_file_and_return_the_config_as_an_array(
+    public function it_should_be_able_to_parse_a_config_file_and_return_the_config_as_an_array(
         Filesystem $filesystem
     )
     {
         $dir = __DIR__ . '/fixtures/config';
         putenv('PHPCRSH_HOME=' . $dir);
         $filesystem->exists(Argument::any())->willReturn(true);
 
-        $config = $this->getConfig('alias')->shouldReturn(array(
+        $this->getConfig('alias')->shouldReturn(array(
             'foobar' => 'barfoo',
             'barfoo' => 'foobar',
         ));

features/phpcr_lock_token_add.feature renamed to features/all/phpcr_lock_token_add.feature

@@ -4,34 +4,34 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use PHPCR\Shell\Console\Helper\ConfigHelper;
+use PHPCR\Shell\Config\ConfigManager;
 use PHPCR\Shell\Config\Profile;
 use Symfony\Component\Filesystem\Filesystem;
 
 class ProfileLoaderSpec extends ObjectBehavior
 {
-    function let(
-        ConfigHelper $configHelper,
+    public function let(
+        ConfigManager $configManager,
         Filesystem $filesystem
     )
     {
-        $configHelper->getConfigDir()->willReturn(__DIR__);
-        $this->beConstructedWith($configHelper, $filesystem);
+        $configManager->getConfigDir()->willReturn(__DIR__);
+        $this->beConstructedWith($configManager, $filesystem);
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('PHPCR\Shell\Config\ProfileLoader');
     }
 
-    function it_should_list_profile_names()
+    public function it_should_list_profile_names()
     {
         $this->getProfileNames()->shouldReturn(array(
             'one', 'two'
         ));
     }
 
-    function it_should_load_data_into_a_given_profile(
+    public function it_should_load_data_into_a_given_profile(
         Profile $profile,
         Filesystem $filesystem
     )
@@ -51,7 +51,7 @@ function it_should_load_data_into_a_given_profile(
         $this->loadProfile($profile);
     }
 
-    function it_should_save_a_given_profile(
+    public function it_should_save_a_given_profile(
         Profile $profile,
         Filesystem $filesystem
     )

features/phpcr_lock_token_list.feature renamed to features/all/phpcr_lock_token_list.feature

@@ -3,30 +3,28 @@
 namespace spec\PHPCR\Shell\Config;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-use PHPCR\Shell\Transport\TransportConfig;
 
 class ProfileSpec extends ObjectBehavior
 {
-    function let()
+    public function let()
     {
         $this->beConstructedWith(
             'foobar'
         );
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('PHPCR\Shell\Config\Profile');
     }
 
-    function it_has_a_method_to_set_config(
+    public function it_has_a_method_to_set_config(
     )
     {
         $this->set('transport', array());
     }
 
-    function it_has_a_method_to_get_config()
+    public function it_has_a_method_to_get_config()
     {
         $this->set('transport', array(
             'foo' => 'bar'

features/phpcr_lock_token_remove.feature renamed to features/all/phpcr_lock_token_remove.feature

@@ -1,4 +1,4 @@
-transport: 
+transport:
     name: foobar
     bar_foo: barfoo
     foo_bar: foobar

features/phpcr_lock_unlock.feature renamed to features/all/phpcr_lock_unlock.feature

@@ -3,17 +3,19 @@
 namespace spec\PHPCR\Shell\Console\Application;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use PHPCR\Shell\Console\Application\EmbeddedApplication;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class EmbeddedApplicationSpec extends ObjectBehavior
 {
-    function let()
+    public function let(
+        ContainerInterface $container
+    )
     {
-        $this->beConstructedWith(EmbeddedApplication::MODE_COMMAND);
+        $this->beConstructedWith($container, EmbeddedApplication::MODE_COMMAND);
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('PHPCR\Shell\Console\Application\EmbeddedApplication');
     }

features/phpcr_namespace_unregister.feature renamed to features/all/phpcr_namespace_unregister.feature

@@ -3,11 +3,19 @@
 namespace spec\PHPCR\Shell\Console\Application;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use PHPCR\Shell\Console\Application\EmbeddedApplication;
 
 class ShellApplicationSpec extends ObjectBehavior
 {
-    function it_is_initializable()
+    public function let(
+        ContainerInterface $container
+    )
+    {
+        $this->beConstructedWith($container, EmbeddedApplication::MODE_COMMAND);
+    }
+
+    public function it_is_initializable()
     {
         $this->shouldHaveType('PHPCR\Shell\Console\Application\ShellApplication');
     }

features/phpcr_node_clone.feature renamed to features/all/phpcr_node_clone.feature

@@ -3,11 +3,10 @@
 namespace spec\PHPCR\Shell\Console\Helper;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class EditorHelperSpec extends ObjectBehavior
 {
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('PHPCR\Shell\Console\Helper\EditorHelper');
     }

features/phpcr_node_copy.feature renamed to features/all/phpcr_node_copy.feature

@@ -3,18 +3,17 @@
 namespace spec\PHPCR\Shell\Console\Helper;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use PHPCR\NodeInterface;
 use PHPCR\NodeType\NodeTypeInterface;
 
 class NodeHelperSpec extends ObjectBehavior
 {
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('PHPCR\Shell\Console\Helper\NodeHelper');
     }
 
-    function it_should_provide_a_method_to_determine_if_a_node_has_a_given_mixin(
+    public function it_should_provide_a_method_to_determine_if_a_node_has_a_given_mixin(
         NodeInterface $node,
         NodeTypeInterface $mixin1,
         NodeTypeInterface $mixin2,
@@ -33,7 +32,7 @@ function it_should_provide_a_method_to_determine_if_a_node_has_a_given_mixin(
         $this->nodeHasMixinType($node, 'mixin5')->shouldReturn(false);
     }
 
-    function it_should_provide_a_method_to_determine_if_a_node_is_versionable(
+    public function it_should_provide_a_method_to_determine_if_a_node_is_versionable(
         NodeInterface $nodeVersionable,
         NodeInterface $nodeNotVersionable,
         NodeTypeInterface $mixin1,

features/phpcr_node_corresponding.feature renamed to features/all/phpcr_node_corresponding.feature

@@ -3,21 +3,20 @@
 namespace spec\PHPCR\Shell\Console\Helper;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class PathHelperSpec extends ObjectBehavior
 {
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('PHPCR\Shell\Console\Helper\PathHelper');
     }
 
-    function it_has_a_method_to_provide_the_parent_path_for_a_given_path()
+    public function it_has_a_method_to_provide_the_parent_path_for_a_given_path()
     {
         $this->getParentPath('/foo/bar')->shouldReturn('/foo');
     }
 
-    function it_has_a_method_to_get_the_node_name_of_a_given_path()
+    public function it_has_a_method_to_get_the_node_name_of_a_given_path()
     {
         $this->getNodeName('/foo/bar')->shouldReturn('bar');
     }