Merge branch '4.4' into 5.3

fabpot · fabpot · commit 679991683f90 · 2022-01-02T10:51:59.000+01:00
* 4.4:
  Bump license year
  [HttpClient] Turn negative timeout to a very long timeout
  Features goes to 6.x branch
  [Validator] throw when Constraint::_construct() has not been called
  Bump Symfony version to 4.4.37
  Update VERSION for 4.4.36
  Update CONTRIBUTORS for 4.4.36
  Update CHANGELOG for 4.4.36
  Allow symfony/runtime plugin
diff --git a/HttpClientTrait.php b/HttpClientTrait.php
@@ -159,7 +159,10 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
 
         // Finalize normalization of options
         $options['http_version'] = (string) ($options['http_version'] ?? '') ?: null;
-        $options['timeout'] = (float) ($options['timeout'] ?? ini_get('default_socket_timeout'));
+        if (0 > $options['timeout'] = (float) ($options['timeout'] ?? ini_get('default_socket_timeout'))) {
+            $options['timeout'] = 172800.0; // 2 days
+        }
+
         $options['max_duration'] = isset($options['max_duration']) ? (float) $options['max_duration'] : 0;
 
         return [$url, $options];
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2021 Fabien Potencier
+Copyright (c) 2018-2022 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Tests/HttpClientTestCase.php b/Tests/HttpClientTestCase.php
@@ -373,4 +373,13 @@ public function testDebugInfoOnDestruct()
 
         $this->assertNotEmpty($traceInfo['debug']);
     }
+
+    public function testNegativeTimeout()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $this->assertSame(200, $client->request('GET', 'http://localhost:8057', [
+            'timeout' => -1,
+        ])->getStatusCode());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2018-2021 Fabien Potencier`
	`1`	`+Copyright (c) 2018-2022 Fabien Potencier`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -373,4 +373,13 @@ public function testDebugInfoOnDestruct()`
`373`	`373`
`374`	`374`	`$this->assertNotEmpty($traceInfo['debug']);`
`375`	`375`	`}`
	`376`	`+`
	`377`	`+ public function testNegativeTimeout()`
	`378`	`+ {`
	`379`	`+ $client = $this->getHttpClient(__FUNCTION__);`
	`380`	`+`
	`381`	`+ $this->assertSame(200, $client->request('GET', 'http://localhost:8057', [`
	`382`	`+ 'timeout' => -1,`
	`383`	`+ ])->getStatusCode());`
	`384`	`+ }`
`376`	`385`	`}`