PHPUnit's version of this assertion is now final. We have to rename it.

This was the best method name I could come up with.

I'm sure I'll come up with something better at 11pm when I'm trying to sleep but this will do for now.

tests/ConfiguratorTest.php

@@ -638,13 +638,13 @@ protected function assertConfigFileContains($content)
         $this->assertEquals('array', gettype(include $path));
 
         // Assert begining and end of config is untouched.
-        $this->assertStringContainsString($beginning, $contents);
-        $this->assertStringContainsString($end, $contents);
+        $this->assertStringContainsStringWithNormalizedLineEndings($beginning, $contents);
+        $this->assertStringContainsStringWithNormalizedLineEndings($end, $contents);
 
         // Assert irrelevant config is untouched.
-        $this->assertStringContainsString($extraConfig, $contents);
+        $this->assertStringContainsStringWithNormalizedLineEndings($extraConfig, $contents);
 
         // Assert config file contains specific content.
-        return $this->assertStringContainsString($content, $contents);
+        return $this->assertStringContainsStringWithNormalizedLineEndings($content, $contents);
     }
 }

tests/MigrateAssetContainerTest.php

@@ -694,14 +694,14 @@ protected function assertFilesystemConfigFileContains($content)
         $this->assertEquals('array', gettype(include $configPath));
 
         // Assert begining and end of config is untouched.
-        $this->assertStringContainsString($beginning, $config);
-        $this->assertStringContainsString($end, $config);
+        $this->assertStringContainsStringWithNormalizedLineEndings($beginning, $config);
+        $this->assertStringContainsStringWithNormalizedLineEndings($end, $config);
 
         // Assert irrelevant config is untouched.
-        $this->assertStringContainsString($irrelevantConfig, $config);
+        $this->assertStringContainsStringWithNormalizedLineEndings($irrelevantConfig, $config);
 
         // Assert config file contains specific content.
-        return $this->assertStringContainsString($content, $config);
+        return $this->assertStringContainsStringWithNormalizedLineEndings($content, $config);
     }
 
     /**
@@ -733,7 +733,7 @@ protected function assertGitConfigPathExists($publicRelativePath)
     {
         $configPath = config_path('statamic/git.php');
 
-        $this->assertStringContainsString("public_path('{$publicRelativePath}')", $this->files->get($configPath));
+        $this->assertStringContainsStringWithNormalizedLineEndings("public_path('{$publicRelativePath}')", $this->files->get($configPath));
 
         return $this->assertContains(public_path($publicRelativePath), Arr::get(include $configPath, 'paths'));
     }

tests/MigrateSettingsTest.php

@@ -300,11 +300,11 @@ protected function assertConfigFileContains($file, $content)
         $this->assertEquals('array', gettype(include $config));
 
         // Assert begining and end of config is untouched.
-        $this->assertStringContainsString($beginning, $this->files->get($config));
-        $this->assertStringContainsString($end, $this->files->get($config));
+        $this->assertStringContainsStringWithNormalizedLineEndings($beginning, $this->files->get($config));
+        $this->assertStringContainsStringWithNormalizedLineEndings($end, $this->files->get($config));
 
         // Assert config file contains specific content.
-        return $this->assertStringContainsString($content, $this->files->get($config));
+        return $this->assertStringContainsStringWithNormalizedLineEndings($content, $this->files->get($config));
     }
 
     /**
@@ -325,9 +325,9 @@ protected function assertRoutesFileContains($content)
         $end = '];';
 
         // Assert begining of routes file is untouched.
-        $this->assertStringContainsString($beginning, $contents);
+        $this->assertStringContainsStringWithNormalizedLineEndings($beginning, $contents);
 
         // Assert routes file contains specific content.
-        return $this->assertStringContainsString($content, $contents);
+        return $this->assertStringContainsStringWithNormalizedLineEndings($content, $contents);
     }
 }

tests/RouterTest.php

@@ -155,10 +155,10 @@ protected function assertRoutesFileContains($content)
 EOT;
 
         // Assert begining of routes file is untouched.
-        $this->assertStringContainsString($beginning, $contents);
+        $this->assertStringContainsStringWithNormalizedLineEndings($beginning, $contents);
 
         // Assert routes file contains specific content.
-        return $this->assertStringContainsString($content, $contents);
+        return $this->assertStringContainsStringWithNormalizedLineEndings($content, $contents);
     }
 
     /**

tests/TestCase.php

@@ -122,14 +122,14 @@ protected function assertContainsIgnoringLineEndings($expected, $actual)
     {
         $actual = str_replace("\r\n", "\n", $actual);
 
-        $this->assertStringContainsString($expected, $actual);
+        $this->assertStringContainsStringWithNormalizedLineEndings($expected, $actual);
     }
 
     protected function assertFileHasContent($expected, $path)
     {
         $this->assertFileExists($path);
 
-        $this->assertStringContainsString($expected, $this->files->get($path));
+        $this->assertStringContainsStringWithNormalizedLineEndings($expected, $this->files->get($path));
     }
 
     protected function sitePath($append = null)
@@ -145,9 +145,9 @@ protected static function normalizeMultilineString($string)
     /**
      * Normalize line endings before performing assertion in windows.
      */
-    public static function assertStringContainsString($needle, $haystack, $message = ''): void
+    public static function assertStringContainsStringWithNormalizedLineEndings($needle, $haystack, $message = ''): void
     {
-        parent::assertStringContainsString(
+        static::assertStringContainsString(
             static::normalizeMultilineString($needle),
             static::normalizeMultilineString($haystack),
             $message