Merge branch '2.7' into 2.8

* 2.7: Minor fixes & cleanups
symfony · Oct 6, 2016 · 83262dd · 83262dd
2 parents 4df00e5 + aa80c66
commit 83262dd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Tests/JsonResponseTest.php b/Tests/JsonResponseTest.php
@@ -216,10 +216,10 @@ public function testSetContentJsonSerializeError()
 
     public function testSetComplexCallback()
     {
-        $response = JsonResponse::fromJsonString('{foo: "bar"}');
+        $response = JsonResponse::create(array('foo' => 'bar'));
         $response->setCallback('ಠ_ಠ["foo"].bar[0]');
 
-        $this->assertEquals('/**/ಠ_ಠ["foo"].bar[0]({foo: "bar"});', $response->getContent());
+        $this->assertEquals('/**/ಠ_ಠ["foo"].bar[0]({"foo":"bar"});', $response->getContent());
     }
 }