Merge pull request #746 from testsmith-io/fix-headers

testsmith-io · web-flow · commit 2aad6366eefa · 2026-04-03T11:20:48.000+02:00
fix headers
diff --git a/sprint1/API/app/Http/Controllers/Controller.php b/sprint1/API/app/Http/Controllers/Controller.php
@@ -108,7 +108,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x
             return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);
         } else {
             return response()->json($data, $status,
-                ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
+                ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
         }
     }
 
diff --git a/sprint2/API/app/Http/Controllers/Controller.php b/sprint2/API/app/Http/Controllers/Controller.php
@@ -108,7 +108,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x
             return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);
         } else {
             return response()->json($data, $status,
-                ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
+                ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
         }
     }
 
diff --git a/sprint3/API/app/Http/Controllers/Controller.php b/sprint3/API/app/Http/Controllers/Controller.php
@@ -115,7 +115,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x
             return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);
         } else {
             return response()->json($data, $status,
-                ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
+                ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
         }
     }
 
diff --git a/sprint4/API/app/Http/Controllers/Controller.php b/sprint4/API/app/Http/Controllers/Controller.php
@@ -108,7 +108,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x
             return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);
         } else {
             return response()->json($data, $status,
-                ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
+                ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
         }
     }
 
diff --git a/sprint5-performance/API/app/Http/Controllers/Controller.php b/sprint5-performance/API/app/Http/Controllers/Controller.php
@@ -121,7 +121,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x
             return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);
         } else {
             return response()->json($data, $status,
-                ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE
+                ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE
             );
         }
     }
diff --git a/sprint5-with-bugs/API/app/Http/Controllers/Controller.php b/sprint5-with-bugs/API/app/Http/Controllers/Controller.php
@@ -109,7 +109,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x
             return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);
         } else {
             return response()->json($data, $status,
-                ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
+                ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE | JSON_NUMERIC_CHECK);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x`
`108`	`108`	`return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);`
`109`	`109`	`} else {`
`110`	`110`	`return response()->json($data, $status,`
`111`		`- ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE \| JSON_NUMERIC_CHECK);`
	`111`	`+ ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE \| JSON_NUMERIC_CHECK);`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x`
`115`	`115`	`return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);`
`116`	`116`	`} else {`
`117`	`117`	`return response()->json($data, $status,`
`118`		`- ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE \| JSON_NUMERIC_CHECK);`
	`118`	`+ ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE \| JSON_NUMERIC_CHECK);`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x`
`121`	`121`	`return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);`
`122`	`122`	`} else {`
`123`	`123`	`return response()->json($data, $status,`
`124`		`- ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE`
	`124`	`+ ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE`
`125`	`125`	`);`
`126`	`126`	`}`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ protected function preferredFormat($data, $status = 200, array $headers = [], $x`
`109`	`109`	`return $this->makeXML($data, $status, array_merge($headers, ['Content-Type' => app('request')->headers->get('Accept')]), $xmlRoot);`
`110`	`110`	`} else {`
`111`	`111`	`return response()->json($data, $status,`
`112`		`- ['Content-Type' => 'application/json;charset=UTF-8', 'Charset' => 'utf-8'], JSON_UNESCAPED_UNICODE \| JSON_NUMERIC_CHECK);`
	`112`	`+ ['Content-Type' => 'application/json'], JSON_UNESCAPED_UNICODE \| JSON_NUMERIC_CHECK);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`