From 9e2f40e3831437c30f757c6aa798a56028105d50 Mon Sep 17 00:00:00 2001 From: Wouter Wolters Date: Thu, 5 Aug 2021 22:33:22 +0200 Subject: [PATCH] [TASK] Migrate functional tests to PHPunit v9 Rector is used to migrate functional tests to PHPunit v9. Resolves: #94724 Related: #94706 Releases: master Change-Id: I378acd4145aacb5448d461eec48c3a1695876d61 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/70238 Tested-by: Christian Kuhn Tested-by: core-ci Tested-by: Benni Mack Reviewed-by: Christian Kuhn Reviewed-by: Benni Mack --- .../Mfa/Provider/RecoveryCodesProviderTest.php | 12 ++++++------ .../Mfa/Provider/TotpProviderTest.php | 16 ++++++++-------- .../Cache/Backend/MemcachedBackendTest.php | 1 + .../Cache/Backend/RedisBackendTest.php | 1 + .../Cache/Backend/Typo3DatabaseBackendTest.php | 1 + .../Cache/Core/ClassAliasLoaderTest.php | 1 + .../Domain/Repository/PageRepositoryTest.php | 1 + .../Tests/Functional/Page/PageRendererTest.php | 11 ++++++----- .../Service/Archive/ZipServiceTest.php | 2 +- .../ViewHelpers/IconForRecordViewHelperTest.php | 1 + .../ViewHelpers/IconViewHelperTest.php | 1 + .../Functional/Service/ExtensionServiceTest.php | 1 + .../ViewHelpers/Asset/ScriptViewHelperTest.php | 1 + .../ViewHelpers/ImageViewHelperTest.php | 2 +- .../ConditionMatching/ConditionMatcherTest.php | 1 + .../ContentObject/ContentObjectRendererTest.php | 1 + .../FluidTemplateContentObjectTest.php | 1 + .../Rendering/TitleTagRenderingTest.php | 4 ++-- .../Rendering/UriPrefixRenderingTest.php | 4 ++-- ...sAndTtContentWithRteImagesAndFileLinkTest.php | 2 +- .../Service/Typo3tempFileServiceTest.php | 5 +++-- .../Tests/Functional/LinkAnalyzerTest.php | 1 + .../Repository/BrokenLinkRepositoryTest.php | 1 + .../Functional/Service/IntegrityServiceTest.php | 1 + .../Functional/Service/RedirectServiceTest.php | 1 + .../XmlSitemap/XmlSitemapIndexTest.php | 2 +- .../XmlSitemap/XmlSitemapPagesTest.php | 2 +- .../Functional/XmlSitemap/XmlSitemapXslTest.php | 2 +- 28 files changed, 49 insertions(+), 31 deletions(-) diff --git a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/RecoveryCodesProviderTest.php b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/RecoveryCodesProviderTest.php index 85a31fd5cac6..622cc25e60c1 100644 --- a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/RecoveryCodesProviderTest.php +++ b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/RecoveryCodesProviderTest.php @@ -249,11 +249,11 @@ public function editViewTest(): void $propertyManager = MfaProviderPropertyManager::create($this->subject, $this->user); $response = $this->subject->handleRequest($request, $propertyManager, MfaViewType::EDIT)->getBody()->getContents(); - self::assertRegExp('/.*Name.*.*some name/s', $response); - self::assertRegExp('/.*Recovery codes left.*.*2/s', $response); - self::assertRegExp('/.*Last updated.*.*18-03-21/s', $response); - self::assertRegExp('/.*Last used.*.*18-03-21/s', $response); - self::assertRegExp('/.*Name.*.*some name/s', $response); + self::assertMatchesRegularExpression('/.*Recovery codes left.*.*2/s', $response); + self::assertMatchesRegularExpression('/.*Last updated.*.*18-03-21/s', $response); + self::assertMatchesRegularExpression('/.*Last used.*.*18-03-21/s', $response); + self::assertMatchesRegularExpression('/subject, $this->user); $response = $this->subject->handleRequest($request, $propertyManager, MfaViewType::AUTH)->getBody()->getContents(); - self::assertRegExp('/setupUser(['recovery-codes' => ['active' => true, 'codes' => ['some-code'], 'attempts' => 3]]); diff --git a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/TotpProviderTest.php b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/TotpProviderTest.php index 9465e19fd275..3eb059b728e8 100644 --- a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/TotpProviderTest.php +++ b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/TotpProviderTest.php @@ -243,10 +243,10 @@ public function setupViewTest(): void $propertyManager = MfaProviderPropertyManager::create($this->subject, $this->user); $response = $this->subject->handleRequest($request, $propertyManager, MfaViewType::SETUP)->getBody()->getContents(); - self::assertRegExp('/setupUser(['active' => true, 'secret' => 'KRMVATZTJFZUC53FONXW2ZJB', 'attempts' => 3]); diff --git a/typo3/sysext/core/Tests/Functional/Cache/Backend/MemcachedBackendTest.php b/typo3/sysext/core/Tests/Functional/Cache/Backend/MemcachedBackendTest.php index 81be1194c2ac..88ca6bc5e714 100644 --- a/typo3/sysext/core/Tests/Functional/Cache/Backend/MemcachedBackendTest.php +++ b/typo3/sysext/core/Tests/Functional/Cache/Backend/MemcachedBackendTest.php @@ -26,6 +26,7 @@ */ class MemcachedBackendTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * Sets up this test case */ diff --git a/typo3/sysext/core/Tests/Functional/Cache/Backend/RedisBackendTest.php b/typo3/sysext/core/Tests/Functional/Cache/Backend/RedisBackendTest.php index 87e355c2a0dc..89b87dd6435d 100644 --- a/typo3/sysext/core/Tests/Functional/Cache/Backend/RedisBackendTest.php +++ b/typo3/sysext/core/Tests/Functional/Cache/Backend/RedisBackendTest.php @@ -33,6 +33,7 @@ */ class RedisBackendTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * Set up */ diff --git a/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php b/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php index 55c607b409e9..6c89d60b758d 100644 --- a/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php +++ b/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php @@ -26,6 +26,7 @@ */ class Typo3DatabaseBackendTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @test */ diff --git a/typo3/sysext/core/Tests/Functional/Cache/Core/ClassAliasLoaderTest.php b/typo3/sysext/core/Tests/Functional/Cache/Core/ClassAliasLoaderTest.php index 8a427fcb3691..bf1ecd37f5b2 100644 --- a/typo3/sysext/core/Tests/Functional/Cache/Core/ClassAliasLoaderTest.php +++ b/typo3/sysext/core/Tests/Functional/Cache/Core/ClassAliasLoaderTest.php @@ -20,6 +20,7 @@ class ClassAliasLoaderTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @var array Load test fixture extension */ diff --git a/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php b/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php index f68e70b16203..b2097f0b54c5 100644 --- a/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php +++ b/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php @@ -33,6 +33,7 @@ */ class PageRepositoryTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; protected function setUp(): void { parent::setUp(); diff --git a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php index 4225dea0d46e..4876dfc95c1e 100644 --- a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php +++ b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php @@ -33,6 +33,7 @@ */ class PageRendererTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @test */ @@ -123,9 +124,9 @@ public function pageRendererRendersInsertsMainContentStringsInOutput() self::assertStringContainsString($expectedBaseUrlString, $renderedString); self::assertStringContainsString($expectedInlineCommentString, $renderedString); self::assertStringContainsString($expectedHeaderData, $renderedString); - self::assertRegExp($expectedJsLibraryRegExp, $renderedString); - self::assertRegExp($expectedJsFileRegExp, $renderedString); - self::assertRegExp($expectedJsFileWithoutTypeRegExp, $renderedString); + self::assertMatchesRegularExpression($expectedJsLibraryRegExp, $renderedString); + self::assertMatchesRegularExpression($expectedJsFileRegExp, $renderedString); + self::assertMatchesRegularExpression($expectedJsFileWithoutTypeRegExp, $renderedString); self::assertStringContainsString($expectedJsInlineCodeString, $renderedString); self::assertStringContainsString($expectedCssFileString, $renderedString); self::assertStringContainsString($expectedCssInlineBlockOnTopString, $renderedString); @@ -212,8 +213,8 @@ public function pageRendererRendersFooterValues() $renderedString = $subject->render(); self::assertStringContainsString($expectedFooterData, $renderedString); - self::assertRegExp($expectedJsFooterLibraryRegExp, $renderedString); - self::assertRegExp($expectedJsFooterRegExp, $renderedString); + self::assertMatchesRegularExpression($expectedJsFooterLibraryRegExp, $renderedString); + self::assertMatchesRegularExpression($expectedJsFooterRegExp, $renderedString); self::assertStringContainsString($expectedJsFooterInlineCodeString, $renderedString); self::assertStringContainsString($expectedInlineLabelReturnValue, $renderedString); self::assertStringContainsString($expectedLanguageLabel1, $renderedString); diff --git a/typo3/sysext/core/Tests/Functional/Service/Archive/ZipServiceTest.php b/typo3/sysext/core/Tests/Functional/Service/Archive/ZipServiceTest.php index 8575acb3b247..fee94c115109 100644 --- a/typo3/sysext/core/Tests/Functional/Service/Archive/ZipServiceTest.php +++ b/typo3/sysext/core/Tests/Functional/Service/Archive/ZipServiceTest.php @@ -67,7 +67,7 @@ public function filesCanNotGetExtractedOutsideTargetDirectory(): void __DIR__ . '/Fixtures/malicious.zip', $extensionDirectory ); - self::assertFileNotExists($extensionDirectory . '/../tool.php'); + self::assertFileDoesNotExist($extensionDirectory . '/../tool.php'); self::assertFileExists($extensionDirectory . '/tool.php'); // This is a smoke test to verify PHP's zip library is broken regarding symlinks self::assertFileExists($extensionDirectory . '/passwd'); diff --git a/typo3/sysext/core/Tests/Functional/ViewHelpers/IconForRecordViewHelperTest.php b/typo3/sysext/core/Tests/Functional/ViewHelpers/IconForRecordViewHelperTest.php index 1c2e4d1a55d5..d5a5a80aeb5f 100644 --- a/typo3/sysext/core/Tests/Functional/ViewHelpers/IconForRecordViewHelperTest.php +++ b/typo3/sysext/core/Tests/Functional/ViewHelpers/IconForRecordViewHelperTest.php @@ -26,6 +26,7 @@ class IconForRecordViewHelperTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @test */ diff --git a/typo3/sysext/core/Tests/Functional/ViewHelpers/IconViewHelperTest.php b/typo3/sysext/core/Tests/Functional/ViewHelpers/IconViewHelperTest.php index cdeca7b90a7f..532363ae1de2 100644 --- a/typo3/sysext/core/Tests/Functional/ViewHelpers/IconViewHelperTest.php +++ b/typo3/sysext/core/Tests/Functional/ViewHelpers/IconViewHelperTest.php @@ -27,6 +27,7 @@ class IconViewHelperTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @test */ diff --git a/typo3/sysext/extbase/Tests/Functional/Service/ExtensionServiceTest.php b/typo3/sysext/extbase/Tests/Functional/Service/ExtensionServiceTest.php index ae9e7adf86f7..f47e87cf5b14 100644 --- a/typo3/sysext/extbase/Tests/Functional/Service/ExtensionServiceTest.php +++ b/typo3/sysext/extbase/Tests/Functional/Service/ExtensionServiceTest.php @@ -30,6 +30,7 @@ class ExtensionServiceTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @var array */ diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Asset/ScriptViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Asset/ScriptViewHelperTest.php index bbb566a913f8..12dd9a215a3d 100644 --- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Asset/ScriptViewHelperTest.php +++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Asset/ScriptViewHelperTest.php @@ -24,6 +24,7 @@ class ScriptViewHelperTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; public function valueDataProvider(): array { return [ diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/ImageViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/ImageViewHelperTest.php index e70425df1557..ab5d130872e2 100644 --- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/ImageViewHelperTest.php +++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/ImageViewHelperTest.php @@ -75,6 +75,6 @@ public function renderReturnsExpectedMarkup(string $template, string $expected): { $view = new StandaloneView(); $view->setTemplateSource($template); - self::assertRegExp($expected, $view->render()); + self::assertMatchesRegularExpression($expected, $view->render()); } } diff --git a/typo3/sysext/frontend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/frontend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php index e8595d01dcf8..870c8e81bbc5 100644 --- a/typo3/sysext/frontend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php +++ b/typo3/sysext/frontend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php @@ -41,6 +41,7 @@ */ class ConditionMatcherTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * Sets up this test case. */ diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php index 87a22f2ea2f0..74e2d76e07f5 100644 --- a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php +++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php @@ -37,6 +37,7 @@ */ class ContentObjectRendererTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; use SiteBasedTestTrait; /** diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php index 7b43d614360c..ad37bb60da35 100644 --- a/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php +++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php @@ -28,6 +28,7 @@ */ class FluidTemplateContentObjectTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @var array */ diff --git a/typo3/sysext/frontend/Tests/Functional/Rendering/TitleTagRenderingTest.php b/typo3/sysext/frontend/Tests/Functional/Rendering/TitleTagRenderingTest.php index bd97e013933c..48010198f5de 100644 --- a/typo3/sysext/frontend/Tests/Functional/Rendering/TitleTagRenderingTest.php +++ b/typo3/sysext/frontend/Tests/Functional/Rendering/TitleTagRenderingTest.php @@ -233,10 +233,10 @@ public function checkIfCorrectTitleTagIsRendered($pageConfig, $expectations): vo ); $content = (string)$response->getBody(); if ($expectations['assertRegExp']) { - self::assertRegExp($expectations['assertRegExp'], $content); + self::assertMatchesRegularExpression($expectations['assertRegExp'], $content); } if ($expectations['assertNotRegExp']) { - self::assertNotRegExp($expectations['assertNotRegExp'], $content); + self::assertDoesNotMatchRegularExpression($expectations['assertNotRegExp'], $content); } } } diff --git a/typo3/sysext/frontend/Tests/Functional/Rendering/UriPrefixRenderingTest.php b/typo3/sysext/frontend/Tests/Functional/Rendering/UriPrefixRenderingTest.php index f2dbf44476b2..60b9770231b6 100644 --- a/typo3/sysext/frontend/Tests/Functional/Rendering/UriPrefixRenderingTest.php +++ b/typo3/sysext/frontend/Tests/Functional/Rendering/UriPrefixRenderingTest.php @@ -353,12 +353,12 @@ function (string $candidateKey) use ($type) { ); if ($shallExist) { - self::assertRegExp( + self::assertMatchesRegularExpression( '#' . $pattern . '#', $content ); } else { - self::assertNotRegExp( + self::assertDoesNotMatchRegularExpression( '#' . $pattern . '#', $content ); diff --git a/typo3/sysext/impexp/Tests/Functional/Import/PagesAndTtContentWithRteImagesAndFileLinkTest.php b/typo3/sysext/impexp/Tests/Functional/Import/PagesAndTtContentWithRteImagesAndFileLinkTest.php index e2f618f7ca46..7b65d1dcc05e 100644 --- a/typo3/sysext/impexp/Tests/Functional/Import/PagesAndTtContentWithRteImagesAndFileLinkTest.php +++ b/typo3/sysext/impexp/Tests/Functional/Import/PagesAndTtContentWithRteImagesAndFileLinkTest.php @@ -51,7 +51,7 @@ public function importPagesAndRelatedTtContentWithRteImagesAndFileLink() $this->assertCSVDataSet('EXT:impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithRteImagesAndFileLink.csv'); - self::assertFileNotExists(Environment::getPublicPath() . '/fileadmin/_processed_/csm_typo3_image2_5c2670fd59.jpg'); + self::assertFileDoesNotExist(Environment::getPublicPath() . '/fileadmin/_processed_/csm_typo3_image2_5c2670fd59.jpg'); self::assertFileEquals(__DIR__ . '/../Fixtures/Folders/fileadmin/user_upload/typo3_image2.jpg', Environment::getPublicPath() . '/fileadmin/user_upload/typo3_image2.jpg'); self::assertFileEquals(__DIR__ . '/../Fixtures/Folders/fileadmin/user_upload/typo3_image3.jpg', Environment::getPublicPath() . '/fileadmin/user_upload/typo3_image3.jpg'); diff --git a/typo3/sysext/install/Tests/Functional/Service/Typo3tempFileServiceTest.php b/typo3/sysext/install/Tests/Functional/Service/Typo3tempFileServiceTest.php index 1762d19ece17..4118a78ebb81 100644 --- a/typo3/sysext/install/Tests/Functional/Service/Typo3tempFileServiceTest.php +++ b/typo3/sysext/install/Tests/Functional/Service/Typo3tempFileServiceTest.php @@ -29,6 +29,7 @@ */ class Typo3tempFileServiceTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @var string */ @@ -82,8 +83,8 @@ public function clearAssetsFolderClearsFolder() $subject = new Typo3tempFileService($processedFileRepository->reveal(), $storageRepository->reveal()); $subject->clearAssetsFolder('/typo3temp/assets/' . $this->directoryName); - self::assertDirectoryNotExists($this->directoryPath . '/a'); + self::assertDirectoryDoesNotExist($this->directoryPath . '/a'); self::assertDirectoryExists($this->directoryPath); - self::assertFileNotExists($this->directoryPath . '/c.css'); + self::assertFileDoesNotExist($this->directoryPath . '/c.css'); } } diff --git a/typo3/sysext/linkvalidator/Tests/Functional/LinkAnalyzerTest.php b/typo3/sysext/linkvalidator/Tests/Functional/LinkAnalyzerTest.php index 6feed7121eef..19d59cafb398 100644 --- a/typo3/sysext/linkvalidator/Tests/Functional/LinkAnalyzerTest.php +++ b/typo3/sysext/linkvalidator/Tests/Functional/LinkAnalyzerTest.php @@ -25,6 +25,7 @@ class LinkAnalyzerTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; protected $coreExtensionsToLoad = [ 'seo', 'linkvalidator', diff --git a/typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php b/typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php index 26cf47773350..ca7e04dd59b1 100644 --- a/typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php +++ b/typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php @@ -25,6 +25,7 @@ class BrokenLinkRepositoryTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @var array */ diff --git a/typo3/sysext/redirects/Tests/Functional/Service/IntegrityServiceTest.php b/typo3/sysext/redirects/Tests/Functional/Service/IntegrityServiceTest.php index b48d75843296..c31c9dfde3dc 100644 --- a/typo3/sysext/redirects/Tests/Functional/Service/IntegrityServiceTest.php +++ b/typo3/sysext/redirects/Tests/Functional/Service/IntegrityServiceTest.php @@ -29,6 +29,7 @@ class IntegrityServiceTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; /** * @var bool Reset singletons created by subject */ diff --git a/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php b/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php index 1ef342ef9777..0c8fdfef8c5a 100644 --- a/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php +++ b/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php @@ -34,6 +34,7 @@ class RedirectServiceTest extends FunctionalTestCase { + use \Prophecy\PhpUnit\ProphecyTrait; use SiteBasedTestTrait; /** diff --git a/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapIndexTest.php b/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapIndexTest.php index d240ccb80e19..d36981081967 100644 --- a/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapIndexTest.php +++ b/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapIndexTest.php @@ -70,6 +70,6 @@ public function checkIfSiteMapIndexContainsPagesSitemap(): void self::assertEquals('application/xml;charset=utf-8', $response->getHeader('Content-Type')[0]); self::assertArrayHasKey('X-Robots-Tag', $response->getHeaders()); self::assertEquals('noindex', $response->getHeader('X-Robots-Tag')[0]); - self::assertRegExp('/http:\/\/localhost\/\?sitemap=pages&type=1533906435&cHash=[^<]+<\/loc>/', (string)$response->getBody()); + self::assertMatchesRegularExpression('/http:\/\/localhost\/\?sitemap=pages&type=1533906435&cHash=[^<]+<\/loc>/', (string)$response->getBody()); } } diff --git a/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapPagesTest.php b/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapPagesTest.php index 60c4cc415796..f7b6297968de 100644 --- a/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapPagesTest.php +++ b/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapPagesTest.php @@ -39,7 +39,7 @@ public function checkIfPagesSiteMapContainsExpectedEntries($urlPattern): void self::assertArrayHasKey('X-Robots-Tag', $response->getHeaders()); self::assertEquals('noindex', $response->getHeader('X-Robots-Tag')[0]); - self::assertRegExp($urlPattern, (string)$response->getBody()); + self::assertMatchesRegularExpression($urlPattern, (string)$response->getBody()); } /** diff --git a/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapXslTest.php b/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapXslTest.php index 6fbda85f20ec..1e7a348d4a50 100644 --- a/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapXslTest.php +++ b/typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapXslTest.php @@ -68,7 +68,7 @@ public function checkIfDefaultSitemapReturnsDefaultXsl($typoscriptSetupFiles, $s (new InternalRequest('http://localhost/'))->withQueryParameters($config) ); - self::assertRegExp('/<\?xml-stylesheet type="text\/xsl" href="' . $xslFilePath . '"\?>/', (string)$response->getBody()); + self::assertMatchesRegularExpression('/<\?xml-stylesheet type="text\/xsl" href="' . $xslFilePath . '"\?>/', (string)$response->getBody()); } public function getXslFilePathsDataProvider(): array