Explorar el Código

Merge pull request #437 from mpociot/analysis-q5Rde2

Apply fixes from StyleCI
Marcel Pociot hace 6 años
padre
commit
453f8e72b2
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. 2 1
      src/Tools/ResponseStrategies/ResponseFileStrategy.php

+ 2 - 1
src/Tools/ResponseStrategies/ResponseFileStrategy.php

@@ -47,8 +47,9 @@ class ResponseFileStrategy
             preg_match('/^(\d{3})?\s?([\S]*[\s]*?)(\{.*\})?$/', $responseFileTag->getContent(), $result);
             $status = $result[1] ?: 200;
             $content = $result[2] ? file_get_contents(storage_path(trim($result[2])), true) : '{}';
-            $json = !empty($result[3]) ? str_replace("'", "\"", $result[3]) : "{}";
+            $json = ! empty($result[3]) ? str_replace("'", '"', $result[3]) : '{}';
             $merged = array_merge(json_decode($content, true), json_decode($json, true));
+
             return new JsonResponse($merged, (int) $status);
         }, $responseFileTags);
     }