Merge 277fc07 into 70368a8

thephpleague · Jun 20, 2014 · dff7179 · dff7179
2 parents 70368a8 + 277fc07
commit dff7179
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -16,14 +16,19 @@
         }
     ],
     "require-dev": {
-        "phpunit/phpunit": "3.7.*",
-        "mikey179/vfsStream": "v1.2.0",
-        "mockery/mockery": "dev-master@dev",
+        "phpunit/phpunit": "~4.0",
+        "mockery/mockery": "~0.9",
+        "mikey179/vfsStream": "~1.2.0",
         "squizlabs/php_codesniffer": "~1.5"
     },
     "autoload": {
         "psr-4": {
             "League\\Plates\\": "src"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1-dev"
+        }
     }
 }