Merge remote-tracking branch 'bearsunday/1.x' into 1.x

Author: koriym

src/Provide/Error/ErrorPage.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
+namespace BEAR\Package\Provide\Error;
+
+use BEAR\Resource\ResourceObject;
+
+class ErrorPage extends ResourceObject
+{
+    /**
+     * @var string
+     */
+    private $postBody;
+
+    public function __construct($postBody)
+    {
+        $this->postBody = $postBody;
+    }
+
+    public function __toString()
+    {
+        $string = parent::__toString();
+
+        return $string . $this->postBody;
+    }
+}

src/Provide/Error/ExceptionAsString.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * This file is part of the BEAR.Package package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
+namespace BEAR\Package\Provide\Error;
+
+use BEAR\Sunday\Extension\Router\RouterMatch as Request;
+
+class ExceptionAsString
+{
+    public function summery(\Exception $e, $log)
+    {
+        return sprintf("\n\n[%s]\n%s\n %s", get_class($e), $e->getMessage(), $log);
+    }
+
+    /**
+     * @param Request $request
+     * @param string  $lastErrorLog
+     *
+     * @return string
+     */
+    public function detail(\Exception $e, Request $request)
+    {
+        $eSummery = sprintf("[%s]\n%s\nin file %s on line %s\n\n%s",
+            get_class($e),
+            $e->getMessage(),
+            $e->getFile(),
+            $e->getLine(),
+            $e->getTraceAsString()
+        );
+
+        return sprintf("%s\n%s\n\n%s\n%s", date(DATE_RFC2822), $request, $eSummery, $this->getPhpVariables($_SERVER));
+    }
+
+    /**
+     * @param array $server
+     *
+     * @return string
+     */
+    private function getPhpVariables(array $server)
+    {
+        if (PHP_SAPI === 'cli') {
+            return '';
+        }
+        return sprintf("\nPHP Variables\n\n\$_SERVER => %s",  print_r($server, true));
+    }
+}

src/Provide/Error/VndError.php

@@ -14,6 +14,7 @@
 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;
 
 /**
@@ -24,46 +25,72 @@
 class VndError implements ErrorInterface
 {
     /**
-     * @var AbstractAppMeta
+     * @var int
      */
-    private $appMeta;
+    private $code;
 
     /**
-     * @var int
+     * @var array
      */
-    private $code;
+    private $headers = [];
 
     /**
      * @var array
      */
     private $body = ['message' => '', 'logref' => ''];
 
+    /**
+     * @var string
+     */
+    private $logDir;
+
+    /**
+     * @var ErrorPage
+     */
+    private $errorPage;
+
     /**
      * @var TransferInterface
      */
     private $responder;
 
+    /**
+     * @var string
+     */
+    private $lastErrorFile;
+
+    /**
+     * @var ExceptionAsString
+     */
+    private $exceptionString;
+
     public function __construct(AbstractAppMeta $appMeta, TransferInterface $responder)
     {
-        $this->appMeta = $appMeta;
+        $this->logDir = $appMeta->logDir;
+        $this->lastErrorFile = $this->logDir . '/last_error.log';
         $this->responder = $responder;
+        $this->exceptionString = new ExceptionAsString;
     }
 
     /**
      * {@inheritdoc}
      */
     public function handle(\Exception $e, Request $request)
     {
-        unset($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);
         if ($isCodeError) {
             list($this->code, $this->body) = $this->codeError($e);
 
             return $this;
         }
+        // 500 exception
         $this->code = 500;
-        $this->body = ['message' => '500 Server Error'];
-        $this->logRef($e);
+        $logRef = $this->log($e, $request);
+        $this->body = [
+            'message' => '500 Server Error',
+            'logref' => $logRef
+        ];
 
         return $this;
     }
@@ -73,7 +100,7 @@ public function handle(\Exception $e, Request $request)
      */
     public function transfer()
     {
-        $ro = new ErrorPage;
+        $ro =$this->errorPage;
         $ro->code = $this->code;
         $ro->headers['content-type'] = 'application/vnd.error+json';
         $ro->body = $this->body;
@@ -96,14 +123,30 @@ private function codeError(\Exception $e)
 
     /**
      * @param \Exception $e
+     * @param Request $request
      *
-     * @return string
+     * @return int logRef
      */
-    private function logRef(\Exception $e)
+    private function log(\Exception $e, Request $request)
     {
-        $logRef = (string) CRC32($e);
-        file_put_contents($this->appMeta->logDir . "/$logRef.log", $e);
+        $logRefId = $this->getLogRefId($e);
+        $logRefFile = sprintf('%s/e.%s.log', $this->logDir, $logRefId);
+        $log = $this->exceptionString->detail($e, $request);
+        file_put_contents($this->lastErrorFile, $log);
+        file_put_contents($logRefFile, $log);
 
-        return $logRef;
+        return $logRefId;
+    }
+
+    /**
+     * Return log ref id
+     *
+     * @param \Exception $e
+     *
+     * @return string
+     */
+    private function getLogRefId(\Exception $e)
+    {
+        return (string) crc32(get_class($e) . $e->getMessage() . $e->getFile() . $e->getLine());
     }
 }