Merge branch 'hotfix/build-failures'

Ocramius · Jan 28, 2014 · e1c9236 · e1c9236
2 parents 013f552 + df74073
commit e1c9236
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "zendframework/zend-code": "2.*"
     },
     "require-dev": {
-        "phpunit/phpunit":           ">=3.7",
+        "phpunit/phpunit":           "3.8.*",
         "phpmd/phpmd":               "1.4.*",
         "squizlabs/php_codesniffer": "1.4.*",
         "satooshi/php-coveralls":    "~0.6"
@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.5.x-dev"
+            "dev-master": "0.6.x-dev"
         }
     }
 }