bugs, sensiolab badge

oscarotero · oscarotero · commit 8095c9fce174 · 2016-10-03T14:34:51.000+02:00
diff --git a/README.md b/README.md
@@ -116,10 +116,10 @@ The MIT License (MIT). Please see [LICENSE](LICENSE) for more information.
 [ico-travis]: https://img.shields.io/travis/middlewares/error-handler/master.svg?style=flat-square
 [ico-scrutinizer]: https://img.shields.io/scrutinizer/g/middlewares/error-handler.svg?style=flat-square
 [ico-downloads]: https://img.shields.io/packagist/dt/middlewares/error-handler.svg?style=flat-square
-[ico-sensiolabs]: https://img.shields.io/sensiolabs/i/36786f5a-2a15-4399-8817-8f24fcd8c0b4.svg?style=flat-square
+[ico-sensiolabs]: https://img.shields.io/sensiolabs/i/7aa83a5f-8084-4b8f-bbc9-570751440174.svg?style=flat-square
 
 [link-packagist]: https://packagist.org/packages/middlewares/error-handler
 [link-travis]: https://travis-ci.org/middlewares/error-handler
 [link-scrutinizer]: https://scrutinizer-ci.com/g/middlewares/error-handler
 [link-downloads]: https://packagist.org/packages/middlewares/error-handler
