Merge branch '4.4' into 5.2

derrabus · derrabus · commit 82e3b17cf4fd · 2021-03-01T01:40:14.000+01:00
* 4.4:
  improve exception message if symfony/security-csrf is missing
  fix: MockResponse total_time should not be simulated when provided
diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php
@@ -59,7 +59,7 @@ public function setTheme(FormView $view, $themes, bool $useDefaultThemes = true)
     public function renderCsrfToken(string $tokenId)
     {
         if (null === $this->csrfTokenManager) {
-            throw new BadMethodCallException('CSRF tokens can only be generated if a CsrfTokenManagerInterface is injected in FormRenderer::__construct().');
+            throw new BadMethodCallException('CSRF tokens can only be generated if a CsrfTokenManagerInterface is injected in FormRenderer::__construct(). Try running "composer require symfony/security-csrf".');
         }
 
         return $this->csrfTokenManager->getToken($tokenId)->getValue();
diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -232,8 +232,8 @@ private static function writeRequest(self $response, array $options, ResponseInt
             $response->info['size_upload'] = 0.0;
         }
 
-        // simulate "total_time" if it is set
-        if (isset($response->info['total_time'])) {
+        // simulate "total_time" if it is not set
+        if (!isset($response->info['total_time'])) {
             $response->info['total_time'] = microtime(true) - $response->info['start_time'];
         }
 
@@ -281,7 +281,7 @@ private static function readResponse(self $response, array $options, ResponseInt
             'http_code' => $response->info['http_code'],
         ] + $info + $response->info;
 
-        if (isset($response->info['total_time'])) {
+        if (!isset($response->info['total_time'])) {
             $response->info['total_time'] = microtime(true) - $response->info['start_time'];
         }
 
@@ -308,7 +308,7 @@ private static function readResponse(self $response, array $options, ResponseInt
             $offset = \strlen($body);
         }
 
-        if (isset($response->info['total_time'])) {
+        if (!isset($response->info['total_time'])) {
             $response->info['total_time'] = microtime(true) - $response->info['start_time'];
         }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php
@@ -11,6 +11,24 @@
  */
 class MockResponseTest extends TestCase
 {
+    public function testTotalTimeShouldBeSimulatedWhenNotProvided()
+    {
+        $response = new MockResponse('body');
+        $response = MockResponse::fromRequest('GET', 'https://example.com/file.txt', [], $response);
+
+        $this->assertNotNull($response->getInfo('total_time'));
+        $this->assertGreaterThan(0.0, $response->getInfo('total_time'));
+    }
+
+    public function testTotalTimeShouldNotBeSimulatedWhenProvided()
+    {
+        $totalTime = 4.2;
+        $response = new MockResponse('body', ['total_time' => $totalTime]);
+        $response = MockResponse::fromRequest('GET', 'https://example.com/file.txt', [], $response);
+
+        $this->assertEquals($totalTime, $response->getInfo('total_time'));
+    }
+
     public function testToArray()
     {
         $data = ['color' => 'orange', 'size' => 42];

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function setTheme(FormView $view, $themes, bool $useDefaultThemes = true)`
`59`	`59`	`public function renderCsrfToken(string $tokenId)`
`60`	`60`	`{`
`61`	`61`	`if (null === $this->csrfTokenManager) {`
`62`		`- throw new BadMethodCallException('CSRF tokens can only be generated if a CsrfTokenManagerInterface is injected in FormRenderer::__construct().');`
	`62`	`+ throw new BadMethodCallException('CSRF tokens can only be generated if a CsrfTokenManagerInterface is injected in FormRenderer::__construct(). Try running "composer require symfony/security-csrf".');`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`return $this->csrfTokenManager->getToken($tokenId)->getValue();`
Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,8 @@ private static function writeRequest(self $response, array $options, ResponseInt`
`232`	`232`	`$response->info['size_upload'] = 0.0;`
`233`	`233`	`}`
`234`	`234`
`235`		`- // simulate "total_time" if it is set`
`236`		`- if (isset($response->info['total_time'])) {`
	`235`	`+ // simulate "total_time" if it is not set`
	`236`	`+ if (!isset($response->info['total_time'])) {`
`237`	`237`	`$response->info['total_time'] = microtime(true) - $response->info['start_time'];`
`238`	`238`	`}`
`239`	`239`
`@@ -281,7 +281,7 @@ private static function readResponse(self $response, array $options, ResponseInt`
`281`	`281`	`'http_code' => $response->info['http_code'],`
`282`	`282`	`] + $info + $response->info;`
`283`	`283`
`284`		`- if (isset($response->info['total_time'])) {`
	`284`	`+ if (!isset($response->info['total_time'])) {`
`285`	`285`	`$response->info['total_time'] = microtime(true) - $response->info['start_time'];`
`286`	`286`	`}`
`287`	`287`
`@@ -308,7 +308,7 @@ private static function readResponse(self $response, array $options, ResponseInt`
`308`	`308`	`$offset = \strlen($body);`
`309`	`309`	`}`
`310`	`310`
`311`		`- if (isset($response->info['total_time'])) {`
	`311`	`+ if (!isset($response->info['total_time'])) {`
`312`	`312`	`$response->info['total_time'] = microtime(true) - $response->info['start_time'];`
`313`	`313`	`}`
`314`	`314`