Merge branch 'hotfix/5378' into develop

Forward port zendframework/zendframework#5378
zendframework · Oct 30, 2013 · 8b90718 · 8b90718
2 parents 4f7d41f + 1afa923
commit 8b90718
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Server.php b/src/Server.php
@@ -939,7 +939,7 @@ public function registerFaultException($class)
                 $this->registerFaultException($row);
             }
 
-        } elseif (is_string($class) && class_exists($class) && is_subclass_of($class, 'Exception')) {
+        } elseif (is_string($class) && class_exists($class) && (is_subclass_of($class, 'Exception') || 'Exception' === $class)) {
             $ref = new ReflectionClass($class);
 
             $this->faultExceptions[] = $ref->getName();

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -710,6 +710,7 @@ public function testIsRegisteredAsFaultException($exception)
     public function dataProviderForRegisterFaultException()
     {
         return array(
+            array('Exception'),
             array('Zend\Soap\Exception\InvalidArgumentException'),
             array('InvalidArgumentException'),
             array('Zend\Server\Exception\RuntimeException'),