Merge branch 'hotfix/3307' into develop

Forward port zendframework/zendframework#3307 Conflicts: library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
zendframework · Jan 4, 2013 · 6102afa · 6102afa
commit 6102afa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Fault.php b/src/Fault.php
@@ -254,7 +254,7 @@ public function loadXml($fault)
      */
     public static function isFault($xml)
     {
-        $fault = new self();
+        $fault = new static();
         try {
             $isFault = $fault->loadXml($xml);
         } catch (Exception\ExceptionInterface $e) {

diff --git a/src/Server/Fault.php b/src/Server/Fault.php
@@ -84,7 +84,7 @@ public function __construct(\Exception $e)
      */
     public static function getInstance(\Exception $e)
     {
-        return new self($e);
+        return new static($e);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,7 +84,7 @@ public function __construct(\Exception $e) @@
          */
         public static function getInstance(\Exception $e)
         {
-            return new self($e);
+            return new static($e);
         }
         /**
@@ Expand Down @@