Merge pull request #241 from techdivision/pac-840-type-error

Type Error
techdivision · Dec 22, 2023 · 7e39d72 · 7e39d72
2 parents ce1d41f + 21ae6d0
commit 7e39d72
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Version 17.7.1
+
+## Bugfixes
+
+* Fix type error in getOriginalData Function 
+
 # Version 17.7.0
 
 ## Feature

diff --git a/src/Subjects/AbstractSubject.php b/src/Subjects/AbstractSubject.php
@@ -855,7 +855,7 @@ public function import($serial, $filename)
 
         $inProgressFilename  = '';
         $failedFilename  = '';
-        
+
         try {
             // initialize the serial/filename
             $this->setSerial($serial);
@@ -1400,7 +1400,7 @@ public function getOriginalData()
         }
 
         // return an empty array, if not
-        return $originalData;
+        return is_array($originalData) ? $originalData : array();
     }
 
     /**
@@ -1438,11 +1438,15 @@ public function wrapException(
             // load the original data
             $originalData = $this->getOriginalData();
 
-            // replace old filename and line number of the original message
+            // append filename and line number to the original message
             $message = $this->appendExceptionSuffix(
                 $this->stripExceptionSuffix($message),
-                $originalData[ColumnKeys::ORIGINAL_FILENAME],
-                $originalData[ColumnKeys::ORIGINAL_LINE_NUMBER]
+                isset($originalData[ColumnKeys::ORIGINAL_FILENAME]) ?
+                    $originalData[ColumnKeys::ORIGINAL_FILENAME] :
+                    $this->filename,
+                isset($originalData[ColumnKeys::ORIGINAL_LINE_NUMBER]) ?
+                    $originalData[ColumnKeys::ORIGINAL_LINE_NUMBER] :
+                    $this->lineNumber
             );
         } else {
             // append filename and line number to the original message