Composer updates

GrahamCampbell · GrahamCampbell · commit b18a9502f657 · 2014-08-21T12:55:55.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 .idea
-/vendor
-/composer.lock
+vendor
diff --git a/composer.json b/composer.json
@@ -12,16 +12,16 @@
     "require": {
         "php": ">=5.3.3",
         "psr/log": "~1.0",
-        "nikic/php-parser": "0.9.4",
-        "phpdocumentor/reflection-docblock": "2.*"
+        "nikic/php-parser": "~0.9.4",
+        "phpdocumentor/reflection-docblock": "~2.0"
     },
     "suggests": {
         "symfony/event-dispatcher": "~2.1"
     },
     "require-dev": {
         "behat/behat": "~2.4",
-        "phpunit/phpunit": "~3.7",
-        "mockery/mockery": ">=0.7.0"
+        "phpunit/phpunit": "~4.0",
+        "mockery/mockery": "~0.8"
     },
     "extra": {
         "branch-alias": {
diff --git a/composer.lock b/composer.lock

-Original file line number
+Diff line change
@@ @@ -1,3 +1,2 @@ @@
 .idea
 -/vendor
 -/composer.lock
 +vendor