bugfix on non-object previous exception sent to parent constructor

src-run · Sep 26, 2016 · ee6adc1 · ee6adc1
1 parent 854e984
commit ee6adc1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/ExceptionTrait.php b/lib/ExceptionTrait.php
@@ -319,7 +319,7 @@ final private function compileMessagePlaceholders(string $message, array $replac
     final private function filterNotThrowable(array $from) : array
     {
         $to = array_filter($from, function ($value) {
-            return !ClassInfo::isThrowableEquitable($value);
+            return ! ClassInfo::isThrowableEquitable($value);
         });
 
         return array_map(function ($value) {
@@ -338,7 +338,7 @@ final private function filterNotThrowable(array $from) : array
     final private function filterThrowable(array $from)
     {
         return array_filter($from, function ($p) {
-            return ClassInfo::isThrowableEquitable($p);
+            return is_object($p) && ClassInfo::isThrowableEquitable($p);
         });
     }