Merge remote-tracking branch 'origin/vnd-error' into 1.x

bearsunday · Sep 19, 2015 · 80dcc4b · 80dcc4b
2 parents 2f2c1bf + fdc03c4
commit 80dcc4b
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 18 deletions.
diff --git a/src/Provide/Error/ExceptionAsString.php b/src/Provide/Error/ExceptionAsString.php
@@ -44,6 +44,7 @@ private function getPhpVariables(array $server)
         if (PHP_SAPI === 'cli') {
             return '';
         }
+
         return sprintf("\nPHP Variables\n\n\$_SERVER => %s",  print_r($server, true));
     }
 }
diff --git a/src/Provide/Error/VndError.php → src/Provide/Error/VndErrorHandler.php b/src/Provide/Error/VndError.php → src/Provide/Error/VndErrorHandler.php
@@ -7,22 +7,21 @@
 namespace BEAR\Package\Provide\Error;
 
 use BEAR\AppMeta\AbstractAppMeta;
+use BEAR\Package\Provide\Error\ErrorPage as CliErrorPage;
 use BEAR\Resource\Code;
 use BEAR\Resource\Exception\BadRequestException as BadRequest;
 use BEAR\Resource\Exception\ResourceNotFoundException as NotFound;
-use BEAR\Resource\Exception\ServerErrorException;
 use BEAR\Sunday\Extension\Error\ErrorInterface;
 use BEAR\Sunday\Extension\Router\RouterMatch as Request;
 use BEAR\Sunday\Extension\Transfer\TransferInterface;
-use BEAR\Package\Provide\Error\ErrorPage as CliErrorPage;
 use BEAR\Sunday\Provide\Error\ErrorPage;
 
 /**
  * vnd.error for BEAR.Package
  *
  * @see https://github.com/blongden/vnd.error
  */
-class VndError implements ErrorInterface
+class VndErrorHandler implements ErrorInterface
 {
     /**
      * @var int
@@ -77,10 +76,11 @@ public function __construct(AbstractAppMeta $appMeta, TransferInterface $respond
      */
     public function handle(\Exception $e, Request $request)
     {
-        $this->errorPage = PHP_SAPI === 'cli' ? new CliErrorPage($this->exceptionString->summery($e, $this->lastErrorFile)) : new ErrorPage;
-        $isCodeError = ($e instanceof NotFound || $e instanceof BadRequest || $e instanceof ServerErrorException);
+        $isCodeError = ($e instanceof NotFound || $e instanceof BadRequest);
+        $this->errorPage = $this->getErrorPage($e, $this->lastErrorFile);
         if ($isCodeError) {
             list($this->code, $this->body) = $this->codeError($e);
+            $this->log($e, $request);
 
             return $this;
         }
@@ -95,12 +95,23 @@ public function handle(\Exception $e, Request $request)
         return $this;
     }
 
+    /**
+     * @param \Exception $e
+     * @param string     $lastErrorFile
+     *
+     * @return \BEAR\Package\Provide\Error\ErrorPage|ErrorPage
+     */
+    private function getErrorPage(\Exception $e, $lastErrorFile)
+    {
+        return PHP_SAPI === 'cli' ? new CliErrorPage($this->exceptionString->summery($e, $lastErrorFile)) : new ErrorPage;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function transfer()
     {
-        $ro =$this->errorPage;
+        $ro = $this->errorPage;
         $ro->code = $this->code;
         $ro->headers['content-type'] = 'application/vnd.error+json';
         $ro->body = $this->body;
@@ -123,7 +134,7 @@ private function codeError(\Exception $e)
 
     /**
      * @param \Exception $e
-     * @param Request $request
+     * @param Request    $request
      *
      * @return int logRef
      */

diff --git a/src/Provide/Error/VndErrorModule.php b/src/Provide/Error/VndErrorModule.php
@@ -13,6 +13,6 @@ class VndErrorModule extends AbstractModule
 {
     protected function configure()
     {
-        $this->bind(ErrorInterface::class)->to(VndError::class);
+        $this->bind(ErrorInterface::class)->to(VndErrorHandler::class);
     }
 }
diff --git a/tests/Provide/Error/ErrorPageTest.php b/tests/Provide/Error/ErrorPageTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace BEAR\Package\Provide\Error;
+
+class ErrorPageTest extends \PHPUnit_Framework_TestCase
+{
+    private $errorPage;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->errorPage = new ErrorPage('some_text_after_error_message');
+    }
+
+    public function testToString()
+    {
+        $text = (string) $this->errorPage;
+        $this->assertContains('some_text_after_error_message', $text);
+    }
+}
diff --git a/tests/Provide/Error/VndErrorTest.php b/tests/Provide/Error/VndErrorTest.php
@@ -6,20 +6,19 @@
 use BEAR\Package\Provide\Transfer\FakeHttpResponder;
 use BEAR\Resource\Exception\BadRequestException;
 use BEAR\Resource\Exception\ResourceNotFoundException;
-use BEAR\Resource\Exception\ServerErrorException;
 use BEAR\Sunday\Extension\Router\RouterMatch;
 
 class VndErrorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var VndError
+     * @var VndErrorHandler
      */
     private $vndError;
 
     public function setUp()
     {
         FakeHttpResponder::reset();
-        $this->vndError = new VndError(new AppMeta('FakeVendor\HelloWorld'), new FakeHttpResponder());
+        $this->vndError = new VndErrorHandler(new AppMeta('FakeVendor\HelloWorld'), new FakeHttpResponder());
     }
 
     public function testNotFound()
@@ -37,13 +36,6 @@ public function testBadRequest()
         $this->assertSame(400, FakeHttpResponder::$code);
     }
 
-    public function testServerError()
-    {
-        $e = new ServerErrorException('message', 501);
-        $this->vndError->handle($e, new RouterMatch)->transfer();
-        $this->assertSame(501, FakeHttpResponder::$code);
-    }
-
     public function testServerErrorNot50X()
     {
         $e = new \RuntimeException('message', 0);