Merge branch '6.4' into 7.1

* 6.4:
  Use non-static PHPUnit assert methods

Author: javiereguiluz

components/clock.rst

@@ -129,18 +129,18 @@ is expired or not, by modifying the clock's time::
             $validUntil = new DateTimeImmutable('2022-11-16 15:25:00');
 
             // $validUntil is in the future, so it is not expired
-            static::assertFalse($expirationChecker->isExpired($validUntil));
+            $this->assertFalse($expirationChecker->isExpired($validUntil));
 
             // Clock sleeps for 10 minutes, so now is '2022-11-16 15:30:00'
             $clock->sleep(600); // Instantly changes time as if we waited for 10 minutes (600 seconds)
 
             // modify the clock, accepts all formats supported by DateTimeImmutable::modify()
-            static::assertTrue($expirationChecker->isExpired($validUntil));
+            $this->assertTrue($expirationChecker->isExpired($validUntil));
 
             $clock->modify('2022-11-16 15:00:00');
 
             // $validUntil is in the future again, so it is no longer expired
-            static::assertFalse($expirationChecker->isExpired($validUntil));
+            $this->assertFalse($expirationChecker->isExpired($validUntil));
         }
     }
 

http_client.rst

@@ -2332,15 +2332,15 @@ test it in a real application::
             $responseData = $service->createArticle($requestData);
 
             // Assert
-            self::assertSame('POST', $mockResponse->getRequestMethod());
-            self::assertSame('https://example.com/api/article', $mockResponse->getRequestUrl());
-            self::assertContains(
+            $this->assertSame('POST', $mockResponse->getRequestMethod());
+            $this->assertSame('https://example.com/api/article', $mockResponse->getRequestUrl());
+            $this->assertContains(
                 'Content-Type: application/json',
                 $mockResponse->getRequestOptions()['headers']
             );
-            self::assertSame($expectedRequestData, $mockResponse->getRequestOptions()['body']);
+            $this->assertSame($expectedRequestData, $mockResponse->getRequestOptions()['body']);
 
-            self::assertSame($responseData, $expectedResponseData);
+            $this->assertSame($responseData, $expectedResponseData);
         }
     }
 
@@ -2373,7 +2373,7 @@ test. Then, save that information as a ``.har`` file somewhere in your applicati
             $responseData = $service->createArticle($requestData);
 
             // Assert
-            self::assertSame($responseData, 'the expected response');
+            $this->assertSame($responseData, 'the expected response');
         }
     }