Allow mixed for exception codes, because PDO

amphp · Jun 28, 2017 · 77de098 · 77de098
1 parent 6b2f5cd
commit 77de098
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/lib/PanicError.php b/lib/PanicError.php
@@ -12,13 +12,17 @@ class PanicError extends \Error {
     /**
      * Creates a new panic error.
      *
-     * @param string $name    The uncaught exception class.
+     * @param string $name The uncaught exception class.
      * @param string $message The panic message.
-     * @param int    $code    The panic code.
-     * @param string $trace   The panic stack trace.
+     * @param mixed  $code The panic code.
+     * @param string $trace The panic stack trace.
      */
-    public function __construct(string $name, string $message = '', int $code = 0, string $trace = '') {
-        parent::__construct($message, $code);
+    public function __construct(string $name, string $message = '', $code = 0, string $trace = '') {
+        parent::__construct($message);
+
+        // Code might also be a string, because PDO, so don't pass to parent constructor, but assign directly.
+        // See https://github.com/amphp/parallel/issues/19.
+        $this->code = $code;
         $this->name = $name;
         $this->trace = $trace;
     }

diff --git a/lib/Worker/TaskError.php b/lib/Worker/TaskError.php
@@ -10,13 +10,17 @@ class TaskError extends \Error {
     private $trace;
 
     /**
-     * @param string $name    The exception class name.
+     * @param string $name The exception class name.
      * @param string $message The panic message.
-     * @param int    $code    The panic code.
-     * @param string $trace   The panic stack trace.
+     * @param mixed  $code The panic code.
+     * @param string $trace The panic stack trace.
      */
-    public function __construct(string $name, string $message = '', int $code = 0, string $trace = '') {
-        parent::__construct($message, $code);
+    public function __construct(string $name, string $message = '', $code = 0, string $trace = '') {
+        parent::__construct($message);
+
+        // Code might also be a string, because PDO, so don't pass to parent constructor, but assign directly.
+        // See https://github.com/amphp/parallel/issues/19.
+        $this->code = $code;
         $this->name = $name;
         $this->trace = $trace;
     }

diff --git a/lib/Worker/TaskException.php b/lib/Worker/TaskException.php
@@ -10,13 +10,17 @@ class TaskException extends \Exception {
     private $trace;
 
     /**
-     * @param string $name    The exception class name.
+     * @param string $name The exception class name.
      * @param string $message The panic message.
-     * @param int    $code    The panic code.
-     * @param string $trace   The panic stack trace.
+     * @param mixed  $code The panic code.
+     * @param string $trace The panic stack trace.
      */
-    public function __construct(string $name, string $message = '', int $code = 0, string $trace = '') {
-        parent::__construct($message, $code);
+    public function __construct(string $name, string $message = '', $code = 0, string $trace = '') {
+        parent::__construct($message);
+
+        // Code might also be a string, because PDO, so don't pass to parent constructor, but assign directly.
+        // See https://github.com/amphp/parallel/issues/19.
+        $this->code = $code;
         $this->name = $name;
         $this->trace = $trace;
     }