From 945e27b0a312c4f545194be82060b0283b86d190 Mon Sep 17 00:00:00 2001
From: Oliver Bartsch <bo@cedev.de>
Date: Fri, 23 Feb 2024 10:38:38 +0100
Subject: [PATCH] [TASK] Ensure using symfony container in tests
A couple of tests are adding services to a
container instance. Since the `ContainerInterface`
does not define the used `set()` method, the
tests are adjusted to explicitly require the
symfony service container, which provides
mentioned `set()` method.
Resolves: #103183
Releases: main, 12.4
Change-Id: Icdb36a0ea871d79cd2c280d5f17a00569b49cb2b
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83088
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
---
Build/phpstan/phpstan-baseline.neon | 10 ----------
.../Controller/BackendControllerTest.php | 2 +-
.../Controller/Page/TreeControllerTest.php | 2 +-
.../Configuration/FlexForm/FlexFormToolsTest.php | 15 +++++----------
.../core/Tests/Functional/Mail/MailerTest.php | 2 +-
.../Resource/DefaultUploadFolderResolverTest.php | 4 ++--
.../Processing/PreviewProcessingTest.php | 2 +-
.../Tests/Functional/WidgetRegistryTest.php | 2 +-
.../FrontendConfigurationManagerTest.php | 2 +-
.../Validator/CollectionValidatorTest.php | 4 ++--
.../ViewHelpers/Form/SelectViewHelperTest.php | 8 ++++----
.../Format/PhpErrorCodeViewHelperTest.php | 2 +-
.../GlobalVariableProviderTest.php | 2 +-
.../Controller/ManagementControllerTest.php | 2 +-
.../EventListener/AddPageTypeZeroSourceTest.php | 2 +-
.../AddPlainSlugReplacementSourceTest.php | 2 +-
.../SlugRedirectChangeItemFactoryTest.php | 2 +-
.../Functional/Service/RedirectServiceTest.php | 2 +-
.../Tests/Functional/Service/SlugServiceTest.php | 4 ++--
.../Controller/BrowseLinksControllerTest.php | 2 +-
.../Canonical/CanonicalGeneratorTest.php | 2 +-
.../Tests/Functional/Hook/DataHandlerHookTest.php | 2 +-
22 files changed, 31 insertions(+), 46 deletions(-)
diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 74641593e13e..83dc831b781a 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -1970,11 +1970,6 @@ parameters:
count: 1
path: ../../typo3/sysext/fluid/Classes/ViewHelpers/Transform/HtmlViewHelper.php
- -
- message: "#^Call to an undefined method Psr\\\\Container\\\\ContainerInterface\\:\\:set\\(\\)\\.$#"
- count: 4
- path: ../../typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
-
-
message: "#^Parameter \\#1 \\$input of method TYPO3\\\\CMS\\\\Core\\\\Resource\\\\ResourceFactory\\:\\:retrieveFileOrFolderObject\\(\\) expects string, int given\\.$#"
count: 1
@@ -2880,11 +2875,6 @@ parameters:
count: 1
path: ../../typo3/sysext/install/Classes/Updates/DatabaseRowsUpdateWizard.php
- -
- message: "#^Call to an undefined method Psr\\\\Container\\\\ContainerInterface\\:\\:set\\(\\)\\.$#"
- count: 1
- path: ../../typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
-
-
message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertSame\\(\\) with array\\{string, string, string\\} and array\\<TYPO3\\\\CMS\\\\Core\\\\Messaging\\\\FlashMessage\\> will always evaluate to false\\.$#"
count: 1
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/BackendControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/BackendControllerTest.php
index ac32022e14a5..9e3d0e5252b6 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/BackendControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/BackendControllerTest.php
@@ -50,7 +50,7 @@ final class BackendControllerTest extends FunctionalTestCase
public function backendPageRenderEventIsTriggered(): void
{
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$state = [
'after-backend-page-render-listener' => null,
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php
index 78357e4f589a..6505baab6165 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php
@@ -719,7 +719,7 @@ final class TreeControllerTest extends FunctionalTestCase
$afterPageTreeItemsPreparedEvent = null;
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'after-page-tree-items-prepared-listener',
static function (AfterPageTreeItemsPreparedEvent $event) use (&$afterPageTreeItemsPreparedEvent) {
diff --git a/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php b/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php
index 51f35e6cbd21..155f89045dac 100644
--- a/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php
@@ -101,8 +101,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
];
/** @var Container $container */
- $container = $this->getContainer();
-
+ $container = $this->get('service_container');
$container->set(
'noop',
static function (BeforeFlexFormDataStructureIdentifierInitializedEvent $event) {
@@ -127,8 +126,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
$subject = new FlexFormTools();
/** @var Container $container */
- $container = $this->getContainer();
-
+ $container = $this->get('service_container');
$container->set(
'identifier-one',
static function (BeforeFlexFormDataStructureIdentifierInitializedEvent $event) {
@@ -156,8 +154,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
$subject = new FlexFormTools();
/** @var Container $container */
- $container = $this->getContainer();
-
+ $container = $this->get('service_container');
$container->set(
'modifier-one',
static function (AfterFlexFormDataStructureIdentifierInitializedEvent $event) {
@@ -1134,8 +1131,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
public function parseDataStructureByIdentifierParsesDataStructureReturnedByEvent(): void
{
/** @var Container $container */
- $container = $this->getContainer();
-
+ $container = $this->get('service_container');
$container->set(
'string',
static function (BeforeFlexFormDataStructureParsedEvent $event) {
@@ -1463,8 +1459,7 @@ final class FlexFormToolsTest extends FunctionalTestCase
$identifier = '{"type":"tca","tableName":"aTableName","fieldName":"aFieldName","dataStructureKey":"default"}';
/** @var Container $container */
- $container = $this->getContainer();
-
+ $container = $this->get('service_container');
$container->set(
'mock',
static function (AfterFlexFormDataStructureParsedEvent $event) {
diff --git a/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php b/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php
index 1bee83e36c98..8677f6fbc0df 100644
--- a/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php
+++ b/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php
@@ -42,7 +42,7 @@ final class MailerTest extends FunctionalTestCase
$afterMailerSentMessageEvent = null;
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'after-mailer-initialized-listener',
static function (AfterMailerInitializationEvent $event) use (&$afterMailerInitializedEvent) {
diff --git a/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php b/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php
index 37069864bb2c..733ea18b44a6 100644
--- a/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php
+++ b/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php
@@ -157,7 +157,7 @@ final class DefaultUploadFolderResolverTest extends FunctionalTestCase
$subject = GeneralUtility::makeInstance(DefaultUploadFolderResolver::class);
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'after-default-upload-folder-was-resolved-listener',
static function (AfterDefaultUploadFolderWasResolvedEvent $event) use (&$afterDefaultUploadFolderWasResolvedEvent) {
@@ -183,7 +183,7 @@ final class DefaultUploadFolderResolverTest extends FunctionalTestCase
$subject = GeneralUtility::makeInstance(DefaultUploadFolderResolver::class);
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'after-default-upload-folder-was-resolved-listener',
static function (AfterDefaultUploadFolderWasResolvedEvent $event) {
diff --git a/typo3/sysext/core/Tests/Functional/Resource/OnlineMedia/Processing/PreviewProcessingTest.php b/typo3/sysext/core/Tests/Functional/Resource/OnlineMedia/Processing/PreviewProcessingTest.php
index e029e0231241..07dacd7dbc26 100644
--- a/typo3/sysext/core/Tests/Functional/Resource/OnlineMedia/Processing/PreviewProcessingTest.php
+++ b/typo3/sysext/core/Tests/Functional/Resource/OnlineMedia/Processing/PreviewProcessingTest.php
@@ -45,7 +45,7 @@ final class PreviewProcessingTest extends FunctionalTestCase
$onlineMediaId = '2004';
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
$afterVideoPreviewFetchedEventListener,
static function (AfterVideoPreviewFetchedEvent $event) use (
diff --git a/typo3/sysext/dashboard/Tests/Functional/WidgetRegistryTest.php b/typo3/sysext/dashboard/Tests/Functional/WidgetRegistryTest.php
index 788d8d921b51..45e30a5ce168 100644
--- a/typo3/sysext/dashboard/Tests/Functional/WidgetRegistryTest.php
+++ b/typo3/sysext/dashboard/Tests/Functional/WidgetRegistryTest.php
@@ -38,7 +38,7 @@ final class WidgetRegistryTest extends FunctionalTestCase
protected function registerWidgets(): void
{
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$this->subject = new WidgetRegistry($container);
diff --git a/typo3/sysext/extbase/Tests/Functional/Configuration/FrontendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Functional/Configuration/FrontendConfigurationManagerTest.php
index f619549e33fa..f1f30bba8ba9 100644
--- a/typo3/sysext/extbase/Tests/Functional/Configuration/FrontendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Configuration/FrontendConfigurationManagerTest.php
@@ -61,7 +61,7 @@ final class FrontendConfigurationManagerTest extends FunctionalTestCase
$GLOBALS['TYPO3_REQUEST'] = (new ServerRequest())->withAttribute('frontend.typoscript', $frontendTypoScript);
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set('foo-flexform-listener', static function (BeforeFlexFormConfigurationOverrideEvent $event) {
$event->setFlexFormConfiguration([
'settings' => [
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
index 7c4ea30bf5b2..59506a2d278f 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
@@ -73,9 +73,9 @@ final class CollectionValidatorTest extends FunctionalTestCase
[$this->get(ReflectionService::class)]
);
/** @var ContainerBuilder $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(ValidatorResolver::class, $mockValidatorResolver);
- $subject = $this->get(CollectionValidator::class);
+ $subject = $container->get(CollectionValidator::class);
$subject->setOptions(['elementValidator' => 'EmailAddress']);
$emailAddressValidator = new EmailAddressValidator();
$emailAddressValidator->setOptions([]);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
index ffae7b1528ee..52b2b015ed8c 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
@@ -427,7 +427,7 @@ EOT;
return $object->getId();
}
);
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(PersistenceManager::class, $mockPersistenceManager);
$context = $container->get(RenderingContextFactory::class)->create();
@@ -459,7 +459,7 @@ EOT;
// Mock persistence manager for our domain objects and set into container
$mockPersistenceManager = $this->createMock(PersistenceManagerInterface::class);
$mockPersistenceManager->method('getIdentifierByObject')->willReturn('fakeUid');
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(PersistenceManager::class, $mockPersistenceManager);
$context = $container->get(RenderingContextFactory::class)->create();
@@ -488,7 +488,7 @@ EOT;
// Mock persistence manager for our domain objects and set into container
$mockPersistenceManager = $this->createMock(PersistenceManagerInterface::class);
$mockPersistenceManager->method('getIdentifierByObject')->willReturn('fakeUid');
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(PersistenceManager::class, $mockPersistenceManager);
$context = $container->get(RenderingContextFactory::class)->create();
@@ -517,7 +517,7 @@ EOT;
// Mock persistence manager for our domain objects and set into container
$mockPersistenceManager = $this->createMock(PersistenceManagerInterface::class);
$mockPersistenceManager->method('getIdentifierByObject')->willReturn(null);
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(PersistenceManager::class, $mockPersistenceManager);
$context = $container->get(RenderingContextFactory::class)->create();
diff --git a/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php b/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
index e01ce15d5809..7acc1776eca1 100644
--- a/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
+++ b/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
@@ -61,7 +61,7 @@ final class PhpErrorCodeViewHelperTest extends FunctionalTestCase
// of ext:install VH's in container. To circumvent this conflict, we for now
// instantiate our VH SuT and container->set() it to force service resolving.
$viewHelperInstance = new PhpErrorCodeViewHelper();
- $this->getContainer()->set(PhpErrorCodeViewHelper::class, $viewHelperInstance);
+ $this->get('service_container')->set(PhpErrorCodeViewHelper::class, $viewHelperInstance);
$context = $this->get(RenderingContextFactory::class)->create();
$context->getViewHelperResolver()->addNamespace('install', 'TYPO3\\CMS\\Install\\ViewHelpers');
diff --git a/typo3/sysext/lowlevel/Tests/Functional/ConfigurationModuleProvider/GlobalVariableProviderTest.php b/typo3/sysext/lowlevel/Tests/Functional/ConfigurationModuleProvider/GlobalVariableProviderTest.php
index e3188dcd9613..92dca91aba8a 100644
--- a/typo3/sysext/lowlevel/Tests/Functional/ConfigurationModuleProvider/GlobalVariableProviderTest.php
+++ b/typo3/sysext/lowlevel/Tests/Functional/ConfigurationModuleProvider/GlobalVariableProviderTest.php
@@ -40,7 +40,7 @@ final class GlobalVariableProviderTest extends FunctionalTestCase
$modifiedBlindedConfigurationOptions = [$globalVariableKey => $blindedConfiguration];
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'modify-blinded-configuration-options',
static function (ModifyBlindedConfigurationOptionsEvent $event) use (
diff --git a/typo3/sysext/redirects/Tests/Functional/Controller/ManagementControllerTest.php b/typo3/sysext/redirects/Tests/Functional/Controller/ManagementControllerTest.php
index 531f61e19f99..3ba1c4e77124 100644
--- a/typo3/sysext/redirects/Tests/Functional/Controller/ManagementControllerTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/Controller/ManagementControllerTest.php
@@ -61,7 +61,7 @@ final class ManagementControllerTest extends FunctionalTestCase
$setHosts = ['*', 'example.com'];
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'modify-redirect-management-controller-view-data-event',
static function (ModifyRedirectManagementControllerViewDataEvent $event) use (
diff --git a/typo3/sysext/redirects/Tests/Functional/EventListener/AddPageTypeZeroSourceTest.php b/typo3/sysext/redirects/Tests/Functional/EventListener/AddPageTypeZeroSourceTest.php
index 8c1084c4c2f2..9ed4c2dc8683 100644
--- a/typo3/sysext/redirects/Tests/Functional/EventListener/AddPageTypeZeroSourceTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/EventListener/AddPageTypeZeroSourceTest.php
@@ -154,7 +154,7 @@ final class AddPageTypeZeroSourceTest extends FunctionalTestCase
$siteLanguage = $site->getDefaultLanguage();
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'add-custom-page-type-source',
static function (SlugRedirectChangeItemCreatedEvent $event) {
diff --git a/typo3/sysext/redirects/Tests/Functional/EventListener/AddPlainSlugReplacementSourceTest.php b/typo3/sysext/redirects/Tests/Functional/EventListener/AddPlainSlugReplacementSourceTest.php
index 40ec91542012..c2cbc58194ce 100644
--- a/typo3/sysext/redirects/Tests/Functional/EventListener/AddPlainSlugReplacementSourceTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/EventListener/AddPlainSlugReplacementSourceTest.php
@@ -45,7 +45,7 @@ final class AddPlainSlugReplacementSourceTest extends FunctionalTestCase
// Removing AddPageTypeZeroSource event is needed to avoid cross dependency here for this test.
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
AddPageTypeZeroSource::class,
static function (SlugRedirectChangeItemCreatedEvent $event) {}
diff --git a/typo3/sysext/redirects/Tests/Functional/RedirectUpdate/SlugRedirectChangeItemFactoryTest.php b/typo3/sysext/redirects/Tests/Functional/RedirectUpdate/SlugRedirectChangeItemFactoryTest.php
index 2be8cbad815d..93a951bc7337 100644
--- a/typo3/sysext/redirects/Tests/Functional/RedirectUpdate/SlugRedirectChangeItemFactoryTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/RedirectUpdate/SlugRedirectChangeItemFactoryTest.php
@@ -118,7 +118,7 @@ final class SlugRedirectChangeItemFactoryTest extends FunctionalTestCase
]);
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'slug-redirect-change-item-created',
static function (SlugRedirectChangeItemCreatedEvent $event) use (
diff --git a/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php b/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php
index a2640975718d..b61343b5f589 100644
--- a/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php
@@ -892,7 +892,7 @@ final class RedirectServiceTest extends FunctionalTestCase
$dispatchedEvents = [];
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'before-redirect-match-domain-event-is-triggered',
static function (BeforeRedirectMatchDomainEvent $event) use (
diff --git a/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php b/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php
index 63d7092dcdb1..54393e0fa64f 100644
--- a/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php
@@ -420,7 +420,7 @@ final class SlugServiceTest extends FunctionalTestCase
$this->importCSVDataSet(__DIR__ . '/Fixtures/SlugServiceTest_ModifyAutoCreateRedirectRecordBeforePersistingEvent.csv');
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'modify-auto-create-redirect-record-before-persisting',
static function (ModifyAutoCreateRedirectRecordBeforePersistingEvent $event) use (
@@ -472,7 +472,7 @@ final class SlugServiceTest extends FunctionalTestCase
$this->importCSVDataSet(__DIR__ . '/Fixtures/SlugServiceTest_AfterAutoCreateRedirectHasBeenPersistedEvent.csv');
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'after-auto-create-redirect-has-been-persisted',
static function (AfterAutoCreateRedirectHasBeenPersistedEvent $event) use (
diff --git a/typo3/sysext/rte_ckeditor/Tests/Functional/RecordList/Controller/BrowseLinksControllerTest.php b/typo3/sysext/rte_ckeditor/Tests/Functional/RecordList/Controller/BrowseLinksControllerTest.php
index d15ff9742644..ac6979d7ec81 100644
--- a/typo3/sysext/rte_ckeditor/Tests/Functional/RecordList/Controller/BrowseLinksControllerTest.php
+++ b/typo3/sysext/rte_ckeditor/Tests/Functional/RecordList/Controller/BrowseLinksControllerTest.php
@@ -50,7 +50,7 @@ final class BrowseLinksControllerTest extends FunctionalTestCase
public function linkEventsAreTriggered(): void
{
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$state = [
'modify-link-handl-listener' => null,
diff --git a/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php b/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php
index 640d82b89c16..786280a95f52 100644
--- a/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php
+++ b/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php
@@ -160,7 +160,7 @@ final class CanonicalGeneratorTest extends FunctionalTestCase
$modifyUrlForCanonicalTagEvent = null;
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'modify-url-for-canonical-tag-listener',
static function (ModifyUrlForCanonicalTagEvent $event) use (&$modifyUrlForCanonicalTagEvent) {
diff --git a/typo3/sysext/workspaces/Tests/Functional/Hook/DataHandlerHookTest.php b/typo3/sysext/workspaces/Tests/Functional/Hook/DataHandlerHookTest.php
index c9fbe9e565cc..42aa5a45a17f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/Hook/DataHandlerHookTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/Hook/DataHandlerHookTest.php
@@ -96,7 +96,7 @@ final class DataHandlerHookTest extends FunctionalTestCase
$afterRecordPublishedEvent = null;
/** @var Container $container */
- $container = $this->getContainer();
+ $container = $this->get('service_container');
$container->set(
'after-record-published-event',
static function (AfterRecordPublishedEvent $event) use (&$afterRecordPublishedEvent) {
--
GitLab