diff -u b/core/modules/system/tests/src/Functional/Image/ToolkitTestBase.php b/core/modules/system/tests/src/Functional/Image/ToolkitTestBase.php --- b/core/modules/system/tests/src/Functional/Image/ToolkitTestBase.php +++ b/core/modules/system/tests/src/Functional/Image/ToolkitTestBase.php @@ -14,7 +14,6 @@ use TestFileCreationTrait { getTestFiles as drupalGetTestFiles; } - /** * Modules to enable. * @@ -104,10 +103,10 @@ // Determine if there were any expected that were not called. $uncalled = array_diff($expected, $actual); if (count($uncalled)) { - $this->assertTrue(FALSE, new FormattableMarkup('Expected operations %expected to be called but %uncalled was not called.', ['%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled)])); + $this->assertTrue(FALSE, SafeMarkup::format('Expected operations %expected to be called but %uncalled was not called.', ['%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled)])); } else { - $this->assertTrue(TRUE, new FormattableMarkup('All the expected operations were called: %expected', ['%expected' => implode(', ', $expected)])); + $this->assertTrue(TRUE, SafeMarkup::format('All the expected operations were called: %expected', ['%expected' => implode(', ', $expected)])); } // Determine if there were any unexpected calls. @@ -115,7 +114,7 @@ // count it as an error. $unexpected = array_diff($actual, $expected); if (count($unexpected) && (!in_array('apply', $expected) || count(array_intersect($unexpected, $operations)) !== count($unexpected))) { - $this->assertTrue(FALSE, new FormattableMarkup('Unexpected operations were called: %unexpected.', ['%unexpected' => implode(', ', $unexpected)])); + $this->assertTrue(FALSE, SafeMarkup::format('Unexpected operations were called: %unexpected.', ['%unexpected' => implode(', ', $unexpected)])); } else { $this->assertTrue(TRUE, 'No unexpected operations were called.');