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"