Merge branch 'non-json-response-files'

mpociot · May 22, 2021 · 3279e98 · 3279e98
2 parents 8085086 + 9299066
commit 3279e98
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Extracting/Strategies/Responses/UseResponseFileTag.php b/src/Extracting/Strategies/Responses/UseResponseFileTag.php
@@ -62,8 +62,13 @@ protected function getFileResponses(array $tags)
             }
             $status = $result[1] ?: 200;
             $content = $result[2] ? file_get_contents($filePath, true) : '{}';
-            $json = ! empty($result[3]) ? str_replace("'", '"', $result[3]) : '{}';
-            $merged = array_merge(json_decode($content, true), json_decode($json, true));
+
+            try {
+                $json = ! empty($result[3]) ? str_replace("'", '"', $result[3]) : '{}';
+                $merged = array_merge(json_decode($content, true), json_decode($json, true));
+            } catch (\Exception $e) {
+                $merged = $content;
+            }
 
             return ['content' => json_encode($merged), 'status' => (int) $status];
         }, $responseFileTags);