Merge branch '2.x' into 3.x

.github/workflows/markdown.yml

@@ -34,7 +34,7 @@ jobs:
 
       # @link https://github.com/marketplace/actions/markdownlint-cli2-action
       - name: Check markdown with CLI2
-        uses: DavidAnson/markdownlint-cli2-action@v16
+        uses: DavidAnson/markdownlint-cli2-action@v17
 
   remark:
     name: 'QA Markdown'

README.md

@@ -200,6 +200,7 @@ Features
 #### PHPUnit < 7.5.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertIsType`
 
 Polyfills the following methods:
+
 |                                   |                                   |                                 |
 | --------------------------------- | --------------------------------- | ------------------------------- |
 | [`Assert::assertIsArray()`]       | [`Assert::assertIsBool()`]        | [`Assert::assertIsFloat()`]     |
@@ -239,6 +240,7 @@ These methods were introduced in PHPUnit 7.5.0 as alternatives to the `Assert::a
 #### PHPUnit < 7.5.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertStringContains`
 
 Polyfills the following methods:
+
 |                                                      |                                                         |
 | ---------------------------------------------------- | ------------------------------------------------------- |
 | [`Assert::assertStringContainsString()`]             | [`Assert::assertStringNotContainsString()`]             |
@@ -254,6 +256,7 @@ These methods were introduced in PHPUnit 7.5.0 as alternatives to using `Assert:
 #### PHPUnit < 7.5.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertEqualsSpecializations`
 
 Polyfills the following methods:
+
 |                                          |                                             |
 | ---------------------------------------- | ------------------------------------------- |
 | [`Assert::assertEqualsCanonicalizing()`] | [`Assert::assertNotEqualsCanonicalizing()`] |
@@ -269,6 +272,7 @@ These methods were introduced in PHPUnit 7.5.0 as alternatives to using `Assert:
 [`Assert::assertEqualsWithDelta()`]:         https://docs.phpunit.de/en/main/assertions.html#assertequalswithdelta
 [`Assert::assertNotEqualsWithDelta()`]:      https://docs.phpunit.de/en/main/assertions.html#assertequalswithdelta
 
+
 #### PHPUnit < 8.4.0: `Yoast\PHPUnitPolyfills\Polyfills\ExpectExceptionMessageMatches`
 
 Polyfills the [`TestCase::expectExceptionMessageMatches()`] method.
@@ -281,6 +285,7 @@ The `TestCase::expectExceptionMessageRegExp()` method was soft deprecated in PHP
 #### PHPUnit < 8.5.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertFileEqualsSpecializations`
 
 Polyfills the following methods:
+
 |                                                    |                                                       |
 | -------------------------------------------------- | ----------------------------------------------------- |
 | [`Assert::assertFileEqualsCanonicalizing()`]       | [`Assert::assertFileNotEqualsCanonicalizing()`]       |
@@ -302,6 +307,7 @@ These methods were introduced in PHPUnit 8.5.0 as alternatives to using `Assert:
 #### PHPUnit < 9.0.0: `Yoast\PHPUnitPolyfills\Polyfills\EqualToSpecializations`
 
 Polyfills the following methods:
+
 |                                   |                                 |
 | --------------------------------- | ------------------------------- |
 | `Assert::equalToCanonicalizing()` | `Assert::equalToIgnoringCase()` |
@@ -340,6 +346,7 @@ The original methods these new methods replace were hard deprecated in PHPUnit 9
 #### PHPUnit < 9.3.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertClosedResource`
 
 Polyfills the following methods:
+
 |                                      |                                         |
 | ------------------------------------ | --------------------------------------- |
 | [`Assert::assertIsClosedResource()`] | [`Assert::assertIsNotClosedResource()`] |
@@ -390,6 +397,7 @@ The `assertObjectEquals()` assertion was introduced in PHPUnit 9.4.0.
 #### PHPUnit < 10.0.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertIgnoringLineEndings`
 
 Polyfills the following methods:
+
 |                                                           |                                                             |
 | --------------------------------------------------------- | ----------------------------------------------------------- |
 | [`Assert::assertStringEqualsStringIgnoringLineEndings()`] | [`Assert::assertStringContainsStringIgnoringLineEndings()`] |
@@ -402,6 +410,7 @@ These methods were introduced in PHPUnit 10.0.0.
 #### PHPUnit < 10.0.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertIsList`
 
 Polyfills the following method:
+
 |                            |
 | -------------------------- |
 | [`Assert::assertIsList()`] |
@@ -412,7 +421,8 @@ This method was introduced in PHPUnit 10.0.0.
 
 #### PHPUnit < 10.1.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertObjectProperty`
 
-Polyfills the following method:
+Polyfills the following methods:
+
 |                                       |                                          |
 | ------------------------------------- | ---------------------------------------- |
 | [`Assert::assertObjectHasProperty()`] | [`Assert::assertObjectNotHasProperty()`] |
@@ -426,7 +436,8 @@ These methods were later backported to the PHPUnit 9 branch and included in the
 
 #### PHPUnit < 11.0.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertArrayWithListKeys`
 
-Polyfills the following method:
+Polyfills the following methods:
+
 |                                                                      |                                                               |
 | -------------------------------------------------------------------- | ------------------------------------------------------------- |
 | [`Assert::assertArrayIsEqualToArrayOnlyConsideringListOfKeys()`]     | [`Assert::assertArrayIsEqualToArrayIgnoringListOfKeys()`]     |