Merge pull request #346 from filp/local-phpunit

Local phpunit

composer.json

@@ -12,7 +12,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.3",
+        "phpunit/phpunit": "^4.8"
     },
     "require-dev": {
         "mockery/mockery": "0.9.*"

tests/bootstrap.php

@@ -6,5 +6,8 @@
  * Bootstraper for PHPUnit tests.
  */
 error_reporting(E_ALL | E_STRICT);
-$loader = require_once __DIR__ . '/../vendor/autoload.php';
+// Can be required more than once to allow running
+// phpunit installed with Composer
+// http://stackoverflow.com/a/12798022
+$loader = require __DIR__ . '/../vendor/autoload.php';
 $loader->add('Whoops\\', __DIR__);