Merge branch '4.4' into 5.1

* 4.4:
  [HttpFoundation] Fix TypeError: Argument 1 passed to JsonResponse::setJson() must be of the type string, object given
  [Security][Validator] Add missing Portuguese translations
  Add Croatian (hr) translations

Author: derrabus

JsonResponse.php

@@ -43,6 +43,10 @@ public function __construct($data = null, int $status = 200, array $headers = []
     {
         parent::__construct('', $status, $headers);
 
+        if ($json && !\is_string($data) && !is_numeric($data) && !\is_callable([$data, '__toString'])) {
+            throw new \TypeError(sprintf('"%s": If $json is set to true, argument $data must be a string or object implementing __toString(), "%s" given.', __METHOD__, get_debug_type($data)));
+        }
+
         if (null === $data) {
             $data = new \ArrayObject();
         }
@@ -81,13 +85,13 @@ public static function create($data = null, int $status = 200, array $headers =
      *     return JsonResponse::fromJsonString('{"key": "value"}')
      *         ->setSharedMaxAge(300);
      *
-     * @param string|null $data    The JSON response string
-     * @param int         $status  The response status code
-     * @param array       $headers An array of response headers
+     * @param string $data    The JSON response string
+     * @param int    $status  The response status code
+     * @param array  $headers An array of response headers
      *
      * @return static
      */
-    public static function fromJsonString(string $data = null, int $status = 200, array $headers = [])
+    public static function fromJsonString(string $data, int $status = 200, array $headers = [])
     {
         return new static($data, $status, $headers, true);
     }

Tests/JsonResponseTest.php

@@ -267,6 +267,44 @@ public function testSetComplexCallback()
 
         $this->assertEquals('/**/ಠ_ಠ["foo"].bar[0]({"foo":"bar"});', $response->getContent());
     }
+
+    public function testConstructorWithNullAsDataThrowsAnUnexpectedValueException()
+    {
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('If $json is set to true, argument $data must be a string or object implementing __toString(), "null" given.');
+
+        new JsonResponse(null, 200, [], true);
+    }
+
+    public function testfromJsonStringConstructorWithNullAsDataThrowsAnUnexpectedValueException()
+    {
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('If $json is set to true, argument $data must be a string or object implementing __toString(), "null" given.');
+
+        JsonResponse::fromJsonString(null);
+    }
+
+    public function testConstructorWithObjectWithToStringMethod()
+    {
+        $class = new class() {
+            public function __toString()
+            {
+                return '{}';
+            }
+        };
+
+        $response = new JsonResponse($class, 200, [], true);
+
+        $this->assertSame('{}', $response->getContent());
+    }
+
+    public function testConstructorWithObjectWithoutToStringMethodThrowsAnException()
+    {
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('If $json is set to true, argument $data must be a string or object implementing __toString(), "stdClass" given.');
+
+        new JsonResponse(new \stdClass(), 200, [], true);
+    }
 }
 
 if (interface_exists('JsonSerializable', false)) {