Merge pull request #112 from zf1s/zend-exception-allow-throwable-as-p…

…revious [zend-exception] allow Throwable in $previous
zf1s · Oct 1, 2021 · abfdc0d · abfdc0d
2 parents e769567 + ca1560f
commit abfdc0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/zend-db/library/Zend/Db/Statement/Pdo.php b/packages/zend-db/library/Zend/Db/Statement/Pdo.php
@@ -254,7 +254,7 @@ public function fetch($style = null, $cursor = null, $offset = null)
             return $this->_stmt->fetch($style, $cursor, $offset);
         } catch (ValueError $e) {
             // PHP 8.0+ throws ValueError on invalid arguments
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode());
+            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
         } catch (PDOException $e) {
             // require_once 'Zend/Db/Statement/Exception.php';
             throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
@@ -295,7 +295,7 @@ public function fetchAll($style = null, $col = null)
             }
         } catch (ValueError $e) {
             // PHP 8.0+ throws ValueError on invalid arguments
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode());
+            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
         } catch (PDOException $e) {
             // require_once 'Zend/Db/Statement/Exception.php';
             throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
@@ -439,7 +439,7 @@ public function setFetchMode($mode)
             return $this->_stmt->setFetchMode($mode);
         } catch (ValueError $e) {
             // PHP 8.0+ throws ValueError on invalid arguments
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode());
+            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
         } catch (PDOException $e) {
             // require_once 'Zend/Db/Statement/Exception.php';
             throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);

diff --git a/packages/zend-exception/library/Zend/Exception.php b/packages/zend-exception/library/Zend/Exception.php
@@ -32,10 +32,10 @@ class Zend_Exception extends Exception
      *
      * @param  string $msg
      * @param  int $code
-     * @param  Exception $previous
+     * @param  Exception|Throwable $previous
      * @return void
      */
-    public function __construct($msg = '', $code = 0, Exception $previous = null)
+    public function __construct($msg = '', $code = 0, $previous = null)
     {
         parent::__construct($msg, (int) $code, $previous);
     }