-[link-sensiolabs]: https://insight.sensiolabs.com/projects/36786f5a-2a15-4399-8817-8f24fcd8c0b4
+[link-sensiolabs]: https://insight.sensiolabs.com/projects/7aa83a5f-8084-4b8f-bbc9-570751440174
diff --git a/src/ErrorHandler.php b/src/ErrorHandler.php
@@ -132,7 +132,7 @@ public function process(ServerRequestInterface $request, DelegateInterface $dele
      */
     private function handleError(ServerRequestInterface $request, $statusCode, $exception)
     {
-        $arguments = array_merge(func_get_args(), $this->arguments);
+        $arguments = array_merge([$request, $statusCode, $exception], $this->arguments);
         $callable = Utils\CallableHandler::resolve($this->handler, $arguments);
 
         return Utils\CallableHandler::execute($callable, $arguments);
diff --git a/src/ErrorHandlerDefault.php b/src/ErrorHandlerDefault.php
@@ -53,14 +53,14 @@ public function __invoke(ServerRequestInterface $request, $statusCode, $exceptio
         foreach ($this->handlers as $method => $types) {
             foreach ($types as $type) {
                 if (stripos($accept, $type) !== false) {
-                    $this->$method($statusCode, $message);
+                    call_user_func(__CLASS__.'::'.$method, $statusCode, $message);
 
                     return $response->withHeader('Content-Type', $type);
                 }
             }
         }
 
-        $this->html($statusCode, $message);
+        static::html($statusCode, $message);
 
         return $response->withHeader('Content-Type', 'text/html');
     }
@@ -71,7 +71,7 @@ public function __invoke(ServerRequestInterface $request, $statusCode, $exceptio
      * @param int    $statusCode
      * @param string $message
      */
-    private function plain($statusCode, $message)
+    public static function plain($statusCode, $message)
     {
         echo sprintf("Error %s\n%s", $statusCode, $message);
     }
@@ -82,7 +82,7 @@ private function plain($statusCode, $message)
      * @param int    $statusCode
      * @param string $message
      */
-    private function svg($statusCode, $message)
+    public static function svg($statusCode, $message)
     {
         echo <<<EOT
 <svg xmlns="http://www.w3.org/2000/svg" width="200" height="50" viewBox="0 0 200 50">
@@ -99,7 +99,7 @@ private function svg($statusCode, $message)
      * @param int    $statusCode
      * @param string $message
      */
-    private function html($statusCode, $message)
+    public static function html($statusCode, $message)
     {
         echo <<<EOT
 <!DOCTYPE html>
@@ -124,7 +124,7 @@ private function html($statusCode, $message)
      * @param int    $statusCode
      * @param string $message
      */
-    private function json($statusCode, $message)
+    public static function json($statusCode, $message)
     {
         $output = ['error' => $statusCode];
 
@@ -141,7 +141,7 @@ private function json($statusCode, $message)
      * @param int    $statusCode
      * @param string $message
      */
-    private function xml($statusCode, $message)
+    public static function xml($statusCode, $message)
     {
         echo <<<EOT
 <?xml version="1.0" encoding="UTF-8"?>
@@ -158,9 +158,9 @@ private function xml($statusCode, $message)
      * @param int    $statusCode
      * @param string $message
      */
-    private function jpeg($statusCode, $message)
+    public static function jpeg($statusCode, $message)
     {
-        $image = $this->createImage($statusCode, $message);
+        $image = self::createImage($statusCode, $message);
 
         imagejpeg($image);
     }
@@ -171,9 +171,9 @@ private function jpeg($statusCode, $message)
      * @param int    $statusCode
      * @param string $message
      */
-    private function gif($statusCode, $message)
+    public static function gif($statusCode, $message)
     {
-        $image = $this->createImage($statusCode, $message);
+        $image = self::createImage($statusCode, $message);
 
         imagegif($image);
     }
@@ -184,9 +184,9 @@ private function gif($statusCode, $message)
      * @param int    $statusCode
      * @param string $message
      */
-    private function png($statusCode, $message)
+    public static function png($statusCode, $message)
     {
-        $image = $this->createImage($statusCode, $message);
+        $image = self::createImage($statusCode, $message);
 
         imagepng($image);
     }
@@ -199,7 +199,7 @@ private function png($statusCode, $message)
      *
      * @return resource
      */
-    private function createImage($statusCode, $message)
+    private static function createImage($statusCode, $message)
     {
         $size = 200;
         $image = imagecreatetruecolor($size, $size);

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public function process(ServerRequestInterface $request, DelegateInterface $dele`
`132`	`132`	`*/`
`133`	`133`	`private function handleError(ServerRequestInterface $request, $statusCode, $exception)`
`134`	`134`	`{`
`135`		`- $arguments = array_merge(func_get_args(), $this->arguments);`
	`135`	`+ $arguments = array_merge([$request, $statusCode, $exception], $this->arguments);`
`136`	`136`	`$callable = Utils\CallableHandler::resolve($this->handler, $arguments);`
`137`	`137`
`138`	`138`	`return Utils\CallableHandler::execute($callable, $arguments);`
Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,14 @@ public function __invoke(ServerRequestInterface $request, $statusCode, $exceptio`
`53`	`53`	`foreach ($this->handlers as $method => $types) {`
`54`	`54`	`foreach ($types as $type) {`
`55`	`55`	`if (stripos($accept, $type) !== false) {`
`56`		`- $this->$method($statusCode, $message);`
	`56`	`+ call_user_func(__CLASS__.'::'.$method, $statusCode, $message);`
`57`	`57`
`58`	`58`	`return $response->withHeader('Content-Type', $type);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- $this->html($statusCode, $message);`
	`63`	`+ static::html($statusCode, $message);`
`64`	`64`
`65`	`65`	`return $response->withHeader('Content-Type', 'text/html');`
`66`	`66`	`}`
`@@ -71,7 +71,7 @@ public function __invoke(ServerRequestInterface $request, $statusCode, $exceptio`
`71`	`71`	`* @param int $statusCode`
`72`	`72`	`* @param string $message`
`73`	`73`	`*/`
`74`		`- private function plain($statusCode, $message)`
	`74`	`+ public static function plain($statusCode, $message)`
`75`	`75`	`{`
`76`	`76`	`echo sprintf("Error %s\n%s", $statusCode, $message);`
`77`	`77`	`}`
`@@ -82,7 +82,7 @@ private function plain($statusCode, $message)`
`82`	`82`	`* @param int $statusCode`
`83`	`83`	`* @param string $message`
`84`	`84`	`*/`
`85`		`- private function svg($statusCode, $message)`
	`85`	`+ public static function svg($statusCode, $message)`
`86`	`86`	`{`
`87`	`87`	`echo <<<EOT`
`88`	`88`	`<svg xmlns="http://www.w3.org/2000/svg" width="200" height="50" viewBox="0 0 200 50">`
`@@ -99,7 +99,7 @@ private function svg($statusCode, $message)`
`99`	`99`	`* @param int $statusCode`
`100`	`100`	`* @param string $message`
`101`	`101`	`*/`
`102`		`- private function html($statusCode, $message)`
	`102`	`+ public static function html($statusCode, $message)`
`103`	`103`	`{`
`104`	`104`	`echo <<<EOT`
`105`	`105`	`<!DOCTYPE html>`
`@@ -124,7 +124,7 @@ private function html($statusCode, $message)`
`124`	`124`	`* @param int $statusCode`
`125`	`125`	`* @param string $message`
`126`	`126`	`*/`
`127`		`- private function json($statusCode, $message)`
	`127`	`+ public static function json($statusCode, $message)`
`128`	`128`	`{`
`129`	`129`	`$output = ['error' => $statusCode];`
`130`	`130`
`@@ -141,7 +141,7 @@ private function json($statusCode, $message)`
`141`	`141`	`* @param int $statusCode`
`142`	`142`	`* @param string $message`
`143`	`143`	`*/`
`144`		`- private function xml($statusCode, $message)`
	`144`	`+ public static function xml($statusCode, $message)`
`145`	`145`	`{`
`146`	`146`	`echo <<<EOT`
`147`	`147`	`<?xml version="1.0" encoding="UTF-8"?>`
`@@ -158,9 +158,9 @@ private function xml($statusCode, $message)`
`158`	`158`	`* @param int $statusCode`
`159`	`159`	`* @param string $message`
`160`	`160`	`*/`
`161`		`- private function jpeg($statusCode, $message)`
	`161`	`+ public static function jpeg($statusCode, $message)`
`162`	`162`	`{`
`163`		`- $image = $this->createImage($statusCode, $message);`
	`163`	`+ $image = self::createImage($statusCode, $message);`
`164`	`164`
`165`	`165`	`imagejpeg($image);`
`166`	`166`	`}`
`@@ -171,9 +171,9 @@ private function jpeg($statusCode, $message)`
`171`	`171`	`* @param int $statusCode`
`172`	`172`	`* @param string $message`
`173`	`173`	`*/`
`174`		`- private function gif($statusCode, $message)`
	`174`	`+ public static function gif($statusCode, $message)`
`175`	`175`	`{`
`176`		`- $image = $this->createImage($statusCode, $message);`
	`176`	`+ $image = self::createImage($statusCode, $message);`
`177`	`177`
`178`	`178`	`imagegif($image);`
`179`	`179`	`}`
`@@ -184,9 +184,9 @@ private function gif($statusCode, $message)`
`184`	`184`	`* @param int $statusCode`
`185`	`185`	`* @param string $message`
`186`	`186`	`*/`
`187`		`- private function png($statusCode, $message)`
	`187`	`+ public static function png($statusCode, $message)`
`188`	`188`	`{`
`189`		`- $image = $this->createImage($statusCode, $message);`
	`189`	`+ $image = self::createImage($statusCode, $message);`
`190`	`190`
`191`	`191`	`imagepng($image);`
`192`	`192`	`}`
`@@ -199,7 +199,7 @@ private function png($statusCode, $message)`
`199`	`199`	`*`
`200`	`200`	`* @return resource`
`201`	`201`	`*/`
`202`		`- private function createImage($statusCode, $message)`
	`202`	`+ private static function createImage($statusCode, $message)`
`203`	`203`	`{`
`204`	`204`	`$size = 200;`
`205`	`205`	`$image = imagecreatetruecolor($size, $size);`