Updated dependencies, don't ignore composer.lock

fabiang · Oct 9, 2015 · 26e93c6 · 26e93c6
1 parent 5dd7f00
commit 26e93c6
Show file tree

Hide file tree

Showing 4 changed files with 1,910 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-/composer.lock
 /vendor/
 .vagrant/
 /tests/behat.yml

diff --git a/composer.json b/composer.json
@@ -37,10 +37,11 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.4",
-        "satooshi/php-coveralls": "~0.6",
-        "behat/behat": "~3.0",
-        "codeclimate/php-test-reporter": "@dev"
+        "phpunit/phpunit": "^4.8",
+        "satooshi/php-coveralls": "^0.6.1",
+        "behat/behat": "^3.0",
+        "codeclimate/php-test-reporter": "@dev",
+        "phpunit/php-invoker": "^1.1"
     },
     "extra": {
         "branch-alias": {