Issue #3135747 by alexpott, mondrake, jungle: assertStringContainsString() and...

Issue #3135747 by alexpott, mondrake, jungle: assertStringContainsString() and related BC layer in 8.8.x does not work as expected

core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/TestCompatibilityTrait.php

@@ -71,28 +71,28 @@ public static function assertNotEqualsCanonicalizing($expected, $actual, $messag
    * Forward compatibility for assertStringContainsString.
    */
   public static function assertStringContainsString($needle, $haystack, $message = '') {
-    static::assertContains($needle, $haystack, $message);
+    static::assertContains((string) $needle, (string) $haystack, $message);
   }
 
   /**
    * Forward compatibility for assertStringContainsStringIgnoringCase.
    */
   public static function assertStringContainsStringIgnoringCase($needle, $haystack, $message = '') {
-    static::assertContains($needle, $haystack, $message, TRUE);
+    static::assertContains((string) $needle, (string) $haystack, $message, TRUE);
   }
 
   /**
    * Forward compatibility for assertStringNotContainsString.
    */
   public static function assertStringNotContainsString($needle, $haystack, $message = '') {
-    static::assertNotContains($needle, $haystack, $message);
+    static::assertNotContains((string) $needle, (string) $haystack, $message);
   }
 
   /**
    * Forward compatibility for assertStringNotContainsStringIgnoringCase.
    */
   public static function assertStringNotContainsStringIgnoringCase($needle, $haystack, $message = '') {
-    static::assertNotContains($needle, $haystack, $message, TRUE);
+    static::assertNotContains((string) $needle, (string) $haystack, $message, TRUE);
   }
 
   /**

core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php

@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests;
 
+use Drupal\Component\Render\FormattableMarkup;
+
 /**
  * Tests the PHPUnit forward compatibility trait.
  *
@@ -48,6 +50,12 @@ public function testAssertStringContainsString() {
     $this->assertStringContainsStringIgnoringCase("bingo", "foobarBiNgObongo");
     $this->assertStringNotContainsString("buzzer", "BUZZERbingobongo");
     $this->assertStringNotContainsStringIgnoringCase("buzzer", "foobarBiNgObongo");
+
+    // Test with stringable objects.
+    $this->assertStringContainsString(new FormattableMarkup("bingo", []), new FormattableMarkup("foobarbingobongo", []));
+    $this->assertStringContainsStringIgnoringCase(new FormattableMarkup("bingo", []), new FormattableMarkup("foobarBiNgObongo", []));
+    $this->assertStringNotContainsString(new FormattableMarkup("buzzer", []), new FormattableMarkup("BUZZERbingobongo", []));
+    $this->assertStringNotContainsStringIgnoringCase(new FormattableMarkup("buzzer", []), new FormattableMarkup("foobarBiNgObongo", []));
   }
 
   /**