Merge branch 'master' into KMS-171_basic_migrations

Conflicts: readme.md
GrupaZero · Oct 31, 2015 · deeeb92 · deeeb92
2 parents a63afd1 + 4c6d459
commit deeeb92
Show file tree

Hide file tree

Showing 22 changed files with 362 additions and 300 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ before_script:
 
 script:
   - mkdir -p build/logs
-  - ./vendor/bin/codecept run --coverage --coverage-xml --coverage-html
+  - ./vendor/bin/codecept run --coverage --coverage-xml --coverage-html --env platform
   - cp tests/_output/coverage.xml build/logs/clover.xml
 
 after_script:

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -92,11 +92,10 @@ public function render($request, Exception $e)
             if (config('app.debug')) {
                 $whoops = new Run;
                 $whoops->pushHandler(new PrettyPageHandler);
-
                 return response(
                     $whoops->handleException($e),
-                    $e->getStatusCode(),
-                    $e->getHeaders()
+                    method_exists($e, 'getStatusCode') ? $e->getStatusCode() : self::SERVER_ERROR,
+                    method_exists($e, 'getHeaders') ? $e->getHeaders() : []
                 );
             } else {
                 return parent::render($request, $e);

diff --git a/codeception.yml b/codeception.yml
@@ -1,4 +1,5 @@
 actor: Tester
+namespace: platform
 coverage:
     enabled: true
     remote: false
@@ -8,11 +9,14 @@ coverage:
     exclude:
         - app/Http/routes.php
         - app/Http/Kernel.php
+include:
+    - vendor/gzero/api
 paths:
     tests: tests
     log: tests/_output
     data: tests/_data
     helpers: tests/_support
+    envs: tests/_envs
 settings:
     bootstrap: _bootstrap.php
     colors: true

diff --git a/composer.json b/composer.json
@@ -38,9 +38,7 @@
         }
     },
     "autoload-dev": {
-        "classmap": [
-            "tests/TestCase.php"
-        ]
+        "classmap": []
     },
     "scripts": {
         "post-install-cmd": [