Merge pull request andres-montanez#218 from php-mock/develop

malkusch/php-mock moved to php-mock/php-mock
edpauto · Apr 15, 2015 · 4f2f65c · 4f2f65c
2 parents 781213d + 5e5d859
commit 4f2f65c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     "require-dev": {
         "phpunit/phpunit": "4.3.5",
         "satooshi/php-coveralls": ">=0.6.1",
-        "malkusch/php-mock": "dev-php-5.3"
+        "php-mock/php-mock": "^0.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock