Merge remote-tracking branch 'upstream/master'

Author: mbabjak

src/ApiProblem/ApiProblem.php

@@ -135,7 +135,11 @@ public static function fromException(Exception $exception, $title = '', $type =
             $type = self::RFC2616;
         }
 
-        $detail = empty($exception->getMessage()) ? get_class($exception) : $exception->getMessage();
+        $detail = $exception->getMessage();
+        if (empty($detail)) {
+            $className = explode('\\', get_class($exception));
+            $detail = array_pop($className);
+        }
 
         return new self($code, $detail, $title, $type, $additionalDetails);
     }

tests/ApiProblem/ApiProblemTest.php

@@ -27,4 +27,15 @@ public function testItCanConstructFromException()
         $this->assertEquals('Not Found', $problem->title());
         $this->assertEquals(ApiProblem::RFC2616, $problem->type());
     }
+
+    public function testItCanUseExceptionName()
+    {
+        $exception = new \PDOException();
+        $problem = ApiProblem::fromException($exception);
+
+        $this->assertEquals(500, $problem->status());
+        $this->assertEquals('PDOException', $problem->detail());
+        $this->assertEquals('Internal Server Error', $problem->title());
+        $this->assertEquals('http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html', $problem->type());
+    }
 }