diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon index 1290d950fed7f85e9317eddb3dc07032c07be1b9..98b07c6fb9addf71672c136381d63c8ad2f69df3 100644 --- a/Build/phpstan/phpstan-baseline.neon +++ b/Build/phpstan/phpstan-baseline.neon @@ -1475,11 +1475,6 @@ parameters: count: 1 path: ../../typo3/sysext/fluid/Classes/ViewHelpers/MediaViewHelper.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 @@ -2110,11 +2105,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 c198a7aac6d0c25857320a5899fbdda5312e81d7..981b3c3b0faadd39b2f9cb2f7986d5b03f672c29 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 c2b99300c41c1b98f9f0fe43821618a542e6f635..6800b9b76301077c062ce256c93ba79b2437226e 100644 --- a/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php +++ b/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php @@ -715,7 +715,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 ab238418e5513b94100d5decb4e79d1c17042332..81eb79b3a4cc181c39993fde5df8d0d41d43a219 100644 --- a/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php +++ b/typo3/sysext/core/Tests/Functional/Configuration/FlexForm/FlexFormToolsTest.php @@ -62,7 +62,7 @@ final class FlexFormToolsTest extends FunctionalTestCase ], ]; /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'noop', static function (BeforeFlexFormDataStructureIdentifierInitializedEvent $event) { @@ -82,7 +82,7 @@ final class FlexFormToolsTest extends FunctionalTestCase public function getDataStructureIdentifierWithListenerReturnsThatListenersValue(): void { /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'identifier-one', static function (BeforeFlexFormDataStructureIdentifierInitializedEvent $event) { @@ -105,7 +105,7 @@ final class FlexFormToolsTest extends FunctionalTestCase public function getDataStructureIdentifierWithModifyListenerCallsListener(): void { /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'modifier-one', static function (AfterFlexFormDataStructureIdentifierInitializedEvent $event) { @@ -480,7 +480,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) { @@ -755,7 +755,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/Domain/Repository/PageRepositoryTest.php b/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php index 72811185aef1bf72d86f839359009e0f47c39e27..6cbfd72f2c6641e37bd4e0f214651991b53a1af2 100644 --- a/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php +++ b/typo3/sysext/core/Tests/Functional/Domain/Repository/PageRepositoryTest.php @@ -646,7 +646,7 @@ final class PageRepositoryTest extends FunctionalTestCase $defaultConstraint = new CompositeExpression('foo'); /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'modify-default-constraints-for-database-query-listener', static function (ModifyDefaultConstraintsForDatabaseQueryEvent $event) use (&$modifyDefaultConstraintsForDatabaseQueryEvent, $defaultConstraint) { @@ -679,7 +679,7 @@ final class PageRepositoryTest extends FunctionalTestCase $beforePageIsRetrievedEvent = null; /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'before-page-is-retrieved-listener', static function (BeforePageIsRetrievedEvent $event) use (&$beforePageIsRetrievedEvent, $page, $pageId) { diff --git a/typo3/sysext/core/Tests/Functional/Imaging/IconFactoryTest.php b/typo3/sysext/core/Tests/Functional/Imaging/IconFactoryTest.php index ad8b978bbf502bdced215e75dab903cfcbdc997d..e36039f5c7db4514530049eb7a3a87c7f96c3dc7 100644 --- a/typo3/sysext/core/Tests/Functional/Imaging/IconFactoryTest.php +++ b/typo3/sysext/core/Tests/Functional/Imaging/IconFactoryTest.php @@ -622,7 +622,7 @@ final class IconFactoryTest extends FunctionalTestCase $modifyRecordOverlayIconIdentifierEvent = null; /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'modify-record-overlay-icon-identifier-event-listener', static function (ModifyRecordOverlayIconIdentifierEvent $event) use (&$modifyRecordOverlayIconIdentifierEvent) { diff --git a/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php b/typo3/sysext/core/Tests/Functional/Mail/MailerTest.php index 1bee83e36c98ade7855bfde088ee8889383e860e..8677f6fbc0df8de9c2293d16e40f4091e0d94e60 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/Package/Event/PackageInitializationEventTest.php b/typo3/sysext/core/Tests/Functional/Package/Event/PackageInitializationEventTest.php index 6377b7ee138db448ed1e38cb82674de420786fed..866d52d85013c84cb9b34697440089bae85dc5d7 100644 --- a/typo3/sysext/core/Tests/Functional/Package/Event/PackageInitializationEventTest.php +++ b/typo3/sysext/core/Tests/Functional/Package/Event/PackageInitializationEventTest.php @@ -141,7 +141,7 @@ final class PackageInitializationEventTest extends FunctionalTestCase $listenerResult = ['foo' => 'bar']; /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'package-initialization-listener', static function (PackageInitializationEvent $event) use (&$packageInitializationEvent, $listenerResult) { diff --git a/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php b/typo3/sysext/core/Tests/Functional/Resource/DefaultUploadFolderResolverTest.php index 37069864bb2c19772ae620712b999655b685010c..733ea18b44a65a1edb41340f3b150391e445b72c 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 e029e0231241b6ada9c4b2a4bda8575f42989d01..07dacd7dbc26bc747b6d05983f1ba741612f8b27 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 788d8d921b511d8f20d5e39dfdc90ed10d2f102f..45e30a5ce1681c2bec298abe34447dbf2a3f08d4 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 6ad96bf363c393a395ad06c8833d12e647041fbb..97b6252451882c56ae98a5a4cc0165ab8404506b 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 7c4ea30bf5b2ab81798bda84a830613b6166bb78..59506a2d278f755a7f21c495247b94db3847a19a 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 99e7b6e70c914b4045ad071dba8c245bd449dca8..f35bccff63423201e300c1cb625846c43250cbde 100644 --- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php +++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php @@ -429,7 +429,7 @@ EOT; return (string)$object->getId(); } ); - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set(PersistenceManager::class, $mockPersistenceManager); $context = $container->get(RenderingContextFactory::class)->create(); @@ -461,7 +461,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(); @@ -490,7 +490,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(); @@ -519,7 +519,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/frontend/Tests/Functional/ContentObject/ContentContentObjectTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentContentObjectTest.php index 4d18e4ff92f174580b9ef76490c5e8fc14a81fc9..634379abdc1e26289bc293472a66c7334eb1a631 100644 --- a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentContentObjectTest.php +++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentContentObjectTest.php @@ -39,7 +39,7 @@ final class ContentContentObjectTest extends FunctionalTestCase $modifyRecordsAfterFetchingContentEvent = null; /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'modify-records-after-fetching-content-listener', static function (ModifyRecordsAfterFetchingContentEvent $event) use (&$modifyRecordsAfterFetchingContentEvent, $records, $finalContent) { diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php index 1926e0df069805d32c68f910198092f28c2839b1..e3d60fbe688c8481ccc4d7e7a618902f5cd454e8 100644 --- a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php +++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php @@ -1266,7 +1266,7 @@ And another one'; $afterContentObjectRendererInitializedEvent = null; /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'after-content-object-renderer-initialized-listener', static function (AfterContentObjectRendererInitializedEvent $event) use (&$afterContentObjectRendererInitializedEvent) { @@ -1306,7 +1306,7 @@ And another one'; $afterGetDataResolvedEvent = null; /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'after-get-data-resolved-listener', static function (AfterGetDataResolvedEvent $event) use (&$afterGetDataResolvedEvent) { @@ -1337,7 +1337,7 @@ And another one'; $afterImageResourceResolvedEvent = null; /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'after-image-resource-resolved-listener', static function (AfterImageResourceResolvedEvent $event) use (&$afterImageResourceResolvedEvent) { @@ -1370,7 +1370,7 @@ And another one'; $enhanceStdWrapEvent = null; /** @var Container $container */ - $container = $this->getContainer(); + $container = $this->get('service_container'); $container->set( 'enhance-stdWrap-listener', static function (EnhanceStdWrapEvent $event) use (&$enhanceStdWrapEvent, $content) { diff --git a/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php b/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php index e01ce15d580987272677d0997031a031c2dafa80..7acc1776eca153a0e9335b25c910799995dccd34 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 e3188dcd961364cbfa03e912c96a52197709c221..92dca91aba8a64869d7f075bf105901267f9ff1e 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 71e96c2bde1539bd05ab441fa588d619bfa41404..cc7858ab78c891adc50fe33f08406b15ed185f22 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 8c1084c4c2f21a84dbcd15e0b857baf696db53d9..9ed4c2dc868309cf7c48a616272cb0bb12e5f5c5 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 40ec915420124f76eb05ba6d8ec0b3b292b7253a..c2cbc58194ce74d31b26391763c05fac4418d915 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 2be8cbad815dcec0b7fee395c5653a68c6946934..93a951bc733763a1899fb7034a3d404c06207ede 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 dbc6b1f7eb646a33a0181768b1d9db8fe37c486e..f7ffcf738489c135b68208380b63a98fb4c1209f 100644 --- a/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php +++ b/typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php @@ -874,7 +874,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 497ff9631c6f688c0a9b600c0c87c9d1a32a9612..44e7b6173cdd4fa500741981c825f051892ca6c6 100644 --- a/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php +++ b/typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php @@ -419,7 +419,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 ( @@ -471,7 +471,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 45b237d2c90e692cd5dd605af1f09084127b27a7..9d7659a7752a9a3fffb5384aa87f42f77b982512 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 c0afda32bc375d05d0347b226edb541d74be89d9..fc48a6a7fd0cb862941c79132ad669782248f471 100644 --- a/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php +++ b/typo3/sysext/seo/Tests/Functional/Canonical/CanonicalGeneratorTest.php @@ -159,7 +159,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 35c586822945aae1160a873e8e38e455c511c0ef..fbd31b6aa06927b32cd85c5aa066e28016e4c71f 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) {