From 4ceaeadaf76fac3f137e34af91b2cc693b05ec07 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <bfr@qbus.de>
Date: Tue, 22 Feb 2022 16:37:32 +0100
Subject: [PATCH] [TASK] Allow private service container in tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The private container now provides access to non-public
services that have been at least once injected (and thus
be considered as service during DI compilation phase).
This may be used to provide dependencies to functional
test setups where some dependencies needs to be mocked
while other should receive the vanilla dependency
the container would normally inject.
A functional test case does implement the ContainerInterface
now, allowing tests to access both public and private
services.
$this->getContainer() may still be used if the default
container (delivering public services only) needs to
be injected into a service.
Related testing-framework pull request:
https://github.com/TYPO3/testing-framework/pull/331
Commands executed:
composer u typo3/testing-framework
git grep -l "this->getContainer()->get(" | xargs sed -i 's/this->getContainer()->get(/this->get(/g'
Resolves: #97032
Releases: main, 11.5
Change-Id: I5987d5244270a3e190c8721f6a8971c7fd1309ef
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/73646
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.lock | 9 +-
.../Shortcut/ShortcutRepositoryTest.php | 6 +-
.../Controller/MfaAjaxControllerTest.php | 2 +-
.../MfaConfigurationControllerTest.php | 9 +-
.../Controller/MfaControllerTest.php | 15 ++--
.../Controller/MfaSetupControllerTest.php | 15 ++--
.../ResetPasswordControllerTest.php | 30 ++-----
.../Controller/ShortcutControllerTest.php | 6 +-
.../Middleware/BackendModuleValidatorTest.php | 16 ++--
.../Functional/Module/ModuleDataTest.php | 2 +-
.../View/BackendViewFactoryTest.php | 26 ++----
.../Drawing/BackendLayoutRendererTest.php | 16 ++--
.../Link/EditRecordViewHelperTest.php | 12 +--
.../Link/NewRecordViewHelperTest.php | 18 ++--
.../Mfa/IfHasStateViewHelperTest.php | 4 +-
.../Uri/EditRecordViewHelperTest.php | 12 +--
.../Uri/NewRecordViewHelperTest.php | 18 ++--
.../ViewHelpers/MfaStatusViewHelperTest.php | 2 +-
.../Mfa/MfaProviderPropertyManagerTest.php | 2 +-
.../Mfa/MfaProviderRegistryTest.php | 2 +-
.../Provider/RecoveryCodesProviderTest.php | 4 +-
.../Mfa/Provider/TotpProviderTest.php | 4 +-
.../Command/CacheFlushCommandTest.php | 28 +++----
.../Command/CacheWarmupCommandTest.php | 16 ++--
.../Domain/Access/RecordAccessVoterTest.php | 2 +-
.../Localization/LanguageServiceTest.php | 4 +-
.../Functional/Page/PageRendererTest.php | 2 +-
.../Aspect/PersistedAliasMapperTest.php | 2 +-
.../Aspect/PersistedPatternMapperTest.php | 2 +-
.../SiteHandling/SiteBasedTestTrait.php | 4 +-
.../IconForRecordViewHelperTest.php | 2 +-
.../ViewHelpers/IconViewHelperTest.php | 8 +-
.../ActionControllerArgumentTest.php | 2 +-
.../Mvc/Controller/ActionControllerTest.php | 2 +-
.../ControllerArgumentsMappingTest.php | 4 +-
.../ActionControllerValidationTest.php | 16 ++--
.../Functional/Mvc/Web/RequestBuilderTest.php | 82 +++++++++----------
.../Pagination/QueryResultPaginatorTest.php | 2 +-
.../Tests/Functional/Persistence/AddTest.php | 4 +-
.../Functional/Persistence/CountTest.php | 6 +-
.../Generic/Mapper/DataMapFactoryTest.php | 2 +-
.../Generic/Mapper/DataMapperTest.php | 2 +-
.../Tests/Functional/Persistence/InTest.php | 4 +-
.../Functional/Persistence/IsDirtyTest.php | 4 +-
.../Functional/Persistence/OperatorTest.php | 4 +-
.../Persistence/QueryLocalizedDataTest.php | 8 +-
.../Persistence/QueryParserTest.php | 16 ++--
.../Functional/Persistence/RelationTest.php | 36 ++++----
.../Persistence/TranslatedSiteContentTest.php | 2 +-
.../Persistence/TranslationTest.php | 4 +-
.../Functional/Persistence/WorkspaceTest.php | 8 +-
.../Property/PropertyMapperTest.php | 38 ++++-----
.../TypeConverter/ArrayConverterTest.php | 2 +-
.../TypeConverter/BooleanConverterTest.php | 2 +-
.../TypeConverter/DateTimeConverterTest.php | 30 +++----
.../TypeConverter/FileConverterTest.php | 2 +-
.../TypeConverter/FloatConverterTest.php | 2 +-
.../TypeConverter/IntegerConverterTest.php | 2 +-
.../TypeConverter/ObjectConverterTest.php | 30 +++----
.../ObjectStorageConverterTest.php | 4 +-
.../PersistentObjectConverterTest.php | 22 ++---
.../TypeConverter/StringConverterTest.php | 2 +-
.../Validator/AlphanumericValidatorTest.php | 2 +-
.../Validator/BooleanValidatorTest.php | 2 +-
.../Validator/CollectionValidatorTest.php | 18 ++--
.../Validator/ConjunctionValidatorTest.php | 2 +-
.../Validator/DateTimeValidatorTest.php | 2 +-
.../Validator/EmailAddressValidatorTest.php | 2 +-
.../Validator/FloatValidatorTest.php | 2 +-
.../Validator/IntegerValidatorTest.php | 2 +-
.../Validator/NotEmptyValidatorTest.php | 2 +-
.../Validator/NumberRangeValidatorTest.php | 2 +-
.../Validator/NumberValidatorTest.php | 2 +-
.../RegularExpressionValidatorTest.php | 2 +-
.../Validator/StringLengthValidatorTest.php | 2 +-
.../Validator/StringValidatorTest.php | 2 +-
.../Validator/TextValidatorTest.php | 2 +-
.../Validation/Validator/UrlValidatorTest.php | 2 +-
.../Validation/ValidatorResolverTest.php | 4 +-
.../EscapeChildrenRenderingStandaloneTest.php | 2 +-
.../Be/Labels/CshViewHelperTest.php | 2 +-
.../ViewHelpers/Be/LinkViewHelperTest.php | 4 +-
.../Be/Menus/ActionMenuItemViewHelperTest.php | 2 +-
.../IfAuthenticatedViewHelperTest.php | 4 +-
.../Be/Security/IfHasRoleViewHelperTest.php | 6 +-
.../ViewHelpers/Be/UriViewHelperTest.php | 4 +-
.../FlashMessagesViewHelperTest.php | 6 +-
.../ViewHelpers/Form/ButtonViewHelperTest.php | 4 +-
.../Form/CheckboxViewHelperTest.php | 22 ++---
.../ViewHelpers/Form/HiddenViewHelperTest.php | 2 +-
.../Form/PasswordViewHelperTest.php | 6 +-
.../ViewHelpers/Form/RadioViewHelperTest.php | 18 ++--
.../Form/Select/OptionViewHelperTest.php | 18 ++--
.../ViewHelpers/Form/SelectViewHelperTest.php | 34 ++++----
.../ViewHelpers/Form/SubmitViewHelperTest.php | 2 +-
.../Form/TextareaViewHelperTest.php | 4 +-
.../Form/TextfieldViewHelperTest.php | 4 +-
.../ViewHelpers/Form/UploadViewHelperTest.php | 10 +--
.../ViewHelpers/FormViewHelperTest.php | 16 ++--
.../Format/BytesViewHelperTest.php | 2 +-
.../ViewHelpers/Format/CaseViewHelperTest.php | 4 +-
.../ViewHelpers/Format/CropViewHelperTest.php | 2 +-
.../Format/CurrencyViewHelperTest.php | 2 +-
.../ViewHelpers/Format/DateViewHelperTest.php | 28 +++----
.../HtmlentitiesDecodeViewHelperTest.php | 12 +--
.../Format/HtmlentitiesViewHelperTest.php | 18 ++--
.../Format/Nl2brViewHelperTest.php | 2 +-
.../Format/NumberViewHelperTest.php | 2 +-
.../Format/PaddingViewHelperTest.php | 4 +-
.../Format/StripTagsViewHelperTest.php | 4 +-
.../Format/UrlencodeViewHelperTest.php | 4 +-
.../ViewHelpers/ImageViewHelperTest.php | 2 +-
.../ViewHelpers/Link/EmailViewHelperTest.php | 4 +-
.../Link/ExternalViewHelperTest.php | 2 +-
.../ViewHelpers/Link/FileViewHelperTest.php | 18 ++--
.../Link/TypolinkViewHelperTest.php | 2 +-
.../PageRendererViewHelperTest.php | 4 +-
.../Sanitize/HtmlViewHelperTest.php | 4 +-
.../IfAuthenticatedViewHelperTest.php | 4 +-
.../Security/IfHasRoleViewHelperTest.php | 2 +-
.../Transform/HtmlViewHelperTest.php | 6 +-
.../ViewHelpers/TranslateViewHelperTest.php | 8 +-
.../Uri/ExternalViewHelperTest.php | 2 +-
.../Uri/ResourceViewHelperTest.php | 8 +-
.../UploadedResourceViewHelperTest.php | 2 +-
.../Cache/CacheLifetimeCalculatorTest.php | 2 +-
.../FluidTemplateContentObjectTest.php | 4 +-
.../BackendModuleControllerTest.php | 4 +-
.../Format/PhpErrorCodeViewHelperTest.php | 2 +-
.../Tests/Functional/LinkAnalyzerTest.php | 12 +--
.../Repository/BrokenLinkRepositoryTest.php | 8 +-
.../Database/QueryGeneratorTest.php | 2 +-
.../RecordList/DownloadRecordListTest.php | 8 +-
.../EventListener/IncrementHitCountTest.php | 6 +-
.../Functional/Tca/NoteVisibleFieldsTest.php | 2 +-
135 files changed, 519 insertions(+), 549 deletions(-)
diff --git a/composer.lock b/composer.lock
index 6cf71c971527..45696782ce24 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8312,12 +8312,12 @@
"source": {
"type": "git",
"url": "https://github.com/TYPO3/testing-framework.git",
- "reference": "b9df681c9d4845dac187d79dafba51905e59be42"
+ "reference": "426777c2ad280baff018c1487250a6cbcd3ba3d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/b9df681c9d4845dac187d79dafba51905e59be42",
- "reference": "b9df681c9d4845dac187d79dafba51905e59be42",
+ "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/426777c2ad280baff018c1487250a6cbcd3ba3d2",
+ "reference": "426777c2ad280baff018c1487250a6cbcd3ba3d2",
"shasum": ""
},
"require": {
@@ -8342,6 +8342,7 @@
"type": "library",
"autoload": {
"psr-4": {
+ "TYPO3\\PrivateContainer\\": "Resources/Core/Functional/Extensions/private_container/Classes/",
"TYPO3\\TestingFramework\\": "Classes/"
}
},
@@ -8373,7 +8374,7 @@
"issues": "https://github.com/TYPO3/testing-framework/issues",
"source": "https://github.com/TYPO3/testing-framework/tree/main"
},
- "time": "2022-02-16T20:26:13+00:00"
+ "time": "2022-02-27T13:23:31+00:00"
}
],
"aliases": [],
diff --git a/typo3/sysext/backend/Tests/Functional/Backend/Shortcut/ShortcutRepositoryTest.php b/typo3/sysext/backend/Tests/Functional/Backend/Shortcut/ShortcutRepositoryTest.php
index b0de1dd700bb..dca91e9b179d 100644
--- a/typo3/sysext/backend/Tests/Functional/Backend/Shortcut/ShortcutRepositoryTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Backend/Shortcut/ShortcutRepositoryTest.php
@@ -37,9 +37,9 @@ class ShortcutRepositoryTest extends FunctionalTestCase
Bootstrap::initializeLanguageObject();
$this->subject = new ShortcutRepository(
- $this->getContainer()->get(ConnectionPool::class),
- $this->getContainer()->get(IconFactory::class),
- $this->getContainer()->get(ModuleProvider::class)
+ $this->get(ConnectionPool::class),
+ $this->get(IconFactory::class),
+ $this->get(ModuleProvider::class)
);
}
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/MfaAjaxControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/MfaAjaxControllerTest.php
index 4b81cafdcbd9..8a6909b114e0 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/MfaAjaxControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/MfaAjaxControllerTest.php
@@ -38,7 +38,7 @@ class MfaAjaxControllerTest extends FunctionalTestCase
$this->setUpBackendUserFromFixture(1);
Bootstrap::initializeLanguageObject();
- $this->subject = new MfaAjaxController($this->getContainer()->get(MfaProviderRegistry::class));
+ $this->subject = new MfaAjaxController($this->get(MfaProviderRegistry::class));
$this->request = (new ServerRequest())
->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_BE);
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/MfaConfigurationControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/MfaConfigurationControllerTest.php
index 9de1ed3c0132..b229f3732403 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/MfaConfigurationControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/MfaConfigurationControllerTest.php
@@ -53,13 +53,12 @@ class MfaConfigurationControllerTest extends FunctionalTestCase
$this->setUpBackendUserFromFixture(1);
Bootstrap::initializeLanguageObject();
- $container = $this->getContainer();
$this->subject = new MfaConfigurationController(
- $container->get(IconFactory::class),
- $container->get(UriBuilder::class),
- $container->get(ModuleTemplateFactory::class),
+ $this->get(IconFactory::class),
+ $this->get(UriBuilder::class),
+ $this->get(ModuleTemplateFactory::class),
);
- $this->subject->injectMfaProviderRegistry($container->get(MfaProviderRegistry::class));
+ $this->subject->injectMfaProviderRegistry($this->get(MfaProviderRegistry::class));
$this->request = (new ServerRequest())
->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_BE)
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/MfaControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/MfaControllerTest.php
index 18fbb3dcd5ed..061dc8b93809 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/MfaControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/MfaControllerTest.php
@@ -31,10 +31,8 @@ use TYPO3\CMS\Core\Core\Bootstrap;
use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
use TYPO3\CMS\Core\Http\ServerRequest;
use TYPO3\CMS\Core\Log\Logger;
-use TYPO3\CMS\Core\Package\PackageManager;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
class MfaControllerTest extends FunctionalTestCase
@@ -64,16 +62,15 @@ class MfaControllerTest extends FunctionalTestCase
$this->setUpBackendUserFromFixture(1);
Bootstrap::initializeLanguageObject();
- $container = $this->getContainer();
$this->subject = new MfaController(
- $container->get(UriBuilder::class),
- $container->get(AuthenticationStyleInformation::class),
- $container->get(PageRenderer::class),
- new ExtensionConfiguration(),
+ $this->get(UriBuilder::class),
+ $this->get(AuthenticationStyleInformation::class),
+ $this->get(PageRenderer::class),
+ $this->get(ExtensionConfiguration::class),
new Logger('testing'),
- new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class))
+ $this->get(BackendViewFactory::class)
);
- $this->subject->injectMfaProviderRegistry($container->get(MfaProviderRegistry::class));
+ $this->subject->injectMfaProviderRegistry($this->get(MfaProviderRegistry::class));
$this->request = (new ServerRequest())
->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_BE)
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/MfaSetupControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/MfaSetupControllerTest.php
index 9a1cbc5c8f5d..09ec5d8d0933 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/MfaSetupControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/MfaSetupControllerTest.php
@@ -32,10 +32,8 @@ use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
use TYPO3\CMS\Core\Http\ServerRequest;
use TYPO3\CMS\Core\Log\Logger;
use TYPO3\CMS\Core\Messaging\FlashMessageService;
-use TYPO3\CMS\Core\Package\PackageManager;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
class MfaSetupControllerTest extends FunctionalTestCase
@@ -66,16 +64,15 @@ class MfaSetupControllerTest extends FunctionalTestCase
$GLOBALS['TYPO3_CONF_VARS']['BE']['requireMfa'] = 1;
Bootstrap::initializeLanguageObject();
- $container = $this->getContainer();
$this->subject = new MfaSetupController(
- $container->get(UriBuilder::class),
- $container->get(AuthenticationStyleInformation::class),
- $container->get(PageRenderer::class),
- new ExtensionConfiguration(),
+ $this->get(UriBuilder::class),
+ $this->get(AuthenticationStyleInformation::class),
+ $this->get(PageRenderer::class),
+ $this->get(ExtensionConfiguration::class),
$this->prophesize(Logger::class)->reveal(),
- new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class))
+ $this->get(BackendViewFactory::class),
);
- $this->subject->injectMfaProviderRegistry($container->get(MfaProviderRegistry::class));
+ $this->subject->injectMfaProviderRegistry($this->get(MfaProviderRegistry::class));
$this->request = (new ServerRequest())
->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_BE)
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php
index dacd2c3132ec..b081a68ee0e2 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php
@@ -37,10 +37,8 @@ use TYPO3\CMS\Core\Http\ServerRequest;
use TYPO3\CMS\Core\Information\Typo3Information;
use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
use TYPO3\CMS\Core\Localization\Locales;
-use TYPO3\CMS\Core\Package\PackageManager;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
class ResetPasswordControllerTest extends FunctionalTestCase
@@ -68,16 +66,16 @@ class ResetPasswordControllerTest extends FunctionalTestCase
$passwordResetProphecy->resetPassword(Argument::any(), Argument::any())->willReturn(true);
$this->subject = new ResetPasswordController(
- $this->getService(Context::class),
- $this->getService(Locales::class),
- $this->getService(Features::class),
- $this->getService(UriBuilder::class),
- $this->getService(PageRenderer::class),
+ $this->get(Context::class),
+ $this->get(Locales::class),
+ $this->get(Features::class),
+ $this->get(UriBuilder::class),
+ $this->get(PageRenderer::class),
$passwordResetProphecy->reveal(),
- $this->getService(Typo3Information::class),
- $this->getService(AuthenticationStyleInformation::class),
+ $this->get(Typo3Information::class),
+ $this->get(AuthenticationStyleInformation::class),
new ExtensionConfiguration(),
- new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class))
+ $this->get(BackendViewFactory::class),
);
$this->request = (new ServerRequest())
@@ -179,16 +177,4 @@ class ResetPasswordControllerTest extends FunctionalTestCase
self::assertStringContainsString($expected, $this->subject->passwordResetAction($request)->getBody()->getContents());
}
-
- /**
- * @return mixed|object|\Psr\Log\LoggerAwareInterface|\TYPO3\CMS\Core\SingletonInterface
- */
- protected function getService(string $service, array $constructorArguments = [])
- {
- $container = $this->getContainer();
-
- return $container->has($service)
- ? $container->get($service)
- : GeneralUtility::makeInstance($service, ...$constructorArguments);
- }
}
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/ShortcutControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/ShortcutControllerTest.php
index 1bf10650d071..52a95ef54a2d 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/ShortcutControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/ShortcutControllerTest.php
@@ -43,9 +43,9 @@ class ShortcutControllerTest extends FunctionalTestCase
Bootstrap::initializeLanguageObject();
$this->subject = new ShortcutController(
- $this->getContainer()->get(ShortcutToolbarItem::class),
- $this->getContainer()->get(ShortcutRepository::class),
- new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class))
+ $this->get(ShortcutToolbarItem::class),
+ $this->get(ShortcutRepository::class),
+ new BackendViewFactory($this->get(RenderingContextFactory::class), $this->get(PackageManager::class))
);
$this->request = (new ServerRequest())->withAttribute('normalizedParams', new NormalizedParams([], [], '', ''));
}
diff --git a/typo3/sysext/backend/Tests/Functional/Middleware/BackendModuleValidatorTest.php b/typo3/sysext/backend/Tests/Functional/Middleware/BackendModuleValidatorTest.php
index d477786bd2cc..d2cab05c7e76 100644
--- a/typo3/sysext/backend/Tests/Functional/Middleware/BackendModuleValidatorTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Middleware/BackendModuleValidatorTest.php
@@ -44,8 +44,8 @@ class BackendModuleValidatorTest extends FunctionalTestCase
Bootstrap::initializeLanguageObject();
$this->subject = new BackendModuleValidator(
- $this->getContainer()->get(UriBuilder::class),
- $this->getContainer()->get(ModuleProvider::class),
+ $this->get(UriBuilder::class),
+ $this->get(ModuleProvider::class),
);
$this->request = new ServerRequest('/some/uri');
$this->requestHandler = new class() implements RequestHandlerInterface {
@@ -67,7 +67,7 @@ class BackendModuleValidatorTest extends FunctionalTestCase
*/
public function moduleIsAddedToRequest(): void
{
- $module = $this->getContainer()->get(ModuleFactory::class)->createModule(
+ $module = $this->get(ModuleFactory::class)->createModule(
'web_layout',
[
'packageName' => 'typo3/cms-testing',
@@ -88,7 +88,7 @@ class BackendModuleValidatorTest extends FunctionalTestCase
*/
public function moduleDataIsAddedToRequest(): void
{
- $module = $this->getContainer()->get(ModuleFactory::class)->createModule(
+ $module = $this->get(ModuleFactory::class)->createModule(
'web_layout',
[
'packageName' => 'typo3/cms-testing',
@@ -118,7 +118,7 @@ class BackendModuleValidatorTest extends FunctionalTestCase
*/
public function invalidModuleThrowsException(): void
{
- $module = $this->getContainer()->get(ModuleFactory::class)->createModule(
+ $module = $this->get(ModuleFactory::class)->createModule(
'some_module',
[
'packageName' => 'typo3/cms-testing',
@@ -143,7 +143,7 @@ class BackendModuleValidatorTest extends FunctionalTestCase
$GLOBALS['BE_USER']->user['admin'] = 0;
// site_configuration requires admin access
- $module = $this->getContainer()->get(ModuleFactory::class)->createModule(
+ $module = $this->get(ModuleFactory::class)->createModule(
'site_configuration',
[
'packageName' => 'typo3/cms-testing',
@@ -165,7 +165,7 @@ class BackendModuleValidatorTest extends FunctionalTestCase
*/
public function noPageAccessThrowsException(): void
{
- $module = $this->getContainer()->get(ModuleFactory::class)->createModule(
+ $module = $this->get(ModuleFactory::class)->createModule(
'web_layout',
[
'packageName' => 'typo3/cms-testing',
@@ -189,7 +189,7 @@ class BackendModuleValidatorTest extends FunctionalTestCase
*/
public function redirectsToMainForSecFetchDestHeader(): void
{
- $module = $this->getContainer()->get(ModuleFactory::class)->createModule(
+ $module = $this->get(ModuleFactory::class)->createModule(
'web_layout',
[
'packageName' => 'typo3/cms-testing',
diff --git a/typo3/sysext/backend/Tests/Functional/Module/ModuleDataTest.php b/typo3/sysext/backend/Tests/Functional/Module/ModuleDataTest.php
index af94ce468678..fbca42e51a34 100644
--- a/typo3/sysext/backend/Tests/Functional/Module/ModuleDataTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Module/ModuleDataTest.php
@@ -63,7 +63,7 @@ class ModuleDataTest extends FunctionalTestCase
'anoterProperty' => 'anotherDefaultValue',
];
- $module = $this->getContainer()->get(ModuleFactory::class)->createModule(
+ $module = $this->get(ModuleFactory::class)->createModule(
'my_module',
[
'packageName' => 'typo3/cms-testing',
diff --git a/typo3/sysext/backend/Tests/Functional/View/BackendViewFactoryTest.php b/typo3/sysext/backend/Tests/Functional/View/BackendViewFactoryTest.php
index 47a79e2039c5..ef987e01aefa 100644
--- a/typo3/sysext/backend/Tests/Functional/View/BackendViewFactoryTest.php
+++ b/typo3/sysext/backend/Tests/Functional/View/BackendViewFactoryTest.php
@@ -21,8 +21,6 @@ use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Backend\Routing\Route;
use TYPO3\CMS\Backend\View\BackendViewFactory;
use TYPO3\CMS\Core\Http\ServerRequest;
-use TYPO3\CMS\Core\Package\PackageManager;
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
class BackendViewFactoryTest extends FunctionalTestCase
@@ -41,8 +39,7 @@ class BackendViewFactoryTest extends FunctionalTestCase
public function createUsesTemplatePathsWithPackageGivenAsRouteOption()
{
$request = (new ServerRequest())->withAttribute('route', new Route('testing', ['packageName' => 'typo3/cms-test-templates-a']));
- $container = $this->getContainer();
- $subject = new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class));
+ $subject = $this->get(BackendViewFactory::class);
$view = $subject->create($request);
$result = $view->render('Foo');
self::assertStringContainsString('Foo template from extension test_templates_a', $result);
@@ -56,8 +53,7 @@ class BackendViewFactoryTest extends FunctionalTestCase
public function createUsesTemplatePathsWithPackageGivenAsArgument()
{
$request = (new ServerRequest())->withAttribute('route', new Route('testing', []));
- $container = $this->getContainer();
- $subject = new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class));
+ $subject = $this->get(BackendViewFactory::class);
$view = $subject->create($request, ['typo3/cms-test-templates-a']);
$result = $view->render('Foo');
self::assertStringContainsString('Foo template from extension test_templates_a', $result);
@@ -71,8 +67,7 @@ class BackendViewFactoryTest extends FunctionalTestCase
public function createUsesOverrideTemplatePathsWithBasePackageNameFromRoute()
{
$request = (new ServerRequest())->withAttribute('route', new Route('testing', ['packageName' => 'typo3/cms-test-templates-a']));
- $container = $this->getContainer();
- $subject = new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class));
+ $subject = $this->get(BackendViewFactory::class);
$view = $subject->create($request, ['typo3/cms-test-templates-b']);
$result = $view->render('Foo');
self::assertStringContainsString('Foo template from extension test_templates_b', $result);
@@ -86,8 +81,7 @@ class BackendViewFactoryTest extends FunctionalTestCase
public function createUsesOverrideTemplatePathsWithMultiplePackagesGivenAsArgument()
{
$request = (new ServerRequest())->withAttribute('route', new Route('testing', []));
- $container = $this->getContainer();
- $subject = new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class));
+ $subject = $this->get(BackendViewFactory::class);
$view = $subject->create(
$request,
[
@@ -107,8 +101,7 @@ class BackendViewFactoryTest extends FunctionalTestCase
public function createUsesPrefersTemplateFromLastOverrideWithMultiplePackagesGivenAsArgument()
{
$request = (new ServerRequest())->withAttribute('route', new Route('testing', []));
- $container = $this->getContainer();
- $subject = new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class));
+ $subject = $this->get(BackendViewFactory::class);
$view = $subject->create(
$request,
[
@@ -128,8 +121,7 @@ class BackendViewFactoryTest extends FunctionalTestCase
public function createUsesFirstExistingFilesInChainBeginningFromLastOverrideWithMultiplePackagesGivenAsArgument()
{
$request = (new ServerRequest())->withAttribute('route', new Route('testing', []));
- $container = $this->getContainer();
- $subject = new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class));
+ $subject = $this->get(BackendViewFactory::class);
$view = $subject->create(
$request,
[
@@ -153,8 +145,7 @@ class BackendViewFactoryTest extends FunctionalTestCase
$request = (new ServerRequest())
->withAttribute('route', new Route('testing', ['packageName' => 'typo3/cms-test-templates-a']))
->withQueryParams(['id' => 1]);
- $container = $this->getContainer();
- $subject = new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class));
+ $subject = $this->get(BackendViewFactory::class);
$view = $subject->create($request);
$result = $view->render('Foo');
self::assertStringContainsString('Foo template from extension test_templates_b', $result);
@@ -171,8 +162,7 @@ class BackendViewFactoryTest extends FunctionalTestCase
$request = (new ServerRequest())
->withAttribute('route', new Route('testing', ['packageName' => 'typo3/cms-test-templates-a']))
->withQueryParams(['id' => 1]);
- $container = $this->getContainer();
- $subject = new BackendViewFactory($container->get(RenderingContextFactory::class), $container->get(PackageManager::class));
+ $subject = $this->get(BackendViewFactory::class);
$view = $subject->create($request);
$result = $view->render('Foo');
self::assertStringContainsString('Foo template from extension test_templates_b', $result);
diff --git a/typo3/sysext/backend/Tests/Functional/View/Drawing/BackendLayoutRendererTest.php b/typo3/sysext/backend/Tests/Functional/View/Drawing/BackendLayoutRendererTest.php
index 4d68400fabe0..7e923f548c07 100644
--- a/typo3/sysext/backend/Tests/Functional/View/Drawing/BackendLayoutRendererTest.php
+++ b/typo3/sysext/backend/Tests/Functional/View/Drawing/BackendLayoutRendererTest.php
@@ -89,7 +89,7 @@ class BackendLayoutRendererTest extends FunctionalTestCase
'rows.' => [],
];
$pageLayoutContext = $this->getPageLayoutContext(1100, $configuration);
- $subject = new BackendLayoutRenderer(new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class)));
+ $subject = new BackendLayoutRenderer(new BackendViewFactory($this->get(RenderingContextFactory::class), $this->get(PackageManager::class)));
self::assertCount(0, $subject->getGridForPageLayoutContext($pageLayoutContext)->getRows());
}
@@ -106,7 +106,7 @@ class BackendLayoutRendererTest extends FunctionalTestCase
],
];
$pageLayoutContext = $this->getPageLayoutContext(1100, $configuration);
- $subject = new BackendLayoutRenderer(new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class)));
+ $subject = new BackendLayoutRenderer(new BackendViewFactory($this->get(RenderingContextFactory::class), $this->get(PackageManager::class)));
self::assertCount(1, $subject->getGridForPageLayoutContext($pageLayoutContext)->getRows());
self::assertCount(0, $subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns());
}
@@ -127,7 +127,7 @@ class BackendLayoutRendererTest extends FunctionalTestCase
],
];
$pageLayoutContext = $this->getPageLayoutContext(1100, $configuration);
- $subject = new BackendLayoutRenderer(new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class)));
+ $subject = new BackendLayoutRenderer(new BackendViewFactory($this->get(RenderingContextFactory::class), $this->get(PackageManager::class)));
self::assertCount(2, $subject->getGridForPageLayoutContext($pageLayoutContext)->getRows());
self::assertCount(0, $subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns());
}
@@ -149,7 +149,7 @@ class BackendLayoutRendererTest extends FunctionalTestCase
],
];
$pageLayoutContext = $this->getPageLayoutContext(1100, $configuration);
- $subject = new BackendLayoutRenderer(new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class)));
+ $subject = new BackendLayoutRenderer(new BackendViewFactory($this->get(RenderingContextFactory::class), $this->get(PackageManager::class)));
self::assertCount(1, $subject->getGridForPageLayoutContext($pageLayoutContext)->getRows());
self::assertCount(1, $subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns());
foreach ($subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns() as $column) {
@@ -177,7 +177,7 @@ class BackendLayoutRendererTest extends FunctionalTestCase
],
];
$pageLayoutContext = $this->getPageLayoutContext(1100, $configuration);
- $subject = new BackendLayoutRenderer(new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class)));
+ $subject = new BackendLayoutRenderer(new BackendViewFactory($this->get(RenderingContextFactory::class), $this->get(PackageManager::class)));
self::assertCount(1, $subject->getGridForPageLayoutContext($pageLayoutContext)->getRows());
self::assertCount(2, $subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns());
foreach ($subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns() as $column) {
@@ -209,7 +209,7 @@ class BackendLayoutRendererTest extends FunctionalTestCase
],
];
$pageLayoutContext = $this->getPageLayoutContext(1100, $configuration);
- $subject = new BackendLayoutRenderer(new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class)));
+ $subject = new BackendLayoutRenderer(new BackendViewFactory($this->get(RenderingContextFactory::class), $this->get(PackageManager::class)));
self::assertCount(2, $subject->getGridForPageLayoutContext($pageLayoutContext)->getRows());
self::assertCount(2, $subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns());
foreach ($subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns() as $column) {
@@ -247,7 +247,7 @@ class BackendLayoutRendererTest extends FunctionalTestCase
],
];
$pageLayoutContext = $this->getPageLayoutContext(1100, $configuration);
- $subject = new BackendLayoutRenderer(new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class)));
+ $subject = new BackendLayoutRenderer(new BackendViewFactory($this->get(RenderingContextFactory::class), $this->get(PackageManager::class)));
self::assertCount(2, $subject->getGridForPageLayoutContext($pageLayoutContext)->getRows());
self::assertCount(4, $subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns());
foreach ($subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns() as $column) {
@@ -273,7 +273,7 @@ class BackendLayoutRendererTest extends FunctionalTestCase
],
];
$pageLayoutContext = $this->getPageLayoutContext(1100, $configuration);
- $subject = new BackendLayoutRenderer(new BackendViewFactory($this->getContainer()->get(RenderingContextFactory::class), $this->getContainer()->get(PackageManager::class)));
+ $subject = new BackendLayoutRenderer(new BackendViewFactory($this->get(RenderingContextFactory::class), $this->get(PackageManager::class)));
self::assertCount(1, $subject->getGridForPageLayoutContext($pageLayoutContext)->getRows());
self::assertCount(1, $subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns());
foreach ($subject->getGridForPageLayoutContext($pageLayoutContext)->getColumns() as $column) {
diff --git a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/EditRecordViewHelperTest.php b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/EditRecordViewHelperTest.php
index d66d97f671f0..20568b5a04a3 100644
--- a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/EditRecordViewHelperTest.php
+++ b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/EditRecordViewHelperTest.php
@@ -46,7 +46,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkInExplicitFormat(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.editRecord uid="42" table="a_table">edit record a_table:42</be:link.editRecord>');
@@ -61,7 +61,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkInInlineFormat(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource("{be:link.editRecord(uid: 21, table: 'b_table')}");
@@ -76,7 +76,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithReturnUrl(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.editRecord uid="43" table="c_table" returnUrl="foo/bar">edit record c_table:43</be:link.editRecord>');
$result = urldecode((new TemplateView($context))->render());
@@ -91,7 +91,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithField(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.editRecord uid="43" table="c_table" fields="canonical_url">edit record c_table:42</be:link.editRecord>');
@@ -107,7 +107,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithFields(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.editRecord uid="43" table="c_table" fields="canonical_url,title">edit record c_table:42</be:link.editRecord>');
@@ -126,7 +126,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1526127158);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.editRecord uid="-42" table="c_table">edit record c_table:-42</be:link.editRecord>');
diff --git a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/NewRecordViewHelperTest.php b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/NewRecordViewHelperTest.php
index 00ecf9ee0a74..9860fee12fa1 100644
--- a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/NewRecordViewHelperTest.php
+++ b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/NewRecordViewHelperTest.php
@@ -46,7 +46,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkInExplicitFormat(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.newRecord table="a_table" pid="17">new record at a_table on page 17</be:link.newRecord>');
@@ -61,7 +61,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkForRoot(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.newRecord table="a_table">new record at a_table on root</be:link.newRecord>');
@@ -76,7 +76,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkInInlineFormat(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource("{be:link.newRecord(table: 'b_table', pid:17)}");
@@ -91,7 +91,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithReturnUrl(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.newRecord table="c_table" returnUrl="foo/bar" pid="17">new record at c_table</be:link.newRecord>');
$result = urldecode((new TemplateView($context))->render());
@@ -106,7 +106,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithPosition(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.newRecord uid="-11" table="c_table">new record at c_table after record with uid 11</be:link.newRecord>');
@@ -121,7 +121,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithDefaultValue(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.newRecord table="c_table" defaultValues="{c_table: {c_field: \'c_value\'}}" pid="17">new record at c_table</be:link.newRecord>');
@@ -137,7 +137,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithDefaultValues(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.newRecord table="c_table" defaultValues="{c_table: {c_field: \'c_value\', c_field2: \'c_value2\'}}" pid="17">new record at c_table</be:link.newRecord>');
@@ -156,7 +156,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1526134901);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.newRecord uid="42" table="c_table">if uid given, it must be negative</be:link.newRecord>');
@@ -171,7 +171,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1526129969);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:link.newRecord uid="-42" pid="18" table="c_table">can\'t handle uid and pid together</be:link.newRecord>');
diff --git a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Mfa/IfHasStateViewHelperTest.php b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Mfa/IfHasStateViewHelperTest.php
index 509ea7597bb0..bd40d42fbde0 100644
--- a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Mfa/IfHasStateViewHelperTest.php
+++ b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Mfa/IfHasStateViewHelperTest.php
@@ -35,10 +35,10 @@ class IfHasStateViewHelperTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $this->view = new TemplateView($this->getContainer()->get(RenderingContextFactory::class)->create());
+ $this->view = new TemplateView($this->get(RenderingContextFactory::class)->create());
$this->view->getRenderingContext()->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$this->view->getTemplatePaths()->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Mfa/IfHasStateViewHelper.html');
- $this->view->assign('provider', $this->getContainer()->get(MfaProviderRegistry::class)->getProvider('totp'));
+ $this->view->assign('provider', $this->get(MfaProviderRegistry::class)->getProvider('totp'));
}
/**
diff --git a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/EditRecordViewHelperTest.php b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/EditRecordViewHelperTest.php
index 79c67320fee9..0326992fc6ef 100644
--- a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/EditRecordViewHelperTest.php
+++ b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/EditRecordViewHelperTest.php
@@ -46,7 +46,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkInExplicitFormat(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.editRecord uid="42" table="a_table">edit record a_table:42</be:uri.editRecord>');
@@ -61,7 +61,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkInInlineFormat(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('{be:uri.editRecord(uid: 21, table: \'b_table\')}');
@@ -76,7 +76,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithReturnUrl(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.editRecord uid="43" table="c_table" returnUrl="foo/bar">edit record c_table:43</be:uri.editRecord>');
$result = urldecode((new TemplateView($context))->render());
@@ -91,7 +91,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithField(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.editRecord uid="43" table="c_table" fields="canonical_url">edit record c_table:43</be:uri.editRecord>');
@@ -107,7 +107,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithFields(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.editRecord uid="43" table="c_table" fields="canonical_url,title">edit record c_table:43</be:uri.editRecord>');
@@ -126,7 +126,7 @@ class EditRecordViewHelperTest extends FunctionalTestCase
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1526128259);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.editRecord uid="-42" table="c_table">edit record c_table:-42</be:uri.editRecord>');
(new TemplateView($context))->render();
diff --git a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/NewRecordViewHelperTest.php b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/NewRecordViewHelperTest.php
index b23a76417c5e..784620a1b687 100644
--- a/typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/NewRecordViewHelperTest.php
+++ b/typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/NewRecordViewHelperTest.php
@@ -46,7 +46,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkInExplicitFormat(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.newRecord table="a_table" pid="17">new record at a_table on page 17</be:uri.newRecord>');
@@ -61,7 +61,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkForRoot(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.newRecord table="a_table">new record at a_table on root</be:uri.newRecord>');
@@ -76,7 +76,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkInInlineFormat(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('{be:uri.newRecord(table: \'b_table\', pid:17)}');
@@ -91,7 +91,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithReturnUrl(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.newRecord table="c_table" returnUrl="foo/bar" pid="17">new record at c_table</be:uri.newRecord>');
$result = urldecode((new TemplateView($context))->render());
@@ -106,7 +106,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWitPosition(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.newRecord uid="-11" table="c_table">new record at c_table after record with uid 11</be:uri.newRecord>');
@@ -121,7 +121,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithDefaultValue(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.newRecord table="c_table" defaultValues="{c_table: {c_field: \'c_value\'}}" pid="17">new record at c_table</be:uri.newRecord>');
@@ -137,7 +137,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsValidLinkWithDefaultValues(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.newRecord table="c_table" defaultValues="{c_table: {c_field: \'c_value\', c_field2: \'c_value2\'}}" pid="17">new record at c_table</be:uri.newRecord>');
@@ -156,7 +156,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1526136338);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.newRecord uid="-42" pid="18" table="c_table">can\'t handle uid and pid together</be:uri.newRecord>');
@@ -171,7 +171,7 @@ class NewRecordViewHelperTest extends FunctionalTestCase
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1526136362);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->setRequest($this->request);
$context->getViewHelperResolver()->addNamespace('be', 'TYPO3\\CMS\\Backend\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<be:uri.newRecord uid="42" table="c_table">if uid given, it must be negative</be:uri.newRecord>');
diff --git a/typo3/sysext/beuser/Tests/Functional/ViewHelpers/MfaStatusViewHelperTest.php b/typo3/sysext/beuser/Tests/Functional/ViewHelpers/MfaStatusViewHelperTest.php
index 27b5d752e972..5473e4f9151a 100644
--- a/typo3/sysext/beuser/Tests/Functional/ViewHelpers/MfaStatusViewHelperTest.php
+++ b/typo3/sysext/beuser/Tests/Functional/ViewHelpers/MfaStatusViewHelperTest.php
@@ -46,7 +46,7 @@ class MfaStatusViewHelperTest extends FunctionalTestCase
$languageServiceProphecy->sL(Argument::cetera())->willReturnArgument(0);
$GLOBALS['LANG'] = $languageServiceProphecy->reveal();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getViewHelperResolver()->addNamespace('bu', 'TYPO3\\CMS\\Beuser\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<bu:mfaStatus userUid="{userUid}"/>');
$this->view = new TemplateView($context);
diff --git a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/MfaProviderPropertyManagerTest.php b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/MfaProviderPropertyManagerTest.php
index d2754fbf4caf..1a5947b2af53 100644
--- a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/MfaProviderPropertyManagerTest.php
+++ b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/MfaProviderPropertyManagerTest.php
@@ -214,7 +214,7 @@ class MfaProviderPropertyManagerTest extends FunctionalTestCase
protected function createPropertyManager(string $providerIdentifier): MfaProviderPropertyManager
{
return MfaProviderPropertyManager::create(
- $this->getContainer()->get(MfaProviderRegistry::class)->getProvider($providerIdentifier),
+ $this->get(MfaProviderRegistry::class)->getProvider($providerIdentifier),
$this->user
);
}
diff --git a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/MfaProviderRegistryTest.php b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/MfaProviderRegistryTest.php
index 5e88d55b8d30..041acad0a164 100644
--- a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/MfaProviderRegistryTest.php
+++ b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/MfaProviderRegistryTest.php
@@ -31,7 +31,7 @@ class MfaProviderRegistryTest extends FunctionalTestCase
{
parent::setUp();
- $this->subject = $this->getContainer()->get(MfaProviderRegistry::class);
+ $this->subject = $this->get(MfaProviderRegistry::class);
// Add two providers, which both are not active and unlocked
$this->user = $this->setUpBackendUserFromFixture(1);
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 c38cfe0de06c..83d58079f63b 100644
--- a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/RecoveryCodesProviderTest.php
+++ b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/RecoveryCodesProviderTest.php
@@ -56,8 +56,8 @@ class RecoveryCodesProviderTest extends FunctionalTestCase
parent::setUp();
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
$this->user = $this->setUpBackendUser(1);
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->createFromUserPreferences($this->user);
- $this->subject = $this->getContainer()->get(MfaProviderRegistry::class)->getProvider('recovery-codes');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->createFromUserPreferences($this->user);
+ $this->subject = $this->get(MfaProviderRegistry::class)->getProvider('recovery-codes');
}
/**
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 5c851fec861a..d7541c48f2ca 100644
--- a/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/TotpProviderTest.php
+++ b/typo3/sysext/core/Tests/Functional/Authentication/Mfa/Provider/TotpProviderTest.php
@@ -39,8 +39,8 @@ class TotpProviderTest extends FunctionalTestCase
parent::setUp();
$this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
$this->user = $this->setUpBackendUser(1);
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->createFromUserPreferences($this->user);
- $this->subject = $this->getContainer()->get(MfaProviderRegistry::class)->getProvider('totp');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->createFromUserPreferences($this->user);
+ $this->subject = $this->get(MfaProviderRegistry::class)->getProvider('totp');
}
/**
diff --git a/typo3/sysext/core/Tests/Functional/Command/CacheFlushCommandTest.php b/typo3/sysext/core/Tests/Functional/Command/CacheFlushCommandTest.php
index 157d74457194..bedf893c23eb 100644
--- a/typo3/sysext/core/Tests/Functional/Command/CacheFlushCommandTest.php
+++ b/typo3/sysext/core/Tests/Functional/Command/CacheFlushCommandTest.php
@@ -49,13 +49,13 @@ class CacheFlushCommandTest extends AbstractCommandTest
*/
public function cachesCanBeFlushed(): void
{
- $containerBuilder = $this->getContainer()->get(ContainerBuilder::class);
- $packageManager = $this->getContainer()->get(PackageManager::class);
+ $containerBuilder = $this->get(ContainerBuilder::class);
+ $packageManager = $this->get(PackageManager::class);
$diCacheIdentifier = $containerBuilder->getCacheIdentifier($packageManager);
$diCacheFile = Environment::getVarPath() . '/cache/code/di/' . $diCacheIdentifier . '.php';
- $siteConfiguration = $this->getContainer()->get(SiteConfiguration::class);
- $pageCache = $this->getContainer()->get(CacheManager::class)->getCache('pages');
+ $siteConfiguration = $this->get(SiteConfiguration::class);
+ $pageCache = $this->get(CacheManager::class)->getCache('pages');
// fill cache
$siteConfiguration->getAllExistingSites();
@@ -82,8 +82,8 @@ class CacheFlushCommandTest extends AbstractCommandTest
*/
public function diCachesCanBeFlushed(): void
{
- $containerBuilder = $this->getContainer()->get(ContainerBuilder::class);
- $packageManager = $this->getContainer()->get(PackageManager::class);
+ $containerBuilder = $this->get(ContainerBuilder::class);
+ $packageManager = $this->get(PackageManager::class);
$diCacheIdentifier = $containerBuilder->getCacheIdentifier($packageManager);
$diCacheFile = Environment::getVarPath() . '/cache/code/di/' . $diCacheIdentifier . '.php';
@@ -101,12 +101,12 @@ class CacheFlushCommandTest extends AbstractCommandTest
*/
public function systemCachesCanBeFlushed(): void
{
- $containerBuilder = $this->getContainer()->get(ContainerBuilder::class);
- $packageManager = $this->getContainer()->get(PackageManager::class);
+ $containerBuilder = $this->get(ContainerBuilder::class);
+ $packageManager = $this->get(PackageManager::class);
$diCacheIdentifier = $containerBuilder->getCacheIdentifier($packageManager);
- $siteConfiguration = $this->getContainer()->get(SiteConfiguration::class);
- $pageCache = $this->getContainer()->get(CacheManager::class)->getCache('pages');
+ $siteConfiguration = $this->get(SiteConfiguration::class);
+ $pageCache = $this->get(CacheManager::class)->getCache('pages');
$diCacheFile = Environment::getVarPath() . '/cache/code/di/' . $diCacheIdentifier . '.php';
// fill cache
@@ -136,12 +136,12 @@ class CacheFlushCommandTest extends AbstractCommandTest
*/
public function pageCachesCanBeFlushed(): void
{
- $containerBuilder = $this->getContainer()->get(ContainerBuilder::class);
- $packageManager = $this->getContainer()->get(PackageManager::class);
+ $containerBuilder = $this->get(ContainerBuilder::class);
+ $packageManager = $this->get(PackageManager::class);
$diCacheIdentifier = $containerBuilder->getCacheIdentifier($packageManager);
- $siteConfiguration = $this->getContainer()->get(SiteConfiguration::class);
- $pageCache = $this->getContainer()->get(CacheManager::class)->getCache('pages');
+ $siteConfiguration = $this->get(SiteConfiguration::class);
+ $pageCache = $this->get(CacheManager::class)->getCache('pages');
$diCacheFile = Environment::getVarPath() . '/cache/code/di/' . $diCacheIdentifier . '.php';
// fill cache
diff --git a/typo3/sysext/core/Tests/Functional/Command/CacheWarmupCommandTest.php b/typo3/sysext/core/Tests/Functional/Command/CacheWarmupCommandTest.php
index e0eb0b7057a0..ef717b0204d4 100644
--- a/typo3/sysext/core/Tests/Functional/Command/CacheWarmupCommandTest.php
+++ b/typo3/sysext/core/Tests/Functional/Command/CacheWarmupCommandTest.php
@@ -32,8 +32,8 @@ class CacheWarmupCommandTest extends AbstractCommandTest
*/
public function cachesCanBeWarmed(): void
{
- $containerBuilder = $this->getContainer()->get(ContainerBuilder::class);
- $packageManager = $this->getContainer()->get(PackageManager::class);
+ $containerBuilder = $this->get(ContainerBuilder::class);
+ $packageManager = $this->get(PackageManager::class);
$diCacheIdentifier = $containerBuilder->getCacheIdentifier($packageManager);
GeneralUtility::rmdir(Environment::getVarPath() . '/cache/', true);
@@ -49,8 +49,8 @@ class CacheWarmupCommandTest extends AbstractCommandTest
*/
public function systemCachesCanBeWarmed(): void
{
- $containerBuilder = $this->getContainer()->get(ContainerBuilder::class);
- $packageManager = $this->getContainer()->get(PackageManager::class);
+ $containerBuilder = $this->get(ContainerBuilder::class);
+ $packageManager = $this->get(PackageManager::class);
$diCacheIdentifier = $containerBuilder->getCacheIdentifier($packageManager);
GeneralUtility::rmdir(Environment::getVarPath() . '/cache/', true);
@@ -66,8 +66,8 @@ class CacheWarmupCommandTest extends AbstractCommandTest
*/
public function diCachesDoesNotWarmSystemCaches(): void
{
- $containerBuilder = $this->getContainer()->get(ContainerBuilder::class);
- $packageManager = $this->getContainer()->get(PackageManager::class);
+ $containerBuilder = $this->get(ContainerBuilder::class);
+ $packageManager = $this->get(PackageManager::class);
$diCacheIdentifier = $containerBuilder->getCacheIdentifier($packageManager);
GeneralUtility::rmdir(Environment::getVarPath() . '/cache/', true);
@@ -83,8 +83,8 @@ class CacheWarmupCommandTest extends AbstractCommandTest
*/
public function systemCachesCanBeWarmedIfCacheIsBroken(): void
{
- $containerBuilder = $this->getContainer()->get(ContainerBuilder::class);
- $packageManager = $this->getContainer()->get(PackageManager::class);
+ $containerBuilder = $this->get(ContainerBuilder::class);
+ $packageManager = $this->get(PackageManager::class);
$diCacheIdentifier = $containerBuilder->getCacheIdentifier($packageManager);
GeneralUtility::mkdir_deep(Environment::getVarPath() . '/cache/code/di');
diff --git a/typo3/sysext/core/Tests/Functional/Domain/Access/RecordAccessVoterTest.php b/typo3/sysext/core/Tests/Functional/Domain/Access/RecordAccessVoterTest.php
index d8fba41c5025..2b376ec61b31 100644
--- a/typo3/sysext/core/Tests/Functional/Domain/Access/RecordAccessVoterTest.php
+++ b/typo3/sysext/core/Tests/Functional/Domain/Access/RecordAccessVoterTest.php
@@ -33,7 +33,7 @@ class RecordAccessVoterTest extends FunctionalTestCase
parent::setUp();
$this->subject = new RecordAccessVoter(
- $this->getContainer()->get(EventDispatcherInterface::class)
+ $this->get(EventDispatcherInterface::class)
);
}
diff --git a/typo3/sysext/core/Tests/Functional/Localization/LanguageServiceTest.php b/typo3/sysext/core/Tests/Functional/Localization/LanguageServiceTest.php
index 060d52c6860f..4af4d99bb901 100644
--- a/typo3/sysext/core/Tests/Functional/Localization/LanguageServiceTest.php
+++ b/typo3/sysext/core/Tests/Functional/Localization/LanguageServiceTest.php
@@ -60,7 +60,7 @@ class LanguageServiceTest extends FunctionalTestCase
*/
public function splitLabelTest(string $input, string $expected): void
{
- $subject = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $subject = $this->get(LanguageServiceFactory::class)->create('default');
self::assertEquals($expected, $subject->sL($input));
}
@@ -126,7 +126,7 @@ class LanguageServiceTest extends FunctionalTestCase
private function ensureLocalizationScenarioWorks(string $locale, string $languageFile, array $expectedLabels): void
{
- $subject = $this->getContainer()->get(LanguageServiceFactory::class)->create($locale);
+ $subject = $this->get(LanguageServiceFactory::class)->create($locale);
foreach ($expectedLabels as $label => $expectedLabel) {
self::assertEquals($expectedLabel, $subject->sL(sprintf('LLL:%s:%s', $languageFile, $label)));
diff --git a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
index 8799e8879b6e..03390d498483 100644
--- a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
+++ b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
@@ -405,7 +405,7 @@ class PageRendererTest extends FunctionalTestCase
$GLOBALS['BE_USER']->user = ['uid' => 1];
$GLOBALS['BE_USER']->setLogger(new NullLogger());
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->createFromUserPreferences($GLOBALS['BE_USER']);
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->createFromUserPreferences($GLOBALS['BE_USER']);
$GLOBALS['TYPO3_REQUEST'] = (new ServerRequest())
->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_BE);
diff --git a/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedAliasMapperTest.php b/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedAliasMapperTest.php
index 3d7049153598..efaba1f37503 100644
--- a/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedAliasMapperTest.php
+++ b/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedAliasMapperTest.php
@@ -315,7 +315,7 @@ class PersistedAliasMapperTest extends FunctionalTestCase
try {
// ensure no previous site configuration influences the test
$path = $this->instancePath . '/typo3conf/sites';
- $cache = $this->getContainer()->get('cache.core');
+ $cache = $this->get('cache.core');
GeneralUtility::rmdir($path . '/' . $site->getIdentifier(), true);
GeneralUtility::makeInstance(SiteConfiguration::class, $path, $cache)->write($site->getIdentifier(), $site->getConfiguration());
} catch (\Exception $exception) {
diff --git a/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedPatternMapperTest.php b/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedPatternMapperTest.php
index 19c6bc736627..be33d7e5d980 100644
--- a/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedPatternMapperTest.php
+++ b/typo3/sysext/core/Tests/Functional/Routing/Aspect/PersistedPatternMapperTest.php
@@ -319,7 +319,7 @@ class PersistedPatternMapperTest extends FunctionalTestCase
try {
// ensure no previous site configuration influences the test
$path = $this->instancePath . '/typo3conf/sites';
- $cache = $this->getContainer()->get('cache.core');
+ $cache = $this->get('cache.core');
GeneralUtility::rmdir($path . '/' . $site->getIdentifier(), true);
GeneralUtility::makeInstance(SiteConfiguration::class, $path, $cache)->write($site->getIdentifier(), $site->getConfiguration());
} catch (\Exception $exception) {
diff --git a/typo3/sysext/core/Tests/Functional/SiteHandling/SiteBasedTestTrait.php b/typo3/sysext/core/Tests/Functional/SiteHandling/SiteBasedTestTrait.php
index e4c874407372..d87df5a16368 100644
--- a/typo3/sysext/core/Tests/Functional/SiteHandling/SiteBasedTestTrait.php
+++ b/typo3/sysext/core/Tests/Functional/SiteHandling/SiteBasedTestTrait.php
@@ -70,7 +70,7 @@ trait SiteBasedTestTrait
}
$siteConfiguration = new SiteConfiguration(
$this->instancePath . '/typo3conf/sites/',
- $this->getContainer()->get('cache.core')
+ $this->get('cache.core')
);
try {
@@ -92,7 +92,7 @@ trait SiteBasedTestTrait
): void {
$siteConfiguration = new SiteConfiguration(
$this->instancePath . '/typo3conf/sites/',
- $this->getContainer()->get('cache.core')
+ $this->get('cache.core')
);
$configuration = $siteConfiguration->load($identifier);
$configuration = array_merge($configuration, $overrides);
diff --git a/typo3/sysext/core/Tests/Functional/ViewHelpers/IconForRecordViewHelperTest.php b/typo3/sysext/core/Tests/Functional/ViewHelpers/IconForRecordViewHelperTest.php
index 869c7384b394..6f75fbd6b8ab 100644
--- a/typo3/sysext/core/Tests/Functional/ViewHelpers/IconForRecordViewHelperTest.php
+++ b/typo3/sysext/core/Tests/Functional/ViewHelpers/IconForRecordViewHelperTest.php
@@ -46,7 +46,7 @@ class IconForRecordViewHelperTest extends FunctionalTestCase
$iconFactoryProphecy->getIconForRecord(Argument::cetera())->willReturn($iconProphecy->reveal());
GeneralUtility::addInstance(IconFactory::class, $iconFactoryProphecy->reveal());
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(
'<core:iconForRecord table="tt_content" row="{uid: 123}" size="large" alternativeMarkupIdentifier="inline" />'
);
diff --git a/typo3/sysext/core/Tests/Functional/ViewHelpers/IconViewHelperTest.php b/typo3/sysext/core/Tests/Functional/ViewHelpers/IconViewHelperTest.php
index 5c094783eb3f..0b67cc588cd7 100644
--- a/typo3/sysext/core/Tests/Functional/ViewHelpers/IconViewHelperTest.php
+++ b/typo3/sysext/core/Tests/Functional/ViewHelpers/IconViewHelperTest.php
@@ -47,7 +47,7 @@ class IconViewHelperTest extends FunctionalTestCase
$iconFactoryProphecy->getIcon('myIdentifier', Icon::SIZE_SMALL, null, IconState::cast(IconState::STATE_DEFAULT))->shouldBeCalled()->willReturn($iconProphecy->reveal());
$iconProphecy->render(null)->shouldBeCalled()->willReturn('htmlFoo');
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<core:icon identifier="myIdentifier" size="small" state="default" />');
self::assertSame('htmlFoo', (new TemplateView($context))->render());
}
@@ -63,7 +63,7 @@ class IconViewHelperTest extends FunctionalTestCase
$iconFactoryProphecy->getIcon('myIdentifier', Icon::SIZE_LARGE, null, IconState::cast(IconState::STATE_DEFAULT))->shouldBeCalled()->willReturn($iconProphecy->reveal());
$iconProphecy->render(null)->shouldBeCalled()->willReturn('htmlFoo');
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<core:icon identifier="myIdentifier" size="large" state="default" />');
self::assertSame('htmlFoo', (new TemplateView($context))->render());
}
@@ -79,7 +79,7 @@ class IconViewHelperTest extends FunctionalTestCase
$iconFactoryProphecy->getIcon('myIdentifier', Icon::SIZE_SMALL, null, IconState::cast(IconState::STATE_DISABLED))->shouldBeCalled()->willReturn($iconProphecy->reveal());
$iconProphecy->render(null)->shouldBeCalled()->willReturn('htmlFoo');
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<core:icon identifier="myIdentifier" size="small" state="disabled" />');
self::assertSame('htmlFoo', (new TemplateView($context))->render());
}
@@ -95,7 +95,7 @@ class IconViewHelperTest extends FunctionalTestCase
$iconFactoryProphecy->getIcon('myIdentifier', Argument::any(), 'overlayString', IconState::cast(IconState::STATE_DEFAULT))->shouldBeCalled()->willReturn($iconProphecy->reveal());
$iconProphecy->render(null)->shouldBeCalled()->willReturn('htmlFoo');
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<core:icon identifier="myIdentifier" size="large" state="default" overlay="overlayString" />');
self::assertSame('htmlFoo', (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerArgumentTest.php b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerArgumentTest.php
index ba5121e1b148..6e5e381385ad 100644
--- a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerArgumentTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerArgumentTest.php
@@ -218,6 +218,6 @@ class ActionControllerArgumentTest extends FunctionalTestCase
private function buildController(): ArgumentTestController
{
- return $this->getContainer()->get(ArgumentTestController::class);
+ return $this->get(ArgumentTestController::class);
}
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerTest.php b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerTest.php
index 81cd4ca1d9ea..054d8d4561b6 100644
--- a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerTest.php
@@ -57,7 +57,7 @@ class ActionControllerTest extends FunctionalTestCase
$this->request->setControllerName('Test');
$this->request->setFormat('html');
- $this->subject = $this->getContainer()->get(TestController::class);
+ $this->subject = $this->get(TestController::class);
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ControllerArgumentsMappingTest.php b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ControllerArgumentsMappingTest.php
index 920d6b8f3f22..8ec22171bf74 100644
--- a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ControllerArgumentsMappingTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ControllerArgumentsMappingTest.php
@@ -59,7 +59,7 @@ class ControllerArgumentsMappingTest extends FunctionalTestCase
'storagePid' => 20,
],
];
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$this->request = new Request();
$this->request->setPluginName('Pi1');
@@ -67,7 +67,7 @@ class ControllerArgumentsMappingTest extends FunctionalTestCase
$this->request->setControllerName('Blog');
$this->request->setFormat('html');
- $this->controller = $this->getContainer()->get(BlogController::class);
+ $this->controller = $this->get(BlogController::class);
}
public function actionGetsBlogFromUidArgumentDataProvider(): array
diff --git a/typo3/sysext/extbase/Tests/Functional/Mvc/Validation/ActionControllerValidationTest.php b/typo3/sysext/extbase/Tests/Functional/Mvc/Validation/ActionControllerValidationTest.php
index 7936547ca8ac..4ee0fc4dd224 100644
--- a/typo3/sysext/extbase/Tests/Functional/Mvc/Validation/ActionControllerValidationTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Mvc/Validation/ActionControllerValidationTest.php
@@ -66,7 +66,7 @@ class ActionControllerValidationTest extends FunctionalTestCase
*/
public function forwardedActionValidatesPreviouslyIgnoredArgument(array $blogPostArgument, array $trustedProperties, array $expectedErrorCodes): void
{
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = 'testkey';
$this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/pages.xml');
@@ -90,7 +90,7 @@ class ActionControllerValidationTest extends FunctionalTestCase
$titleMappingResults = new Result();
$isDispatched = false;
while (!$isDispatched) {
- $blogController = $this->getContainer()->get(BlogController::class);
+ $blogController = $this->get(BlogController::class);
$response = $blogController->processRequest($request);
if ($response instanceof ForwardResponse) {
$titleMappingResults = $response->getArgumentsValidationResult()->forProperty('blogPost.title');
@@ -117,7 +117,7 @@ class ActionControllerValidationTest extends FunctionalTestCase
*/
public function validationResultsAreProvidedForTheSameObjectInDifferentArguments(): void
{
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = 'testkey';
$this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/pages.xml');
@@ -156,7 +156,7 @@ class ActionControllerValidationTest extends FunctionalTestCase
$isDispatched = false;
while (!$isDispatched) {
- $blogController = $this->getContainer()->get(BlogController::class);
+ $blogController = $this->get(BlogController::class);
$response = $blogController->processRequest($request);
if ($response instanceof ForwardResponse) {
@@ -183,7 +183,7 @@ class ActionControllerValidationTest extends FunctionalTestCase
*/
public function argumentsOfOriginalRequestRemainOnValidationErrors(): void
{
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = 'testkey';
$this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/pages.xml');
@@ -223,7 +223,7 @@ class ActionControllerValidationTest extends FunctionalTestCase
$originalArguments = $request->getArguments();
$isDispatched = false;
while (!$isDispatched) {
- $blogController = $this->getContainer()->get(BlogController::class);
+ $blogController = $this->get(BlogController::class);
$response = $blogController->processRequest($request);
if ($response instanceof ForwardResponse) {
$request = Dispatcher::buildRequestFromCurrentRequestAndForwardResponse($request, $response);
@@ -243,7 +243,7 @@ class ActionControllerValidationTest extends FunctionalTestCase
*/
protected function generateTrustedPropertiesToken(array $formFieldNames): string
{
- $mvcPropertyMappingConfigurationService = $this->getContainer()->get(
+ $mvcPropertyMappingConfigurationService = $this->get(
MvcPropertyMappingConfigurationService::class
);
return $mvcPropertyMappingConfigurationService->generateTrustedPropertiesToken($formFieldNames, '');
@@ -254,6 +254,6 @@ class ActionControllerValidationTest extends FunctionalTestCase
*/
protected function getHashService(): HashService
{
- return $this->getContainer()->get(HashService::class);
+ return $this->get(HashService::class);
}
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Mvc/Web/RequestBuilderTest.php b/typo3/sysext/extbase/Tests/Functional/Mvc/Web/RequestBuilderTest.php
index db61ce54e58b..c274b8e53bba 100644
--- a/typo3/sysext/extbase/Tests/Functional/Mvc/Web/RequestBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Mvc/Web/RequestBuilderTest.php
@@ -56,12 +56,12 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -90,12 +90,12 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['pluginName'] = $pluginName;
$configuration['format'] = 'json';
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -123,13 +123,13 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withQueryParams(['tx_blog_example_blog' => ['format' => 'json']]);
$mainRequest = $mainRequest->withAttribute('module', $module);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -146,7 +146,7 @@ class RequestBuilderTest extends FunctionalTestCase
$this->expectExceptionMessage('"extensionName" is not properly configured. Request can\'t be dispatched!');
$mainRequest = $this->prepareServerRequest('https://example.com/');
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$requestBuilder->build($mainRequest);
}
@@ -159,11 +159,11 @@ class RequestBuilderTest extends FunctionalTestCase
$this->expectExceptionCode(1289843277);
$this->expectExceptionMessage('"pluginName" is not properly configured. Request can\'t be dispatched!');
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration(['extensionName' => 'blog_example']);
$mainRequest = $this->prepareServerRequest('https://example.com/');
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$requestBuilder->build($mainRequest);
}
@@ -196,12 +196,12 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/', 'POST');
$mainRequest = $mainRequest->withAttribute('module', $module);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -255,12 +255,12 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/', 'POST');
$mainRequest = $mainRequest->withAttribute('module', $module);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -309,13 +309,13 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
$mainRequest = $mainRequest->withQueryParams(['tx_blog_example_blog' => ['controller' => 'NonExistentController']]);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$requestBuilder->build($mainRequest);
}
@@ -345,13 +345,13 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['pluginName'] = $pluginName;
$configuration['mvc']['throwPageNotFoundExceptionIfActionCantBeResolved'] = true;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withQueryParams(['tx_blog_example_blog' => ['controller' => 'NonExistentController']]);
$mainRequest = $mainRequest->withAttribute('module', $module);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$requestBuilder->build($mainRequest);
}
@@ -371,11 +371,11 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$requestBuilder->build($mainRequest);
}
@@ -401,13 +401,13 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['pluginName'] = $pluginName;
$configuration['mvc']['callDefaultActionIfActionCantBeResolved'] = true;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
$mainRequest = $mainRequest->withQueryParams(['tx_blog_example_blog' => ['controller' => 'NonExistentController']]);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -436,13 +436,13 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
$mainRequest = $mainRequest->withQueryParams(['tx_blog_example_blog' => ['controller' => 'User']]);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -474,13 +474,13 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
$mainRequest = $mainRequest->withQueryParams(['tx_blog_example_blog' => ['action' => 'NonExistentAction']]);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$requestBuilder->build($mainRequest);
}
@@ -510,13 +510,13 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['pluginName'] = $pluginName;
$configuration['mvc']['throwPageNotFoundExceptionIfActionCantBeResolved'] = true;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
$mainRequest = $mainRequest->withQueryParams(['tx_blog_example_blog' => ['action' => 'NonExistentAction']]);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$requestBuilder->build($mainRequest);
}
@@ -542,13 +542,13 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['pluginName'] = $pluginName;
$configuration['mvc']['callDefaultActionIfActionCantBeResolved'] = true;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
$mainRequest = $mainRequest->withQueryParams(['tx_blog_example_blog' => ['action' => 'NonExistentAction']]);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -576,13 +576,13 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
$mainRequest = $mainRequest->withQueryParams(['tx_blog_example_blog' => ['action' => 'show']]);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -614,12 +614,12 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
$mainRequest = $this->prepareServerRequest('https://example.com/');
$mainRequest = $mainRequest->withAttribute('module', $module);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$requestBuilder->build($mainRequest);
}
@@ -650,10 +650,10 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -689,10 +689,10 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -726,10 +726,10 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
@@ -765,10 +765,10 @@ class RequestBuilderTest extends FunctionalTestCase
$configuration = [];
$configuration['extensionName'] = $extensionName;
$configuration['pluginName'] = $pluginName;
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
- $requestBuilder = $this->getContainer()->get(RequestBuilder::class);
+ $requestBuilder = $this->get(RequestBuilder::class);
$request = $requestBuilder->build($mainRequest);
self::assertInstanceOf(RequestInterface::class, $request);
diff --git a/typo3/sysext/extbase/Tests/Functional/Pagination/QueryResultPaginatorTest.php b/typo3/sysext/extbase/Tests/Functional/Pagination/QueryResultPaginatorTest.php
index 9fdb4ab8afa7..ec82c5c91c52 100644
--- a/typo3/sysext/extbase/Tests/Functional/Pagination/QueryResultPaginatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Pagination/QueryResultPaginatorTest.php
@@ -34,7 +34,7 @@ class QueryResultPaginatorTest extends FunctionalTestCase
{
parent::setUp();
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/posts.csv');
- $this->postRepository = $this->getContainer()->get(PostRepository::class);
+ $this->postRepository = $this->get(PostRepository::class);
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php
index 77ea3de95f9e..9f113323ccf9 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php
@@ -46,8 +46,8 @@ class AddTest extends FunctionalTestCase
{
parent::setUp();
- $this->persistentManager = $this->getContainer()->get(PersistenceManager::class);
- $this->blogRepository = $this->getContainer()->get(BlogRepository::class);
+ $this->persistentManager = $this->get(PersistenceManager::class);
+ $this->blogRepository = $this->get(BlogRepository::class);
$GLOBALS['BE_USER'] = new BackendUserAuthentication();
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
index 40bb944ab30c..9da7726520c6 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
@@ -51,7 +51,7 @@ class CountTest extends FunctionalTestCase
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/post-tag-mm.csv');
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/persons.csv');
- $this->postRepository = $this->getContainer()->get(PostRepository::class);
+ $this->postRepository = $this->get(PostRepository::class);
}
/**
@@ -189,7 +189,7 @@ class CountTest extends FunctionalTestCase
*/
public function queryWithAndConditionsToTheSameTableReturnExpectedCount(): void
{
- $personRepository = $this->getContainer()->get(PersonRepository::class);
+ $personRepository = $this->get(PersonRepository::class);
$query = $personRepository->createQuery();
$query->matching(
$query->logicalAnd(
@@ -205,7 +205,7 @@ class CountTest extends FunctionalTestCase
*/
public function queryWithOrConditionsToTheSameTableReturnExpectedCount(): void
{
- $personRepository = $this->getContainer()->get(PersonRepository::class);
+ $personRepository = $this->get(PersonRepository::class);
$query = $personRepository->createQuery();
$query->matching(
$query->logicalOr(
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapFactoryTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapFactoryTest.php
index f229b0db7617..16c6b88ea983 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapFactoryTest.php
@@ -45,7 +45,7 @@ class DataMapFactoryTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $this->dataMapFactory = $this->getContainer()->get(DataMapFactory::class);
+ $this->dataMapFactory = $this->get(DataMapFactory::class);
$GLOBALS['BE_USER'] = new BackendUserAuthentication();
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php
index 805bc1844946..d424c5b93d82 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php
@@ -38,7 +38,7 @@ class DataMapperTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $this->persistenceManager = $this->getContainer()->get(PersistenceManager::class);
+ $this->persistenceManager = $this->get(PersistenceManager::class);
$GLOBALS['BE_USER'] = new BackendUserAuthentication();
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php
index 80dbfed6ef00..b6a86dca5f9c 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php
@@ -50,8 +50,8 @@ class InTest extends FunctionalTestCase
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/tags.csv');
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/post-tag-mm.csv');
- $this->blogRepository = $this->getContainer()->get(BlogRepository::class);
- $this->postRepository = $this->getContainer()->get(PostRepository::class);
+ $this->blogRepository = $this->get(BlogRepository::class);
+ $this->postRepository = $this->get(PostRepository::class);
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/IsDirtyTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/IsDirtyTest.php
index 7637cb25da5a..f73cb388afe7 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/IsDirtyTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/IsDirtyTest.php
@@ -55,8 +55,8 @@ class IsDirtyTest extends FunctionalTestCase
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/fe_users.csv');
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/fe_groups.csv');
- $this->blogRepository = $this->getContainer()->get(BlogRepository::class);
- $this->adminRepository = $this->getContainer()->get(AdministratorRepository::class);
+ $this->blogRepository = $this->get(BlogRepository::class);
+ $this->adminRepository = $this->get(AdministratorRepository::class);
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
index 06d064c76800..e1a7151e8553 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
@@ -49,8 +49,8 @@ class OperatorTest extends FunctionalTestCase
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/tags.csv');
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/post-tag-mm.csv');
- $this->blogRepository = $this->getContainer()->get(BlogRepository::class);
- $this->postRepository = $this->getContainer()->get(PostRepository::class);
+ $this->blogRepository = $this->get(BlogRepository::class);
+ $this->postRepository = $this->get(PostRepository::class);
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/QueryLocalizedDataTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/QueryLocalizedDataTest.php
index 4eca9100b088..69bc9b3482ac 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/QueryLocalizedDataTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/QueryLocalizedDataTest.php
@@ -66,10 +66,10 @@ class QueryLocalizedDataTest extends FunctionalTestCase
'extensionName' => 'blog_example',
'pluginName' => 'test',
];
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration($configuration);
- $this->postRepository = $this->getContainer()->get(PostRepository::class);
- $this->persistenceManager = $this->getContainer()->get(PersistenceManager::class);
+ $this->postRepository = $this->get(PostRepository::class);
+ $this->persistenceManager = $this->get(PersistenceManager::class);
}
/**
@@ -1144,7 +1144,7 @@ class QueryLocalizedDataTest extends FunctionalTestCase
$context = GeneralUtility::makeInstance(Context::class);
$context->setAspect('language', new LanguageAspect($languageUid, $languageUid, $overlay));
- $blogRepository = $this->getContainer()->get(BlogRepository::class);
+ $blogRepository = $this->get(BlogRepository::class);
$query = $blogRepository->createQuery();
$querySettings = $query->getQuerySettings();
$querySettings->setRespectSysLanguage(false);
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php
index 920a4061db65..5c49fc85fedc 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php
@@ -49,7 +49,7 @@ class QueryParserTest extends FunctionalTestCase
*/
public function queryWithMultipleRelationsToIdenticalTablesReturnsExpectedResultForOrQuery(): void
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$query = $postRepository->createQuery();
$query->matching(
$query->logicalAnd(
@@ -72,7 +72,7 @@ class QueryParserTest extends FunctionalTestCase
*/
public function queryWithRelationHasAndBelongsToManyReturnsExpectedResult(): void
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$query = $postRepository->createQuery();
$query->matching(
$query->equals('tags.name', 'Tag12')
@@ -88,7 +88,7 @@ class QueryParserTest extends FunctionalTestCase
*/
public function queryWithRelationHasManyWithoutParentKeyFieldNameReturnsExpectedResult(): void
{
- $administratorRepository = $this->getContainer()->get(AdministratorRepository::class);
+ $administratorRepository = $this->get(AdministratorRepository::class);
$query = $administratorRepository->createQuery();
$query->matching(
$query->equals('usergroup.title', 'Group A')
@@ -105,7 +105,7 @@ class QueryParserTest extends FunctionalTestCase
*/
public function queryWithRelationHasOneAndHasAndBelongsToManyWithoutParentKeyFieldNameReturnsExpectedResult(): void
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$query = $postRepository->createQuery();
$query->matching(
$query->equals('author.firstname', 'Author')
@@ -120,7 +120,7 @@ class QueryParserTest extends FunctionalTestCase
*/
public function orReturnsExpectedResult(): void
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$query = $postRepository->createQuery();
$query->matching(
$query->logicalOr(
@@ -137,7 +137,7 @@ class QueryParserTest extends FunctionalTestCase
*/
public function queryWithMultipleRelationsToIdenticalTablesReturnsExpectedResultForAndQuery(): void
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$query = $postRepository->createQuery();
$query->matching(
$query->logicalAnd(
@@ -155,7 +155,7 @@ class QueryParserTest extends FunctionalTestCase
*/
public function queryWithFindInSetReturnsExpectedResult(): void
{
- $administratorRepository = $this->getContainer()->get(AdministratorRepository::class);
+ $administratorRepository = $this->get(AdministratorRepository::class);
$query = $administratorRepository->createQuery();
$result = $query->matching($query->contains('usergroup', 1))
@@ -168,7 +168,7 @@ class QueryParserTest extends FunctionalTestCase
*/
public function queryForPostWithCategoriesReturnsPostWithCategories(): void
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$query = $postRepository->createQuery();
$post = $query->matching($query->equals('uid', 1))->execute()->current();
self::assertCount(3, $post->getCategories());
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
index b187176c0b44..bc8073e7f034 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
@@ -65,8 +65,8 @@ class RelationTest extends FunctionalTestCase
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/categories.csv');
$this->importCSVDataSet(__DIR__ . '/../Persistence/Fixtures/category-mm.csv');
- $this->persistentManager = $this->getContainer()->get(PersistenceManager::class);
- $this->blog = $this->getContainer()->get(BlogRepository::class)->findByUid(1);
+ $this->persistentManager = $this->get(PersistenceManager::class);
+ $this->blog = $this->get(BlogRepository::class)->findByUid(1);
$GLOBALS['BE_USER'] = new BackendUserAuthentication();
$GLOBALS['BE_USER']->workspace = 0;
@@ -429,7 +429,7 @@ class RelationTest extends FunctionalTestCase
$newTag = new Tag($newTagTitle);
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$post = $postRepository->findByUid(1);
$post->addTag($newTag);
@@ -477,7 +477,7 @@ class RelationTest extends FunctionalTestCase
->executeQuery()
->fetchOne();
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$post = $postRepository->findByUid(1);
$tags = $post->getTags();
$tagsArray = $tags->toArray();
@@ -554,7 +554,7 @@ class RelationTest extends FunctionalTestCase
->executeQuery()
->fetchOne();
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$post = $postRepository->findByUid(1);
$tags = clone $post->getTags();
$post->setTags(new ObjectStorage());
@@ -637,7 +637,7 @@ class RelationTest extends FunctionalTestCase
->fetchOne();
self::assertEquals(10, $countTags);
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$post = $postRepository->findByUid(1);
$tags = clone $post->getTags();
$counter = 1;
@@ -715,7 +715,7 @@ class RelationTest extends FunctionalTestCase
->fetchOne();
self::assertEquals(10, $countTags);
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$post = $postRepository->findByUid(1);
$tags = clone $post->getTags();
$tagsArray = $tags->toArray();
@@ -806,7 +806,7 @@ class RelationTest extends FunctionalTestCase
->executeQuery()
->fetchAssociative();
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$post = $postRepository->findByUid(1);
$post->setTitle('newTitle');
@@ -832,7 +832,7 @@ class RelationTest extends FunctionalTestCase
*/
public function mmRelationWithoutMatchFieldIsResolved(): void
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$posts = $postRepository->findByTagAndBlog('Tag2', $this->blog);
self::assertCount(1, $posts);
}
@@ -865,7 +865,7 @@ class RelationTest extends FunctionalTestCase
->fetchOne();
self::assertEquals(4, $countCategories);
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$post = $postRepository->findByUid(1);
self::assertCount(3, $post->getCategories());
}
@@ -877,7 +877,7 @@ class RelationTest extends FunctionalTestCase
*/
public function mmRelationWithMatchFieldIsResolvedFromForeignSide(): void
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$posts = $postRepository->findByCategory(1);
self::assertCount(2, $posts);
@@ -913,7 +913,7 @@ class RelationTest extends FunctionalTestCase
->fetchOne();
self::assertEquals(4, $countCategories);
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$post = $postRepository->findByUid(1);
$newCategory = new Category();
@@ -953,7 +953,7 @@ class RelationTest extends FunctionalTestCase
*/
public function adjustingMmRelationWithTablesnameAndFieldnameFieldDoNotTouchOtherRelations(): void
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$post = $postRepository->findByUid(1);
// Move category down
foreach ($post->getCategories() as $category) {
@@ -1124,7 +1124,7 @@ class RelationTest extends FunctionalTestCase
*/
protected function provideFindPostsByPublisherQuery(int $publisherId): QueryInterface
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$query = $postRepository->createQuery();
$query->matching(
$query->logicalOr(
@@ -1178,7 +1178,7 @@ class RelationTest extends FunctionalTestCase
*/
protected function provideFindBlogsByPostsSinceQuery(\DateTime $date): QueryInterface
{
- $blogRepository = $this->getContainer()->get(BlogRepository::class);
+ $blogRepository = $this->get(BlogRepository::class);
$query = $blogRepository->createQuery();
$query->matching(
$query->greaterThanOrEqual('posts.date', $date)
@@ -1225,7 +1225,7 @@ class RelationTest extends FunctionalTestCase
*/
protected function provideFindPersonsByTagNameQuery(string $tagName): QueryInterface
{
- $personRepository = $this->getContainer()->get(PersonRepository::class);
+ $personRepository = $this->get(PersonRepository::class);
$query = $personRepository->createQuery();
$query->matching(
$query->logicalOr(
@@ -1275,7 +1275,7 @@ class RelationTest extends FunctionalTestCase
*/
protected function provideFindPostsByAuthorTagName(string $tagName): QueryInterface
{
- $postRepository = $this->getContainer()->get(PostRepository::class);
+ $postRepository = $this->get(PostRepository::class);
$query = $postRepository->createQuery();
$query->matching(
$query->logicalOr(
@@ -1291,7 +1291,7 @@ class RelationTest extends FunctionalTestCase
*/
protected function updateAndPersistBlog(): void
{
- $blogRepository = $this->getContainer()->get(BlogRepository::class);
+ $blogRepository = $this->get(BlogRepository::class);
$blogRepository->update($this->blog);
$this->persistentManager->persistAll();
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedSiteContentTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedSiteContentTest.php
index 0337a1449440..931909716c49 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedSiteContentTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedSiteContentTest.php
@@ -65,7 +65,7 @@ class TranslatedSiteContentTest extends AbstractDataHandlerActionTestCase
$this->importCSVDataSet(__DIR__ . '/../../../../frontend/Tests/Functional/Rendering/DataSet/LiveDefaultPages.csv');
$this->importCSVDataSet(__DIR__ . '/../../../../frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv');
- $this->contentRepository = $this->getContainer()->get(TtContentRepository::class);
+ $this->contentRepository = $this->get(TtContentRepository::class);
$this->setUpFrontendRootPage(1, [
'typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/setup.typoscript',
'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/ContentJsonRenderer.typoscript',
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
index 63ea561d0430..37e0593cfa0f 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
@@ -65,11 +65,11 @@ class TranslationTest extends FunctionalTestCase
$this->setUpBasicFrontendEnvironment();
- $this->postRepository = $this->getContainer()->get(PostRepository::class);
+ $this->postRepository = $this->get(PostRepository::class);
// ConfigurationManager is used by PersistenceManager to retrieve configuration.
// We set a proper extensionName and pluginName for the ConfigurationManager singleton
// here, to not run into warnings due to incomplete test setup.
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration([
'extensionName' => 'blog_example',
'pluginName' => 'test',
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/WorkspaceTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/WorkspaceTest.php
index 0a562938ff78..efeceaa66c1f 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/WorkspaceTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/WorkspaceTest.php
@@ -254,11 +254,11 @@ class WorkspaceTest extends FunctionalTestCase
GeneralUtility::setSingletonInstance(Context::class, $context);
$GLOBALS['TYPO3_REQUEST'] = (new ServerRequest())
->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_FE);
- $this->blogRepository = $this->getContainer()->get(BlogRepository::class);
+ $this->blogRepository = $this->get(BlogRepository::class);
// ConfigurationManager is used by PersistenceManager to retrieve configuration.
// We set a proper extensionName and pluginName for the ConfigurationManager singleton
// here, to not run into warnings due to incomplete test setup.
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration([
'extensionName' => 'blog_example',
'pluginName' => 'test',
@@ -282,11 +282,11 @@ class WorkspaceTest extends FunctionalTestCase
GeneralUtility::setSingletonInstance(Context::class, $context);
$GLOBALS['TYPO3_REQUEST'] = (new ServerRequest())
->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_FE);
- $this->blogRepository = $this->getContainer()->get(BlogRepository::class);
+ $this->blogRepository = $this->get(BlogRepository::class);
// ConfigurationManager is used by PersistenceManager to retrieve configuration.
// We set a proper extensionName and pluginName for the ConfigurationManager singleton
// here, to not run into warnings due to incomplete test setup.
- $configurationManager = $this->getContainer()->get(ConfigurationManager::class);
+ $configurationManager = $this->get(ConfigurationManager::class);
$configurationManager->setConfiguration([
'extensionName' => 'blog_example',
'pluginName' => 'test',
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/PropertyMapperTest.php b/typo3/sysext/extbase/Tests/Functional/Property/PropertyMapperTest.php
index fa3577a78281..7b6f68ddd54f 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/PropertyMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/PropertyMapperTest.php
@@ -48,7 +48,7 @@ class PropertyMapperTest extends FunctionalTestCase
public function convertCreatesAPropertyMappingConfigurationIfNotGiven(): void
{
// This test just increases the test coverage
- $this->getContainer()->get(PropertyMapper::class)
+ $this->get(PropertyMapper::class)
->convert('string', 'string');
}
@@ -57,7 +57,7 @@ class PropertyMapperTest extends FunctionalTestCase
*/
public function convertReturnsNullIfDoMappingReturnsAnError(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
self::assertNull($propertyMapper->convert('string', 'integer'));
self::assertNotEmpty($propertyMapper->getMessages());
@@ -71,7 +71,7 @@ class PropertyMapperTest extends FunctionalTestCase
$this->expectException(TargetNotFoundException::class);
$this->expectExceptionCode(1297933823);
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapper->convert(9999, Blog::class);
}
@@ -84,7 +84,7 @@ class PropertyMapperTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": No converter found which can be used to convert from "integer" to "boolean"');
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapper->convert(9999, 'boolean');
}
@@ -97,7 +97,7 @@ class PropertyMapperTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": The target type was no string, but of type "NULL"');
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapper->convert(9999, null);
}
@@ -106,7 +106,7 @@ class PropertyMapperTest extends FunctionalTestCase
*/
public function convertInternallyConvertsANullSourceToAnEmptyString(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
self::assertSame('', $propertyMapper->convert(null, 'string'));
}
@@ -119,7 +119,7 @@ class PropertyMapperTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": Could not find a suitable type converter for "NonExistingClass" because no such class or interface exists.');
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapper->convert(1, 'NonExistingClass');
}
@@ -139,7 +139,7 @@ class PropertyMapperTest extends FunctionalTestCase
}
};
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapper->convert(1, get_class($counter));
}
@@ -150,7 +150,7 @@ class PropertyMapperTest extends FunctionalTestCase
{
$objectStorage = new ObjectStorage();
- $result = $this->getContainer()->get(PropertyMapper::class)->convert(
+ $result = $this->get(PropertyMapper::class)->convert(
$objectStorage,
'\TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Beuser\Domain\Model\BackendUser>'
);
@@ -173,7 +173,7 @@ class PropertyMapperTest extends FunctionalTestCase
$propertyMappingConfiguration = new PropertyMappingConfiguration();
$propertyMappingConfiguration->setTypeConverter($class);
- $result = $this->getContainer()->get(PropertyMapper::class)->convert(
+ $result = $this->get(PropertyMapper::class)->convert(
1,
'integer',
$propertyMappingConfiguration
@@ -195,7 +195,7 @@ class PropertyMapperTest extends FunctionalTestCase
return 'string';
};
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapper->convert($generator, 'string');
}
@@ -208,7 +208,7 @@ class PropertyMapperTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": No converter found which can be used to convert from "integer" to "ExtbaseTeam\TypeConverterTest\Domain\Model\Cat"');
- $result = $this->getContainer()->get(PropertyMapper::class)->convert(1, Cat::class);
+ $result = $this->get(PropertyMapper::class)->convert(1, Cat::class);
self::assertNull($result);
}
@@ -217,7 +217,7 @@ class PropertyMapperTest extends FunctionalTestCase
*/
public function findFirstEligibleTypeConverterInObjectHierarchyFindsConverterFromStringToObject(): void
{
- $result = $this->getContainer()->get(PropertyMapper::class)->convert('tigger', Cat::class);
+ $result = $this->get(PropertyMapper::class)->convert('tigger', Cat::class);
self::assertInstanceOf(Cat::class, $result);
}
@@ -226,7 +226,7 @@ class PropertyMapperTest extends FunctionalTestCase
*/
public function findFirstEligibleTypeConverterInObjectHierarchyReturnsConverterForParentClass(): void
{
- $result = $this->getContainer()->get(PropertyMapper::class)->convert('fluffy', Dog::class);
+ $result = $this->get(PropertyMapper::class)->convert('fluffy', Dog::class);
self::assertInstanceOf(Animal::class, $result);
}
@@ -235,7 +235,7 @@ class PropertyMapperTest extends FunctionalTestCase
*/
public function findFirstEligibleTypeConverterInObjectHierarchyReturnsConverterForInterfaces(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$result = $propertyMapper->convert(1, Countable::class);
self::assertSame([], $result);
@@ -253,7 +253,7 @@ class PropertyMapperTest extends FunctionalTestCase
$propertyMappingConfiguration = new PropertyMappingConfiguration();
$propertyMappingConfiguration->allowAllProperties();
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
/** @var Cat $result */
$result = $propertyMapper->convert(
$source,
@@ -277,7 +277,7 @@ class PropertyMapperTest extends FunctionalTestCase
$propertyMappingConfiguration = new PropertyMappingConfiguration();
$propertyMappingConfiguration->skipProperties('color');
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
/** @var Cat $result */
$result = $propertyMapper->convert(
$source,
@@ -305,7 +305,7 @@ class PropertyMapperTest extends FunctionalTestCase
$propertyMappingConfiguration = new PropertyMappingConfiguration();
$propertyMappingConfiguration->allowAllPropertiesExcept('color');
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapper->convert(
$source,
Cat::class,
@@ -326,7 +326,7 @@ class PropertyMapperTest extends FunctionalTestCase
$propertyMappingConfiguration->allowAllPropertiesExcept('color');
$propertyMappingConfiguration->skipUnknownProperties();
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
/** @var Cat $result */
$result = $propertyMapper->convert(
$source,
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ArrayConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ArrayConverterTest.php
index 15e9544d3d63..d7b9ef6cb9ff 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ArrayConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ArrayConverterTest.php
@@ -32,7 +32,7 @@ class ArrayConverterTest extends FunctionalTestCase
*/
public function convertToArray(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
self::assertSame([], $propertyMapper->convert([], 'array'));
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/BooleanConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/BooleanConverterTest.php
index 3101d57df375..3ada9b5617d6 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/BooleanConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/BooleanConverterTest.php
@@ -32,7 +32,7 @@ class BooleanConverterTest extends FunctionalTestCase
*/
public function convertToBoolean(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
self::assertTrue($propertyMapper->convert(true, 'boolean'));
self::assertFalse($propertyMapper->convert(false, 'boolean'));
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/DateTimeConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/DateTimeConverterTest.php
index 726942155bff..045d0a00e12a 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/DateTimeConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/DateTimeConverterTest.php
@@ -35,7 +35,7 @@ class DateTimeConverterTest extends FunctionalTestCase
*/
public function convertFromReturnsAnErrorWhenConvertingIntegersToDateTime(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(0, \DateTime::class);
self::assertNull($dateTime);
@@ -52,7 +52,7 @@ class DateTimeConverterTest extends FunctionalTestCase
*/
public function convertFromReturnsNullIfSourceIsAnEmptyString(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert('', \DateTime::class);
@@ -65,7 +65,7 @@ class DateTimeConverterTest extends FunctionalTestCase
*/
public function convertDefaultDateFormatString(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert('2019-12-07T19:07:02+00:00', \DateTime::class);
@@ -85,7 +85,7 @@ class DateTimeConverterTest extends FunctionalTestCase
\DateTimeInterface::RFC7231
);
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(
'Sat, 07 Dec 2019 19:15:45 GMT',
@@ -113,7 +113,7 @@ class DateTimeConverterTest extends FunctionalTestCase
[]
);
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapper->convert(
'Sat, 07 Dec 2019 19:15:45 GMT',
@@ -127,7 +127,7 @@ class DateTimeConverterTest extends FunctionalTestCase
*/
public function convertWithArraySourceWithStringDate(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(
[
@@ -152,7 +152,7 @@ class DateTimeConverterTest extends FunctionalTestCase
'U'
);
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(
[
@@ -178,7 +178,7 @@ class DateTimeConverterTest extends FunctionalTestCase
'Y-m-d'
);
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(
[
@@ -199,7 +199,7 @@ class DateTimeConverterTest extends FunctionalTestCase
*/
public function convertWithArraySourceWithDayMonthYearAndDateFormatSet(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(
[
@@ -220,7 +220,7 @@ class DateTimeConverterTest extends FunctionalTestCase
*/
public function convertWithArraySourceWithDayMonthYearHourMinuteAndSecondSet(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(
[
@@ -249,7 +249,7 @@ class DateTimeConverterTest extends FunctionalTestCase
// The timezone parameter and the current timezone are ignored when the time parameter
// either contains a UNIX timestamp (e.g. 946684800) or specifies a timezone (e.g. 2010-01-28T15:00:00+02:00).
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(
[
@@ -276,7 +276,7 @@ class DateTimeConverterTest extends FunctionalTestCase
'Y-m-d H:i:s'
);
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(
[
@@ -297,7 +297,7 @@ class DateTimeConverterTest extends FunctionalTestCase
*/
public function convertFromReturnsErrorIfSourceIsAnArrayAndEitherDayMonthOrYearAreLowerThanOne(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$dateTime = $propertyMapper->convert(
[
@@ -326,7 +326,7 @@ class DateTimeConverterTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": Could not convert the given source into a DateTime object because it was not an array with a valid date as a string');
- $this->getContainer()->get(PropertyMapper::class)->convert([], \DateTime::class);
+ $this->get(PropertyMapper::class)->convert([], \DateTime::class);
}
/**
@@ -345,7 +345,7 @@ class DateTimeConverterTest extends FunctionalTestCase
'Y-m-d H:i:s'
);
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapper->convert(
[
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/FileConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/FileConverterTest.php
index c84e6d6f871d..7de3b4b5e358 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/FileConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/FileConverterTest.php
@@ -35,7 +35,7 @@ class FileConverterTest extends FunctionalTestCase
$this->importCSVDataSet(__DIR__ . '/../Fixtures/DatabaseImports/sys_file.csv');
$this->importCSVDataSet(__DIR__ . '/../Fixtures/DatabaseImports/sys_file_storage.csv');
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
/** @var File $file */
$file = $propertyMapper->convert(
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/FloatConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/FloatConverterTest.php
index a125da613b77..a03e718ccaef 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/FloatConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/FloatConverterTest.php
@@ -32,7 +32,7 @@ class FloatConverterTest extends FunctionalTestCase
*/
public function convertToFloat(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
self::assertSame(10.1, $propertyMapper->convert(10.1, 'float'));
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/IntegerConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/IntegerConverterTest.php
index 3ee038be1702..8af37293b8bd 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/IntegerConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/IntegerConverterTest.php
@@ -32,7 +32,7 @@ class IntegerConverterTest extends FunctionalTestCase
*/
public function convertToInteger(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
self::assertSame(10, $propertyMapper->convert(10, 'integer'));
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php
index a75df10cbdaf..6f5a6c417289 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php
@@ -39,7 +39,7 @@ class ObjectConverterTest extends FunctionalTestCase
*/
public function convertToObject(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$model = new class() extends AbstractEntity {
/**
@@ -65,7 +65,7 @@ class ObjectConverterTest extends FunctionalTestCase
*/
public function convertToObjectViaTypeInArray(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
@@ -95,7 +95,7 @@ class ObjectConverterTest extends FunctionalTestCase
public $name;
};
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
$propertyMapperConfiguration
@@ -133,7 +133,7 @@ class ObjectConverterTest extends FunctionalTestCase
}
};
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
@@ -174,7 +174,7 @@ class ObjectConverterTest extends FunctionalTestCase
}
};
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
$propertyMapperConfiguration->forProperty('collection.*')->allowAllProperties();
@@ -208,7 +208,7 @@ class ObjectConverterTest extends FunctionalTestCase
}
};
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
@@ -236,7 +236,7 @@ class ObjectConverterTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": Type of child property "' . $propertyName . '" of class "' . $className . '" could not be derived from constructor arguments as said class does not have a constructor defined.');
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
@@ -265,7 +265,7 @@ class ObjectConverterTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": Type of child property "' . $propertyName . '" of class "' . $className . '" could not be derived from constructor arguments as the constructor of said class does not have a parameter with property name "' . $propertyName . '".');
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
@@ -294,7 +294,7 @@ class ObjectConverterTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": Type of child property "' . $propertyName . '" of class "' . $className . '" could not be derived from constructor argument "' . $propertyName . '". This usually happens if the argument misses a type hint.');
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
@@ -320,7 +320,7 @@ class ObjectConverterTest extends FunctionalTestCase
}
};
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
@@ -344,7 +344,7 @@ class ObjectConverterTest extends FunctionalTestCase
private $name;
};
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->allowAllProperties();
$propertyMapperConfiguration
@@ -378,7 +378,7 @@ class ObjectConverterTest extends FunctionalTestCase
}
};
- $result = $this->getContainer()->get(PropertyMapper::class)->convert(
+ $result = $this->get(PropertyMapper::class)->convert(
['name' => 'foo'],
get_class($class)
);
@@ -406,7 +406,7 @@ class ObjectConverterTest extends FunctionalTestCase
}
};
- $this->getContainer()->get(PropertyMapper::class)->convert(
+ $this->get(PropertyMapper::class)->convert(
['name' => 'foo'],
get_class($class)
);
@@ -424,7 +424,7 @@ class ObjectConverterTest extends FunctionalTestCase
$class = new class() {
};
- $this->getContainer()->get(PropertyMapper::class)->convert(
+ $this->get(PropertyMapper::class)->convert(
['__type' => Animal::class],
get_class($class)
);
@@ -450,7 +450,7 @@ class ObjectConverterTest extends FunctionalTestCase
true
);
- $this->getContainer()->get(PropertyMapper::class)->convert(
+ $this->get(PropertyMapper::class)->convert(
['__type' => Animal::class],
get_class($class),
$propertyMapperConfiguration
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectStorageConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectStorageConverterTest.php
index 2b6404bc02a3..0b9779188d47 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectStorageConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectStorageConverterTest.php
@@ -39,7 +39,7 @@ class ObjectStorageConverterTest extends FunctionalTestCase
$propertyMapperConfiguration->allowAllProperties();
$propertyMapperConfiguration->forProperty('foo')->allowAllProperties();
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$objectStorage = $propertyMapper->convert(
[
@@ -65,7 +65,7 @@ class ObjectStorageConverterTest extends FunctionalTestCase
$propertyMapperConfiguration = new PropertyMappingConfiguration();
$propertyMapperConfiguration->forProperty('foo')->allowAllProperties();
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$objectStorage = $propertyMapper->convert(
'foo',
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/PersistentObjectConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/PersistentObjectConverterTest.php
index d16d9809f24d..06dfd53b2370 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/PersistentObjectConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/PersistentObjectConverterTest.php
@@ -41,7 +41,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
*/
public function converterReturnsNullWithEmptyStringsOrIntegers(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
self::assertNull($propertyMapper->convert(0, BackendUser::class));
self::assertNull($propertyMapper->convert('', BackendUser::class));
@@ -56,7 +56,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": The identity property "foo" is no UID.');
- $this->getContainer()->get(PropertyMapper::class)->convert('foo', BackendUser::class);
+ $this->get(PropertyMapper::class)->convert('foo', BackendUser::class);
}
/**
@@ -68,7 +68,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
$this->expectExceptionCode(1297933823);
$this->expectExceptionMessage('Object of type TYPO3\CMS\Beuser\Domain\Model\BackendUser with identity "2" not found.');
- $this->getContainer()->get(PropertyMapper::class)->convert(2, BackendUser::class);
+ $this->get(PropertyMapper::class)->convert(2, BackendUser::class);
}
/**
@@ -76,7 +76,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
*/
public function converterFetchesObjectFromPersistenceIfSourceIsAnInteger(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$backendUser = $propertyMapper->convert(1, BackendUser::class);
@@ -89,7 +89,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
*/
public function converterFetchesObjectFromPersistenceIfSourceIsANumericString(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$backendUser = $propertyMapper->convert('1', BackendUser::class);
@@ -102,7 +102,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
*/
public function converterBuildsEmptyObjectIfSourceIsAnEmptyArray(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$backendUser = $propertyMapper->convert([], BackendUser::class);
@@ -115,7 +115,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
*/
public function converterFetchesObjectFromPersistenceIfSourceIsAnArrayWithIdentityKey(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$backendUser = $propertyMapper->convert(['__identity' => 1], BackendUser::class);
@@ -139,7 +139,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
false
);
- $this->getContainer()->get(PropertyMapper::class)->convert(
+ $this->get(PropertyMapper::class)->convert(
[],
BackendUser::class,
$propertyMapperConfiguration
@@ -151,7 +151,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
*/
public function converterRespectsAndSetsProperties(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
$backendUser = $propertyMapper->convert(['userName' => 'johndoe'], BackendUser::class);
@@ -169,7 +169,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": Property "nonExistant" was not found in target object of type "TYPO3\CMS\Beuser\Domain\Model\BackendUser".');
- $this->getContainer()->get(PropertyMapper::class)->convert(['nonExistant' => 'johndoe'], BackendUser::class);
+ $this->get(PropertyMapper::class)->convert(['nonExistant' => 'johndoe'], BackendUser::class);
}
/**
@@ -181,6 +181,6 @@ class PersistentObjectConverterTest extends FunctionalTestCase
$this->expectExceptionCode(1297759968);
$this->expectExceptionMessage('Exception while property mapping at property path "": Property "uid" having a value of type "int" could not be set in target object of type "TYPO3\CMS\Beuser\Domain\Model\BackendUser"');
- $this->getContainer()->get(PropertyMapper::class)->convert(['uid' => 7], BackendUser::class);
+ $this->get(PropertyMapper::class)->convert(['uid' => 7], BackendUser::class);
}
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/StringConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/StringConverterTest.php
index a6a6ac065951..d0acd4929130 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/StringConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/StringConverterTest.php
@@ -32,7 +32,7 @@ class StringConverterTest extends FunctionalTestCase
*/
public function convertToString(): void
{
- $propertyMapper = $this->getContainer()->get(PropertyMapper::class);
+ $propertyMapper = $this->get(PropertyMapper::class);
self::assertSame('string', $propertyMapper->convert('string', 'string'));
self::assertSame('10', $propertyMapper->convert(10, 'string'));
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/AlphanumericValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/AlphanumericValidatorTest.php
index c49f7fb69ea0..e1f55db2f529 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/AlphanumericValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/AlphanumericValidatorTest.php
@@ -26,7 +26,7 @@ class AlphanumericValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/BooleanValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/BooleanValidatorTest.php
index 513a8d689bb4..bc1b6d24f155 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/BooleanValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/BooleanValidatorTest.php
@@ -26,7 +26,7 @@ class BooleanValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
index 67c0e95ca38c..204829898e58 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/CollectionValidatorTest.php
@@ -35,7 +35,7 @@ class CollectionValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
@@ -43,7 +43,7 @@ class CollectionValidatorTest extends FunctionalTestCase
*/
public function collectionValidatorReturnsNoErrorsForANullValue(): void
{
- $subject = $this->getContainer()->get(CollectionValidator::class);
+ $subject = $this->get(CollectionValidator::class);
$subject->setOptions([]);
self::assertFalse($subject->validate(null)->hasErrors());
}
@@ -53,7 +53,7 @@ class CollectionValidatorTest extends FunctionalTestCase
*/
public function collectionValidatorFailsForAValueNotBeingACollection(): void
{
- $subject = $this->getContainer()->get(CollectionValidator::class);
+ $subject = $this->get(CollectionValidator::class);
$subject->setOptions([]);
self::assertTrue($subject->validate(new \stdClass())->hasErrors());
}
@@ -66,13 +66,13 @@ class CollectionValidatorTest extends FunctionalTestCase
$mockValidatorResolver = $this->getAccessibleMock(
ValidatorResolver::class,
['createValidator', 'buildBaseValidatorConjunction', 'getBaseValidatorConjunction'],
- [$this->getContainer()->get(ReflectionService::class)]
+ [$this->get(ReflectionService::class)]
);
/** @var ContainerBuilder $container */
$container = $this->getContainer();
$container->set(ValidatorResolver::class, $mockValidatorResolver);
/** @var CollectionValidator $subject */
- $subject = $this->getContainer()->get(CollectionValidator::class);
+ $subject = $this->get(CollectionValidator::class);
$subject->setOptions(['elementValidator' => 'EmailAddress']);
$emailAddressValidator = new EmailAddressValidator();
$emailAddressValidator->setOptions([]);
@@ -116,14 +116,14 @@ class CollectionValidatorTest extends FunctionalTestCase
$aValidator->setOptions([]);
/** @var CollectionValidator $subject */
- $subject = $this->getContainer()->get(CollectionValidator::class);
+ $subject = $this->get(CollectionValidator::class);
$subject->setOptions(['elementValidator' => 'Integer']);
$integerValidator = new IntegerValidator();
$integerValidator->setOptions([]);
$mockValidatorResolver = $this->getAccessibleMock(
ValidatorResolver::class,
['createValidator', 'buildBaseValidatorConjunction', 'getBaseValidatorConjunction'],
- [$this->getContainer()->get(ReflectionService::class)]
+ [$this->get(ReflectionService::class)]
);
$mockValidatorResolver
->method('createValidator')
@@ -151,11 +151,11 @@ class CollectionValidatorTest extends FunctionalTestCase
$mockValidatorResolver = $this->getAccessibleMock(
ValidatorResolver::class,
['createValidator', 'buildBaseValidatorConjunction', 'getBaseValidatorConjunction'],
- [$this->getContainer()->get(ReflectionService::class)]
+ [$this->get(ReflectionService::class)]
);
$mockValidatorResolver->expects(self::never())->method('createValidator');
/** @var CollectionValidator $subject */
- $subject = $this->getContainer()->get(CollectionValidator::class);
+ $subject = $this->get(CollectionValidator::class);
$subject->setOptions(['elementType' => $elementType]);
$subject->validate($objectStorage);
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/ConjunctionValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/ConjunctionValidatorTest.php
index c6d315599168..bf84e997277a 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/ConjunctionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/ConjunctionValidatorTest.php
@@ -33,7 +33,7 @@ class ConjunctionValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/DateTimeValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/DateTimeValidatorTest.php
index e43f5a1576e1..48a52099ebe2 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/DateTimeValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/DateTimeValidatorTest.php
@@ -26,7 +26,7 @@ class DateTimeValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
public function acceptsDateTimeValuesDataProvider(): array
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/EmailAddressValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/EmailAddressValidatorTest.php
index ba886b80f43f..6d18b7ce3a39 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/EmailAddressValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/EmailAddressValidatorTest.php
@@ -26,7 +26,7 @@ class EmailAddressValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/FloatValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/FloatValidatorTest.php
index 9bbbabca2c07..b92539d47a7a 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/FloatValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/FloatValidatorTest.php
@@ -26,7 +26,7 @@ class FloatValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
public function validFloats(): array
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/IntegerValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/IntegerValidatorTest.php
index ff89a7914b37..3ac50a5c1cb2 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/IntegerValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/IntegerValidatorTest.php
@@ -26,7 +26,7 @@ class IntegerValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NotEmptyValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NotEmptyValidatorTest.php
index fb2c5ab76559..1afef2e8e846 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NotEmptyValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NotEmptyValidatorTest.php
@@ -26,7 +26,7 @@ class NotEmptyValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NumberRangeValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NumberRangeValidatorTest.php
index 91efd2aa4664..c1cbc71a8688 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NumberRangeValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NumberRangeValidatorTest.php
@@ -26,7 +26,7 @@ class NumberRangeValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NumberValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NumberValidatorTest.php
index 78c5db47131c..bfcef106f8c2 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NumberValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/NumberValidatorTest.php
@@ -28,7 +28,7 @@ class NumberValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/RegularExpressionValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/RegularExpressionValidatorTest.php
index 477736de7a2a..c4267c2d99ad 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/RegularExpressionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/RegularExpressionValidatorTest.php
@@ -14,7 +14,7 @@ class RegularExpressionValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/StringLengthValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/StringLengthValidatorTest.php
index f255d88c8492..a388492c4b3a 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/StringLengthValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/StringLengthValidatorTest.php
@@ -27,7 +27,7 @@ class StringLengthValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/StringValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/StringValidatorTest.php
index 2b0edbaee35d..8183666fed59 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/StringValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/StringValidatorTest.php
@@ -26,7 +26,7 @@ class StringValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/TextValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/TextValidatorTest.php
index 66281c6ca8c0..d233e7b6f9ee 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/TextValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/TextValidatorTest.php
@@ -27,7 +27,7 @@ class TextValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
public function isValidDataProvider(): array
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/UrlValidatorTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/UrlValidatorTest.php
index 80f8730481d7..c5ea68f0b1fb 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/Validator/UrlValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/Validator/UrlValidatorTest.php
@@ -26,7 +26,7 @@ class UrlValidatorTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
public function urlDataProvider(): array
diff --git a/typo3/sysext/extbase/Tests/Functional/Validation/ValidatorResolverTest.php b/typo3/sysext/extbase/Tests/Functional/Validation/ValidatorResolverTest.php
index f6b96813d12c..9e25265b1a09 100644
--- a/typo3/sysext/extbase/Tests/Functional/Validation/ValidatorResolverTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Validation/ValidatorResolverTest.php
@@ -46,7 +46,7 @@ class ValidatorResolverTest extends FunctionalTestCase
*/
public function createValidatorSetsOptionsAndDependenciesAreInjected(): void
{
- $subject = $this->getContainer()->get(ValidatorResolver::class);
+ $subject = $this->get(ValidatorResolver::class);
$options = ['foo' => 'bar'];
/** @var CustomValidator $validator */
$validator = $subject->createValidator(CustomValidator::class, $options);
@@ -62,7 +62,7 @@ class ValidatorResolverTest extends FunctionalTestCase
$subject = $this->getAccessibleMock(
ValidatorResolver::class,
['dummy'],
- [$this->getContainer()->get(ReflectionService::class)]
+ [$this->get(ReflectionService::class)]
);
$subject->_call(
diff --git a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
index f817251dbd7d..9bbf2c0c2548 100644
--- a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
@@ -124,7 +124,7 @@ class EscapeChildrenRenderingStandaloneTest extends FunctionalTestCase
*/
public function renderingTest(string $viewHelperTemplate, string $expectedOutput): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($viewHelperTemplate);
$context->getViewHelperResolver()->addNamespace('ft', 'TYPO3Fluid\\FluidTest\\ViewHelpers');
$view = new TemplateView($context);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Labels/CshViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Labels/CshViewHelperTest.php
index c6698257f62d..1a3d3220a8b3 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Labels/CshViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Labels/CshViewHelperTest.php
@@ -86,7 +86,7 @@ class CshViewHelperTest extends FunctionalTestCase
*/
public function isRendered(string $source, array $variables, string $expectation): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($source);
$view = new TemplateView($context);
$view->getRenderingContext()->getCache()->flush();
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/LinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/LinkViewHelperTest.php
index 25a62342ba7d..7b91379e1275 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/LinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/LinkViewHelperTest.php
@@ -42,7 +42,7 @@ class LinkViewHelperTest extends FunctionalTestCase
->with('theRouteArgument', ['parameter' => 'to pass'], 'theReferenceTypeArgument')->willReturn('theUri');
GeneralUtility::setSingletonInstance(UriBuilder::class, $uriBuilderMock);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(
'<f:be.link route="theRouteArgument" parameters="{parameter: \'to pass\'}" referenceType="theReferenceTypeArgument">foo</f:be.link>'
);
@@ -60,7 +60,7 @@ class LinkViewHelperTest extends FunctionalTestCase
->with('theRouteArgument', [], 'theReferenceTypeArgument')->willReturn('theUri');
GeneralUtility::setSingletonInstance(UriBuilder::class, $uriBuilderMock);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(
'<f:be.link route="theRouteArgument" referenceType="theReferenceTypeArgument">foo</f:be.link>'
);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Menus/ActionMenuItemViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Menus/ActionMenuItemViewHelperTest.php
index 0a629d66dccf..ee597d2c00d3 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Menus/ActionMenuItemViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Menus/ActionMenuItemViewHelperTest.php
@@ -67,7 +67,7 @@ class ActionMenuItemViewHelperTest extends FunctionalTestCase
*/
public function isRendered(string $source, array $variables, string $expectation): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($source);
$context->setRequest(new Request());
$view = new TemplateView($context);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Security/IfAuthenticatedViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Security/IfAuthenticatedViewHelperTest.php
index 51d25dfab963..756c5d36ffd5 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Security/IfAuthenticatedViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Security/IfAuthenticatedViewHelperTest.php
@@ -35,7 +35,7 @@ class IfAuthenticatedViewHelperTest extends FunctionalTestCase
{
$GLOBALS['BE_USER'] = new \stdClass();
$GLOBALS['BE_USER']->user = ['uid' => 1];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(
'<f:be.security.ifAuthenticated><f:then>then child</f:then><f:else>else child</f:else></f:be.security.ifAuthenticated>'
);
@@ -49,7 +49,7 @@ class IfAuthenticatedViewHelperTest extends FunctionalTestCase
{
$GLOBALS['BE_USER'] = new \stdClass();
$GLOBALS['BE_USER']->user = ['uid' => 0];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(
'<f:be.security.ifAuthenticated><f:then>then child</f:then><f:else>else child</f:else></f:be.security.ifAuthenticated>'
);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Security/IfHasRoleViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Security/IfHasRoleViewHelperTest.php
index b80baaa79ddc..41ff8aaa41da 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Security/IfHasRoleViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/Security/IfHasRoleViewHelperTest.php
@@ -49,7 +49,7 @@ class IfHasRoleViewHelperTest extends FunctionalTestCase
*/
public function viewHelperRendersThenChildIfBeUserWithSpecifiedRoleIsLoggedIn(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(
'<f:be.security.ifHasRole role="1"><f:then>then child</f:then><f:else>else child</f:else></f:be.security.ifHasRole>'
);
@@ -61,7 +61,7 @@ class IfHasRoleViewHelperTest extends FunctionalTestCase
*/
public function viewHelperRendersElseChildIfBeUserWithSpecifiedRoleIsNotLoggedIn(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(
'<f:be.security.ifHasRole role="NonExistingRole"><f:then>then child</f:then><f:else>else child</f:else></f:be.security.ifHasRole>'
);
@@ -73,7 +73,7 @@ class IfHasRoleViewHelperTest extends FunctionalTestCase
*/
public function viewHelperRendersElseChildIfBeUserWithSpecifiedRoleIdIsNotLoggedIn(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(
'<f:be.security.ifHasRole role="123"><f:then>then child</f:then><f:else>else child</f:else></f:be.security.ifHasRole>'
);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/UriViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/UriViewHelperTest.php
index fdf17b2f7877..1153db17e5d9 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/UriViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Be/UriViewHelperTest.php
@@ -42,7 +42,7 @@ class UriViewHelperTest extends FunctionalTestCase
->with('theRouteArgument', ['parameter' => 'to pass'], 'theReferenceTypeArgument')->willReturn('theUri');
GeneralUtility::setSingletonInstance(UriBuilder::class, $uriBuilderMock);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(
'<f:be.uri route="theRouteArgument" parameters="{parameter: \'to pass\'}" referenceType="theReferenceTypeArgument">foo</f:be.uri>'
);
@@ -60,7 +60,7 @@ class UriViewHelperTest extends FunctionalTestCase
->with('theRouteArgument', [], 'theReferenceTypeArgument')->willReturn('theUri');
GeneralUtility::setSingletonInstance(UriBuilder::class, $uriBuilderMock);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:be.uri route="theRouteArgument" referenceType="theReferenceTypeArgument">foo</f:be.uri>');
self::assertEquals('theUri', (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/FlashMessagesViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/FlashMessagesViewHelperTest.php
index 983b0110e6a2..65b5b28319c4 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/FlashMessagesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/FlashMessagesViewHelperTest.php
@@ -32,7 +32,7 @@ class FlashMessagesViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsEmptyStringIfNoFlashMessagesAreInQueue(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:flashMessages />');
$context->setRequest(new Request());
self::assertEmpty((new TemplateView($context))->render());
@@ -43,7 +43,7 @@ class FlashMessagesViewHelperTest extends FunctionalTestCase
*/
public function renderReturnsEmptyStringFromSpecificEmptyQueue(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:flashMessages queueIdentifier="myQueue" />');
self::assertEmpty((new TemplateView($context))->render());
}
@@ -56,7 +56,7 @@ class FlashMessagesViewHelperTest extends FunctionalTestCase
$this->setUpBackendUserFromFixture(1);
$flashMessage = new FlashMessage('test message body', 'test message title', AbstractMessage::OK, true);
(new FlashMessageQueue('myQueue'))->addMessage($flashMessage);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:flashMessages queueIdentifier="myQueue" />');
// CLI message renderer kicks in with this functional test setup, so no HTML output here.
self::assertSame('[SUCCESS] test message title: test message body', (new TemplateView($context))->render());
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/ButtonViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/ButtonViewHelperTest.php
index 01199feb37f7..db032dfcf26c 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/ButtonViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/ButtonViewHelperTest.php
@@ -33,7 +33,7 @@ class ButtonViewHelperTest extends FunctionalTestCase
*/
public function renderCorrectlySetsTagNameAndDefaultAttributes(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.button type="submit">Button Content</f:form.button>');
self::assertSame('<button type="submit" name="" value="">Button Content</button>', (new TemplateView($context))->render());
}
@@ -43,7 +43,7 @@ class ButtonViewHelperTest extends FunctionalTestCase
*/
public function closingTagIsEnforcedOnEmptyContent(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.button type="reset"></f:form.button>');
self::assertSame('<button type="reset" name="" value=""></button>', (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/CheckboxViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/CheckboxViewHelperTest.php
index da92d794c782..76f54cddba56 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/CheckboxViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/CheckboxViewHelperTest.php
@@ -48,7 +48,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
$context->setRequest(new Request());
self::assertSame($expected, (new TemplateView($context))->render());
@@ -61,7 +61,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = false;
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="foo" property="someProperty" checked="true" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -76,7 +76,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = true;
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="foo" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -91,7 +91,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = [];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="foo" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -106,7 +106,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = ['foo'];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="foo" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -120,7 +120,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
public function renderSetsCheckedAttributeIfCheckboxIsBoundToAPropertyOfTypeArrayObject(): void
{
$formObject = new \ArrayObject(['someProperty' => true]);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="bar" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -135,7 +135,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = 'bar';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="foo" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -150,7 +150,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = null;
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="foo" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -174,7 +174,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
$extbaseRequest = new Request($psr7Request);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="foo" property="someProperty" errorClass="myError" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
@@ -199,7 +199,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
$extbaseRequest = new Request($psr7Request);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="foo" property="someProperty" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
@@ -224,7 +224,7 @@ class CheckboxViewHelperTest extends FunctionalTestCase
$extbaseRequest = new Request($psr7Request);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.checkbox value="foo" property="someProperty" class="css_class" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/HiddenViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/HiddenViewHelperTest.php
index b0f41b048c2d..f9ef50d1dd8b 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/HiddenViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/HiddenViewHelperTest.php
@@ -34,7 +34,7 @@ class HiddenViewHelperTest extends FunctionalTestCase
*/
public function renderCorrectlySetsTagNameAndDefaultAttributes(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.hidden name="foo" value="bar" />');
$context->setRequest(new Request());
self::assertSame('<input type="hidden" name="foo" value="bar" />', (new TemplateView($context))->render());
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/PasswordViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/PasswordViewHelperTest.php
index 43043f98fa44..0be15c4214b9 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/PasswordViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/PasswordViewHelperTest.php
@@ -34,7 +34,7 @@ class PasswordViewHelperTest extends FunctionalTestCase
*/
public function renderCorrectlySetsTagName(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.password />');
$context->setRequest(new Request());
self::assertSame('<input type="password" name="" value="" />', (new TemplateView($context))->render());
@@ -45,7 +45,7 @@ class PasswordViewHelperTest extends FunctionalTestCase
*/
public function renderCorrectlySetsTypeNameAndValueAttributes(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.password name="NameOfTextbox" value="Current value" />');
$context->setRequest(new Request());
self::assertSame('<input type="password" name="NameOfTextbox" value="Current value" />', (new TemplateView($context))->render());
@@ -56,7 +56,7 @@ class PasswordViewHelperTest extends FunctionalTestCase
*/
public function renderCorrectlySetsAutocompleteTagAttribute(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.password name="myNewPassword" value="" autocomplete="new-password" />');
$context->setRequest(new Request());
self::assertSame('<input autocomplete="new-password" type="password" name="myNewPassword" value="" />', (new TemplateView($context))->render());
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/RadioViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/RadioViewHelperTest.php
index 634557ee16c9..0ef275a108d8 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/RadioViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/RadioViewHelperTest.php
@@ -48,7 +48,7 @@ class RadioViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
$context->setRequest(new Request());
self::assertSame($expected, (new TemplateView($context))->render());
@@ -61,7 +61,7 @@ class RadioViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = false;
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.radio value="foo" property="someProperty" checked="true" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -76,7 +76,7 @@ class RadioViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = true;
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.radio value="foo" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -91,7 +91,7 @@ class RadioViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = [];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.radio value="foo" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -106,7 +106,7 @@ class RadioViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = '';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.radio value="foo" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -121,7 +121,7 @@ class RadioViewHelperTest extends FunctionalTestCase
{
$formObject = new \stdClass();
$formObject->someProperty = null;
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.radio value="foo" property="someProperty" /></f:form>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -145,7 +145,7 @@ class RadioViewHelperTest extends FunctionalTestCase
$extbaseRequest = new Request($psr7Request);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.radio value="foo" property="someProperty" errorClass="myError" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
@@ -169,7 +169,7 @@ class RadioViewHelperTest extends FunctionalTestCase
$extbaseRequest = new Request($psr7Request);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.radio value="foo" property="someProperty" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
@@ -192,7 +192,7 @@ class RadioViewHelperTest extends FunctionalTestCase
$extbaseRequest = new Request($psr7Request);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.radio value="foo" property="someProperty" class="myClass" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/Select/OptionViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/Select/OptionViewHelperTest.php
index f2fe70d24f92..df77506664d8 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/Select/OptionViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/Select/OptionViewHelperTest.php
@@ -34,7 +34,7 @@ class OptionViewHelperTest extends FunctionalTestCase
*/
public function optionTagNameIsSet(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select.option />');
$context->setRequest(new Request());
self::assertSame('<option selected="selected" value="" />', (new TemplateView($context))->render());
@@ -45,7 +45,7 @@ class OptionViewHelperTest extends FunctionalTestCase
*/
public function childrenContentIsUsedAsValueAndLabelByDefault(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select.option>Option Label</f:form.select.option>');
$context->setRequest(new Request());
self::assertSame('<option value="Option Label">Option Label</option>', (new TemplateView($context))->render());
@@ -56,7 +56,7 @@ class OptionViewHelperTest extends FunctionalTestCase
*/
public function valueCanBeOverwrittenByArgument(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select.option value="value">Option Label</f:form.select.option>');
$context->setRequest(new Request());
self::assertSame('<option value="value">Option Label</option>', (new TemplateView($context))->render());
@@ -67,7 +67,7 @@ class OptionViewHelperTest extends FunctionalTestCase
*/
public function selectedIsAddedToSelectedOptionForNoSelectionOverride(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="" value="Option Label"><f:form.select.option>Option Label</f:form.select.option></f:form.select>');
$context->setRequest(new Request());
self::assertSame('<select name=""><option selected="selected" value="Option Label">Option Label</option></select>', (new TemplateView($context))->render());
@@ -106,7 +106,7 @@ class OptionViewHelperTest extends FunctionalTestCase
*/
public function selectedIsAddedToSelectedOptionForProvidedValue($value, $selected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="" value="{selected}"><f:form.select.option value="{value}">Option Label</f:form.select.option></f:form.select>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -123,7 +123,7 @@ class OptionViewHelperTest extends FunctionalTestCase
*/
public function selectedIsNotAddedToUnselectedOptionForNoSelectionOverride(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="" value=""><f:form.select.option>Option Label</f:form.select.option></f:form.select>');
$context->setRequest(new Request());
self::assertSame('<select name=""><option value="Option Label">Option Label</option></select>', (new TemplateView($context))->render());
@@ -157,7 +157,7 @@ class OptionViewHelperTest extends FunctionalTestCase
*/
public function selectedIsNotAddedToSelectedOptionForProvidedValue($value, $selected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="" value="{selected}"><f:form.select.option value="{value}">Option Label</f:form.select.option></f:form.select>');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -174,7 +174,7 @@ class OptionViewHelperTest extends FunctionalTestCase
*/
public function selectedIsNotAddedToOptionForExplicitOverride(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="" value="Option Label"><f:form.select.option selected="false">Option Label</f:form.select.option></f:form.select>');
$context->setRequest(new Request());
$expected = '<select name=""><option value="Option Label">Option Label</option></select>';
@@ -186,7 +186,7 @@ class OptionViewHelperTest extends FunctionalTestCase
*/
public function selectedIsAddedToOptionForExplicitOverride(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="" value="Option Label"><f:form.select.option selected="true">Option Label</f:form.select.option></f:form.select>');
$context->setRequest(new Request());
$expected = '<select name=""><option selected="selected" value="Option Label">Option Label</option></select>';
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
index c491d482dfa5..0a7ed8f11718 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SelectViewHelperTest.php
@@ -39,7 +39,7 @@ class SelectViewHelperTest extends FunctionalTestCase
*/
public function selectCorrectlySetsTagName(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select />');
$context->setRequest(new Request());
self::assertSame('<select name=""></select>', (new TemplateView($context))->render());
@@ -50,7 +50,7 @@ class SelectViewHelperTest extends FunctionalTestCase
*/
public function selectCreatesExpectedOptions(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="myName" value="value2" options="{value1: \"label1\", value2: \"label2\"}" />');
$context->setRequest(new Request());
$expected = '<select name="myName"><option value="value1">label1</option>' . chr(10) . '<option value="value2" selected="selected">label2</option>' . chr(10) . '</select>';
@@ -62,7 +62,7 @@ class SelectViewHelperTest extends FunctionalTestCase
*/
public function selectShouldSetTheRequiredAttribute(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="myName" required="true" value="value2" options="{value1: \"label1\", value2: \"label2\"}" />');
$context->setRequest(new Request());
$expected = '<select required="required" name="myName"><option value="value1">label1</option>' . chr(10) . '<option value="value2" selected="selected">label2</option>' . chr(10) . '</select>';
@@ -90,7 +90,7 @@ class SelectViewHelperTest extends FunctionalTestCase
'uid' => '2',
],
];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="myName" optionValueField="uid" optionLabelField="title" sortByOptionLabel="true" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -126,7 +126,7 @@ EOT;
$options = [$obj1, $obj2, $obj3, $obj4];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="myName" optionValueField="uid" optionLabelField="title" sortByOptionLabel="true" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -162,7 +162,7 @@ EOT;
'uid' => '2',
],
]);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="myName" optionValueField="uid" optionLabelField="title" sortByOptionLabel="true" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -187,7 +187,7 @@ EOT;
'value1' => 'label1',
'value2' => 'label2',
];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="myName" value="value2" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -211,7 +211,7 @@ EOT;
'value1' => 'label1',
'value2' => 'label2',
];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="myName" sortByOptionLabel="true" value="value2" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -236,7 +236,7 @@ EOT;
'value3' => 'label3',
];
$value = ['value3', 'value1'];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select multiple="true" name="myName" value="{value}" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -257,7 +257,7 @@ EOT;
public function multipleSelectWithoutOptionsCreatesExpectedOptions(): void
{
$value = ['value3', 'value1'];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select multiple="true" name="myName" value="{value}" options="{}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -279,7 +279,7 @@ EOT;
$user_sk,
$user_rl,
];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select name="myName" optionValueField="id" optionLabelField="firstName" value="{value}" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -307,7 +307,7 @@ EOT;
$user_sk,
$user_rl,
];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select multiple="true" name="myName" optionValueField="id" optionLabelField="firstName" value="{value}" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -463,7 +463,7 @@ EOT;
GeneralUtility::addInstance(Request::class, $extbaseRequest);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.select property="someProperty" errorClass="myError" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
@@ -482,7 +482,7 @@ EOT;
'value2' => 'label2',
'value3' => 'label3',
];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select multiple="true" selectAllByDefault="true" name="myName" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -506,7 +506,7 @@ EOT;
'value2' => 'label2',
'value3' => 'label3',
];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select multiple="true" value="{value}" selectAllByDefault="true" name="myName" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -531,7 +531,7 @@ EOT;
'value2' => 'label2',
'value3' => 'label3',
];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select prependOptionLabel="please choose" name="myName" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -557,7 +557,7 @@ EOT;
'value2' => 'label2',
'value3' => 'label3',
];
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.select prependOptionLabel="please choose" prependOptionValue="-1" name="myName" options="{options}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SubmitViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SubmitViewHelperTest.php
index 706c9d9834c1..a7eaf2807d8e 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SubmitViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/SubmitViewHelperTest.php
@@ -34,7 +34,7 @@ class SubmitViewHelperTest extends FunctionalTestCase
*/
public function renderCorrectlySetsTagNameAndDefaultAttributes(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.submit value="foo" name="bar" />');
$context->setRequest(new Request());
self::assertSame('<input type="submit" value="foo" name="bar" />', (new TemplateView($context))->render());
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/TextareaViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/TextareaViewHelperTest.php
index 6244d69f9cc1..14e0110d8044 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/TextareaViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/TextareaViewHelperTest.php
@@ -64,7 +64,7 @@ class TextareaViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
$context->setRequest(new Request());
self::assertSame($expected, (new TemplateView($context))->render());
@@ -86,7 +86,7 @@ class TextareaViewHelperTest extends FunctionalTestCase
$extbaseRequest = new Request($psr7Request);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.textarea property="someProperty" errorClass="myError" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/TextfieldViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/TextfieldViewHelperTest.php
index cde4e78c9a49..428908a699f0 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/TextfieldViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/TextfieldViewHelperTest.php
@@ -56,7 +56,7 @@ class TextfieldViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
$context->setRequest(new Request());
self::assertSame($expected, (new TemplateView($context))->render());
@@ -78,7 +78,7 @@ class TextfieldViewHelperTest extends FunctionalTestCase
$extbaseRequest = new Request($psr7Request);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.textfield property="someProperty" errorClass="myError" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/UploadViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/UploadViewHelperTest.php
index 2a3bbeab993f..7c0ece476138 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/UploadViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Form/UploadViewHelperTest.php
@@ -33,7 +33,7 @@ class UploadViewHelperTest extends FunctionalTestCase
*/
public function renderCorrectlySetsTagName(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.upload />');
$context->setRequest(new Request());
self::assertSame('<input type="file" name="" />', (new TemplateView($context))->render());
@@ -44,7 +44,7 @@ class UploadViewHelperTest extends FunctionalTestCase
*/
public function renderCorrectlySetsTypeNameAttributes(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.upload name="someName" />');
$context->setRequest(new Request());
self::assertSame('<input type="file" name="someName" />', (new TemplateView($context))->render());
@@ -55,7 +55,7 @@ class UploadViewHelperTest extends FunctionalTestCase
*/
public function renderSetsAttributeNameAsArrayIfMultipleIsGiven(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.upload multiple="multiple" name="someName" />');
$context->setRequest(new Request());
self::assertSame('<input multiple="multiple" type="file" name="someName[]" />', (new TemplateView($context))->render());
@@ -66,7 +66,7 @@ class UploadViewHelperTest extends FunctionalTestCase
*/
public function renderCorrectlySetsAcceptAttribute(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form.upload accept=".jpg,.png" />');
$context->setRequest(new Request());
self::assertSame('<input accept=".jpg,.png" type="file" name="" />', (new TemplateView($context))->render());
@@ -88,7 +88,7 @@ class UploadViewHelperTest extends FunctionalTestCase
$extbaseRequest = new Request($psr7Request);
$formObject = new \stdClass();
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form object="{formObject}" fieldNamePrefix="myFieldPrefix" objectName="myObjectName"><f:form.upload property="someProperty" errorClass="myError" /></f:form>');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/FormViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/FormViewHelperTest.php
index f9128f367bf7..304c0fcbccc8 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/FormViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/FormViewHelperTest.php
@@ -59,7 +59,7 @@ class FormViewHelperTest extends FunctionalTestCase
*/
public function isRendered(string $source, array $variables, string $expectation): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($source);
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -79,7 +79,7 @@ class FormViewHelperTest extends FunctionalTestCase
{
$extendsAbstractEntity = new ExtendsAbstractEntity();
$extendsAbstractEntity->_setProperty('uid', 123);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form fieldNamePrefix="prefix" objectName="myObjectName" object="{object}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -93,7 +93,7 @@ class FormViewHelperTest extends FunctionalTestCase
*/
public function setFormActionUriRespectsOverriddenArgument(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form actionUri="foobar" />');
$context->setRequest(new Request());
$expected = '<form action="foobar" method="post">';
@@ -107,7 +107,7 @@ class FormViewHelperTest extends FunctionalTestCase
{
$extendsAbstractEntity = new ExtendsAbstractEntity();
$extendsAbstractEntity->_setProperty('uid', 123);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form name="formName" fieldNamePrefix="prefix" object="{object}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -123,7 +123,7 @@ class FormViewHelperTest extends FunctionalTestCase
{
$extendsAbstractEntity = new ExtendsAbstractEntity();
$extendsAbstractEntity->_setProperty('uid', 123);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form name="formName" fieldNamePrefix="prefix" objectName="myObjectName" object="{object}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -139,7 +139,7 @@ class FormViewHelperTest extends FunctionalTestCase
{
$extendsAbstractEntity = new ExtendsAbstractEntity();
$extendsAbstractEntity->_setProperty('uid', 123);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form fieldNamePrefix="prefix" objectName="myObjectName" object="{object}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -155,7 +155,7 @@ class FormViewHelperTest extends FunctionalTestCase
{
$extendsAbstractEntity = new ExtendsAbstractEntity();
$extendsAbstractEntity->_setProperty('uid', 123);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form hiddenFieldClassName="hidden" fieldNamePrefix="prefix" objectName="myObjectName" object="{object}" />');
$context->setRequest(new Request());
$view = new TemplateView($context);
@@ -178,7 +178,7 @@ class FormViewHelperTest extends FunctionalTestCase
$extendsAbstractEntity = new ExtendsAbstractEntity();
$extendsAbstractEntity->_setProperty('uid', 123);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:form fieldNamePrefix="prefix" objectName="myObjectName" object="{object}" />');
$context->setRequest($extbaseRequest);
$view = new TemplateView($context);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/BytesViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/BytesViewHelperTest.php
index 03d48161d365..6d7920c94847 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/BytesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/BytesViewHelperTest.php
@@ -86,7 +86,7 @@ class BytesViewHelperTest extends FunctionalTestCase
*/
public function renderConvertsAValue(string $src, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($src);
self::assertSame($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CaseViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CaseViewHelperTest.php
index c0893470c0df..6a6ff021842f 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CaseViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CaseViewHelperTest.php
@@ -85,7 +85,7 @@ class CaseViewHelperTest extends FunctionalTestCase
*/
public function renderConvertsAValue(string $src, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($src);
self::assertSame($expected, (new TemplateView($context))->render());
}
@@ -97,7 +97,7 @@ class CaseViewHelperTest extends FunctionalTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionCode(1358349150);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.case value="foo" mode="invalid" />');
(new TemplateView($context))->render();
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CropViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CropViewHelperTest.php
index a2992545924d..1185b73f327c 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CropViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CropViewHelperTest.php
@@ -60,7 +60,7 @@ class CropViewHelperTest extends FunctionalTestCase
*/
public function renderConvertsAValue(string $src, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($src);
self::assertSame($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php
index bdfc6d08e947..1a20f41767c6 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php
@@ -100,7 +100,7 @@ class CurrencyViewHelperTest extends FunctionalTestCase
*/
public function renderConvertsAValue(string $src, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($src);
self::assertSame($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/DateViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/DateViewHelperTest.php
index bbd225c72ce5..8ba4bd4d56ed 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/DateViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/DateViewHelperTest.php
@@ -52,7 +52,7 @@ class DateViewHelperTest extends FunctionalTestCase
*/
public function viewHelperFormatsDateCorrectly(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date date="1980-12-13"></f:format.date>');
self::assertSame('1980-12-13', (new TemplateView($context))->render());
}
@@ -62,7 +62,7 @@ class DateViewHelperTest extends FunctionalTestCase
*/
public function viewHelperRespectsCustomFormat(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date format="d.m.Y">1980-02-01</f:format.date>');
self::assertSame('01.02.1980', (new TemplateView($context))->render());
}
@@ -72,7 +72,7 @@ class DateViewHelperTest extends FunctionalTestCase
*/
public function viewHelperReturnsEmptyStringIfChildrenIsEmpty(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date></f:format.date>');
self::assertSame('', (new TemplateView($context))->render());
}
@@ -82,7 +82,7 @@ class DateViewHelperTest extends FunctionalTestCase
*/
public function viewHelperReturnsCurrentDateIfEmptyStringIsGiven(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date date=""></f:format.date>');
self::assertSame(date('Y-m-d', $GLOBALS['EXEC_TIME']), (new TemplateView($context))->render());
}
@@ -93,7 +93,7 @@ class DateViewHelperTest extends FunctionalTestCase
public function viewHelperUsesDefaultIfNoSystemFormatIsAvailable(): void
{
$GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] = '';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date>@1391876733</f:format.date>');
self::assertSame('2014-02-08', (new TemplateView($context))->render());
}
@@ -104,7 +104,7 @@ class DateViewHelperTest extends FunctionalTestCase
public function viewHelperUsesSystemFormat(): void
{
$GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] = 'l, j. M y';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date>@1391876733</f:format.date>');
self::assertSame('Saturday, 8. Feb 14', (new TemplateView($context))->render());
}
@@ -116,7 +116,7 @@ class DateViewHelperTest extends FunctionalTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionCode(1241722579);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date>foo</f:format.date>');
(new TemplateView($context))->render();
}
@@ -126,7 +126,7 @@ class DateViewHelperTest extends FunctionalTestCase
*/
public function viewHelperUsesChildNodesWithTimestamp(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date>1359891658</f:format.date>');
self::assertEquals('2013-02-03', (new TemplateView($context))->render());
}
@@ -136,7 +136,7 @@ class DateViewHelperTest extends FunctionalTestCase
*/
public function dateArgumentHasPriorityOverChildNodes(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date date="1980-12-12">1359891658</f:format.date>');
self::assertEquals('1980-12-12', (new TemplateView($context))->render());
}
@@ -146,7 +146,7 @@ class DateViewHelperTest extends FunctionalTestCase
*/
public function relativeDateCalculationWorksWithoutBase(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date date="now" format="Y"/>');
self::assertEquals(date('Y'), (new TemplateView($context))->render());
}
@@ -156,7 +156,7 @@ class DateViewHelperTest extends FunctionalTestCase
*/
public function baseArgumentIsConsideredForRelativeDate(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date date="-1 year" base="2017-01-01" format="Y"/>');
self::assertEquals('2016', (new TemplateView($context))->render());
}
@@ -166,7 +166,7 @@ class DateViewHelperTest extends FunctionalTestCase
*/
public function baseArgumentDoesNotAffectAbsoluteTime(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date date="@1435784732" base="1485907200" format="Y"/>');
self::assertEquals('2015', (new TemplateView($context))->render());
}
@@ -193,7 +193,7 @@ class DateViewHelperTest extends FunctionalTestCase
{
date_default_timezone_set($timezone);
$date = 1359891658; // 2013-02-03 11:40 UTC
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date date="' . $date . '" format="Y-m-d H:i"/>');
self::assertEquals($expected, (new TemplateView($context))->render());
}
@@ -231,7 +231,7 @@ class DateViewHelperTest extends FunctionalTestCase
public function viewHelperRespectsDefaultTimezoneForStringTimestamp(string $timeZone, string $date, string $expected): void
{
date_default_timezone_set($timeZone);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.date date="' . $date . '" format="Y-m-d H:i"/>');
self::assertEquals($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
index 2c6ae462e608..ed6ed608d667 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
@@ -33,7 +33,7 @@ class HtmlentitiesDecodeViewHelperTest extends FunctionalTestCase
*/
public function renderUsesValueAsSourceIfSpecified(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentitiesDecode value="Some string" />');
self::assertEquals('Some string', (new TemplateView($context))->render());
}
@@ -43,7 +43,7 @@ class HtmlentitiesDecodeViewHelperTest extends FunctionalTestCase
*/
public function renderUsesChildnodesAsSourceIfSpecified(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentitiesDecode>Some string</f:format.htmlentitiesDecode>');
self::assertEquals('Some string', (new TemplateView($context))->render());
}
@@ -54,7 +54,7 @@ class HtmlentitiesDecodeViewHelperTest extends FunctionalTestCase
public function renderDoesNotModifyValueIfItDoesNotContainSpecialCharacters(): void
{
$source = 'This is a sample text without special characters. <> &©"\'';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentitiesDecode>' . $source . '</f:format.htmlentitiesDecode>');
self::assertEquals($source, (new TemplateView($context))->render());
}
@@ -66,7 +66,7 @@ class HtmlentitiesDecodeViewHelperTest extends FunctionalTestCase
{
$source = 'Some special characters: & " \' < > *';
$expectedResult = 'Some special characters: & " \' < > *';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentitiesDecode>' . $source . '</f:format.htmlentitiesDecode>');
self::assertEquals($expectedResult, (new TemplateView($context))->render());
}
@@ -78,7 +78,7 @@ class HtmlentitiesDecodeViewHelperTest extends FunctionalTestCase
{
$source = 'Some special characters: & " \' < > *';
$expectedResult = 'Some special characters: & " \' < > *';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentitiesDecode keepQuotes="true">' . $source . '</f:format.htmlentitiesDecode>');
self::assertEquals($expectedResult, (new TemplateView($context))->render());
}
@@ -90,7 +90,7 @@ class HtmlentitiesDecodeViewHelperTest extends FunctionalTestCase
{
$source = utf8_decode('Some special characters: & " \' < > *');
$expectedResult = 'Some special characters: & " \' < > *';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentitiesDecode encoding="ISO-8859-1">' . $source . '</f:format.htmlentitiesDecode>');
self::assertEquals($expectedResult, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/HtmlentitiesViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
index 4c0591271dc2..5465fdb2a812 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
@@ -33,7 +33,7 @@ class HtmlentitiesViewHelperTest extends FunctionalTestCase
*/
public function renderUsesValueAsSourceIfSpecified(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentities value="Some string" />');
self::assertEquals('Some string', (new TemplateView($context))->render());
}
@@ -43,7 +43,7 @@ class HtmlentitiesViewHelperTest extends FunctionalTestCase
*/
public function renderUsesChildnodesAsSourceIfSpecified(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentities>Some string</f:format.htmlentities>');
self::assertEquals('Some string', (new TemplateView($context))->render());
}
@@ -54,7 +54,7 @@ class HtmlentitiesViewHelperTest extends FunctionalTestCase
public function renderDoesNotModifyValueIfItDoesNotContainSpecialCharacters(): void
{
$source = 'This is a sample text without special characters.';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentities value="' . $source . '" />');
self::assertEquals($source, (new TemplateView($context))->render());
}
@@ -66,7 +66,7 @@ class HtmlentitiesViewHelperTest extends FunctionalTestCase
{
$source = 'Some special characters: &©"\'';
$expectedResult = 'Some special characters: &©"'';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentities>' . $source . '</f:format.htmlentities>');
self::assertEquals($expectedResult, (new TemplateView($context))->render());
}
@@ -78,7 +78,7 @@ class HtmlentitiesViewHelperTest extends FunctionalTestCase
{
$source = 'Some special characters: &©"\'';
$expectedResult = 'Some special characters: &©"\'';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentities keepQuotes="true">' . $source . '</f:format.htmlentities>');
self::assertEquals($expectedResult, (new TemplateView($context))->render());
}
@@ -90,7 +90,7 @@ class HtmlentitiesViewHelperTest extends FunctionalTestCase
{
$source = utf8_decode('Some special characters: &©"\'');
$expectedResult = 'Some special characters: &©"'';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentities encoding="ISO-8859-1">' . $source . '</f:format.htmlentities>');
self::assertEquals($expectedResult, (new TemplateView($context))->render());
}
@@ -102,7 +102,7 @@ class HtmlentitiesViewHelperTest extends FunctionalTestCase
{
$source = 'already "encoded"';
$expectedResult = 'already &quot;encoded&quot;';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentities>' . $source . '</f:format.htmlentities>');
self::assertEquals($expectedResult, (new TemplateView($context))->render());
}
@@ -114,7 +114,7 @@ class HtmlentitiesViewHelperTest extends FunctionalTestCase
{
$source = 'already "encoded"';
$expectedResult = 'already "encoded"';
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentities doubleEncode="false">' . $source . '</f:format.htmlentities>');
self::assertEquals($expectedResult, (new TemplateView($context))->render());
}
@@ -130,7 +130,7 @@ class HtmlentitiesViewHelperTest extends FunctionalTestCase
return '<script>alert(\'"&xss"\')</script>';
}
};
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.htmlentities value="{source}" />');
$view = new TemplateView($context);
$view->assign('source', $toStringClass);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/Nl2brViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/Nl2brViewHelperTest.php
index c697ac05a6f4..566df7701f5b 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/Nl2brViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/Nl2brViewHelperTest.php
@@ -52,7 +52,7 @@ class Nl2brViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertSame($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/NumberViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/NumberViewHelperTest.php
index 61ad3afc0e7f..328f7e005fe3 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/NumberViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/NumberViewHelperTest.php
@@ -60,7 +60,7 @@ class NumberViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertSame($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/PaddingViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/PaddingViewHelperTest.php
index 3ccbca0be4a3..1d119008727a 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/PaddingViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/PaddingViewHelperTest.php
@@ -60,7 +60,7 @@ class PaddingViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertSame($expected, (new TemplateView($context))->render());
}
@@ -70,7 +70,7 @@ class PaddingViewHelperTest extends FunctionalTestCase
*/
public function integersAreRespectedAsValue(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.padding padLength="5" padString="0">{value}</f:format.padding>');
$view = new TemplateView($context);
$view->assign('value', 123);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/StripTagsViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/StripTagsViewHelperTest.php
index 42ce23ab508b..d6c49e22377d 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/StripTagsViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/StripTagsViewHelperTest.php
@@ -64,7 +64,7 @@ class StripTagsViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertSame($expected, (new TemplateView($context))->render());
}
@@ -83,7 +83,7 @@ class StripTagsViewHelperTest extends FunctionalTestCase
return '<script>alert(\'"xss"\')</script>';
}
};
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.stripTags>{value}</f:format.stripTags>');
$view = new TemplateView($context);
$view->assign('value', $toStringClass);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/UrlencodeViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/UrlencodeViewHelperTest.php
index a617c067d2e6..4e26439aaf74 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/UrlencodeViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/UrlencodeViewHelperTest.php
@@ -56,7 +56,7 @@ class UrlencodeViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertSame($expected, (new TemplateView($context))->render());
}
@@ -75,7 +75,7 @@ class UrlencodeViewHelperTest extends FunctionalTestCase
return '<script>alert(\'"xss"\')</script>';
}
};
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:format.urlencode>{value}</f:format.urlencode>');
$view = new TemplateView($context);
$view->assign('value', $toStringClass);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/ImageViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/ImageViewHelperTest.php
index 9c484ceba663..ee0530316b83 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/ImageViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/ImageViewHelperTest.php
@@ -75,7 +75,7 @@ class ImageViewHelperTest extends FunctionalTestCase
public function renderReturnsExpectedMarkup(string $template, string $expected): void
{
$this->setUpBackendUserFromFixture(1);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertMatchesRegularExpression($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/EmailViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/EmailViewHelperTest.php
index 9f0183144033..24986699b030 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/EmailViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/EmailViewHelperTest.php
@@ -35,7 +35,7 @@ class EmailViewHelperTest extends FunctionalTestCase
*/
public function renderCreatesProperMarkupInBackend(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:link.email email="foo@example.com">send mail</f:link.email>');
self::assertEquals('<a href="mailto:foo@example.com">send mail</a>', (new TemplateView($context))->render());
}
@@ -45,7 +45,7 @@ class EmailViewHelperTest extends FunctionalTestCase
*/
public function renderCreatesProperMarkupInBackendWithEmptyChild(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:link.email email="foo@example.com" />');
self::assertEquals('<a href="mailto:foo@example.com">foo@example.com</a>', (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/ExternalViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/ExternalViewHelperTest.php
index 8b911dee8bf6..719e6f0a2178 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/ExternalViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/ExternalViewHelperTest.php
@@ -52,7 +52,7 @@ class ExternalViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertSame($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/FileViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/FileViewHelperTest.php
index 3c56464ff022..c5c94f5906af 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/FileViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/FileViewHelperTest.php
@@ -76,7 +76,7 @@ class FileViewHelperTest extends FunctionalTestCase
$this->expectException(Exception::class);
$this->expectExceptionCode(1621511632);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplatePathAndFilename(self::TEMPLATE_PATH);
(new TemplateView($context))->render();
}
@@ -86,7 +86,7 @@ class FileViewHelperTest extends FunctionalTestCase
*/
public function renderTagsForPublicFileTest(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplatePathAndFilename(self::TEMPLATE_PATH);
$view = new TemplateView($context);
$view->assign('file', $this->getFile(1));
@@ -115,7 +115,7 @@ class FileViewHelperTest extends FunctionalTestCase
$connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('sys_file_storage');
$connection->update('sys_file_storage', ['is_public' => 0], ['uid' => 1]);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplatePathAndFilename(self::TEMPLATE_PATH);
$view = new TemplateView($context);
$view->assign('file', $this->getFile(1));
@@ -141,7 +141,7 @@ class FileViewHelperTest extends FunctionalTestCase
*/
public function renderTagsForPublicFileReferenceTest(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplatePathAndFilename(self::TEMPLATE_PATH);
$view = new TemplateView($context);
$view->assign('file', $this->getFileReference(2));
@@ -170,7 +170,7 @@ class FileViewHelperTest extends FunctionalTestCase
$connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('sys_file_storage');
$connection->update('sys_file_storage', ['is_public' => 0], ['uid' => 1]);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplatePathAndFilename(self::TEMPLATE_PATH);
$view = new TemplateView($context);
$view->assign('file', $this->getFileReference(2));
@@ -196,7 +196,7 @@ class FileViewHelperTest extends FunctionalTestCase
*/
public function renderTagsForPublicProcessedFileTest(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplatePathAndFilename(self::TEMPLATE_PATH);
$view = new TemplateView($context);
$view->assign('file', $this->getProcessedFile(3));
@@ -225,7 +225,7 @@ class FileViewHelperTest extends FunctionalTestCase
$connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('sys_file_storage');
$connection->update('sys_file_storage', ['is_public' => 0], ['uid' => 1]);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplatePathAndFilename(self::TEMPLATE_PATH);
$view = new TemplateView($context);
$view->assign('file', $this->getProcessedFile(3));
@@ -248,7 +248,7 @@ class FileViewHelperTest extends FunctionalTestCase
protected function getFile(int $fileUid): File
{
- return $this->getContainer()->get(ResourceFactory::class)->retrieveFileOrFolderObject($fileUid);
+ return $this->get(ResourceFactory::class)->retrieveFileOrFolderObject($fileUid);
}
protected function getFileReference(int $fileUid): FileReference
@@ -262,6 +262,6 @@ class FileViewHelperTest extends FunctionalTestCase
protected function getProcessedFile(int $fileUid): ProcessedFile
{
- return $this->getContainer()->get(ProcessedFileRepository::class)->findByUid($fileUid);
+ return $this->get(ProcessedFileRepository::class)->findByUid($fileUid);
}
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/TypolinkViewHelperTest.php
index dd8c5a48a364..fd722e46f16b 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Link/TypolinkViewHelperTest.php
@@ -186,7 +186,7 @@ EOT
*/
public function renderWithAssignedParameters(string $template, array $assigns, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
$view = new TemplateView($context);
$view->assignMultiple($assigns);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/PageRendererViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/PageRendererViewHelperTest.php
index e9bff6998ce5..e638883017d7 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/PageRendererViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/PageRendererViewHelperTest.php
@@ -66,7 +66,7 @@ class PageRendererViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
$view = new TemplateView($context);
$GLOBALS['LANG'] = GeneralUtility::makeInstance(LanguageServiceFactory::class)->create('default');
@@ -82,7 +82,7 @@ class PageRendererViewHelperTest extends FunctionalTestCase
*/
public function renderResolvesLabelWithExtbaseRequest(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:be.pageRenderer addJsInlineLabels="{0: \'login.header\'}" />');
$extbaseRequestParameters = new ExtbaseRequestParameters();
$extbaseRequestParameters->setControllerExtensionName('Backend');
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Sanitize/HtmlViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Sanitize/HtmlViewHelperTest.php
index 433d4280fc98..a0a51fb0bb4a 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Sanitize/HtmlViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Sanitize/HtmlViewHelperTest.php
@@ -43,7 +43,7 @@ class HtmlViewHelperTest extends FunctionalTestCase
*/
public function isSanitizedUsingNodeInstruction(string $payload, string $expectation): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(sprintf('<f:sanitize.html>%s</f:sanitize.html>', $payload));
self::assertSame($expectation, (new TemplateView($context))->render());
}
@@ -56,7 +56,7 @@ class HtmlViewHelperTest extends FunctionalTestCase
*/
public function isSanitizedUsingInlineInstruction(string $payload, string $expectation): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('{payload -> f:sanitize.html()}');
$view = new TemplateView($context);
$view->assign('payload', $payload);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php
index dd305ca03f29..a8285b735b9a 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php
@@ -43,7 +43,7 @@ class IfAuthenticatedViewHelperTest extends FunctionalTestCase
$context->setAspect('frontend.user', new UserAspect($user));
GeneralUtility::setSingletonInstance(Context::class, $context);
- $renderingContext = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $renderingContext = $this->get(RenderingContextFactory::class)->create();
$renderingContext->getTemplatePaths()->setTemplateSource('<f:security.ifAuthenticated><f:then>then child</f:then><f:else>else child</f:else></f:security.ifAuthenticated>');
self::assertEquals('then child', (new TemplateView($renderingContext))->render());
}
@@ -57,7 +57,7 @@ class IfAuthenticatedViewHelperTest extends FunctionalTestCase
$context->setAspect('frontend.user', new UserAspect());
GeneralUtility::setSingletonInstance(Context::class, $context);
- $renderingContext = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $renderingContext = $this->get(RenderingContextFactory::class)->create();
$renderingContext->getTemplatePaths()->setTemplateSource('<f:security.ifAuthenticated><f:then>then child</f:then><f:else>else child</f:else></f:security.ifAuthenticated>');
self::assertEquals('else child', (new TemplateView($renderingContext))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Security/IfHasRoleViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Security/IfHasRoleViewHelperTest.php
index 74aaab4e0987..01f5c680b914 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Security/IfHasRoleViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Security/IfHasRoleViewHelperTest.php
@@ -74,7 +74,7 @@ class IfHasRoleViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertEquals($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Transform/HtmlViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Transform/HtmlViewHelperTest.php
index 3901c910d418..28fea42c1bf5 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Transform/HtmlViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Transform/HtmlViewHelperTest.php
@@ -116,7 +116,7 @@ class HtmlViewHelperTest extends FunctionalTestCase
*/
public function isTransformed(string $payload, string $expectation): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(sprintf('<f:transform.html>%s</f:transform.html>', $payload));
self::assertSame($expectation, (new TemplateView($context))->render());
}
@@ -156,7 +156,7 @@ class HtmlViewHelperTest extends FunctionalTestCase
*/
public function isTransformedWithSelector(string $selector, string $payload, string $expectation): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(sprintf('<f:transform.html selector="%s">%s</f:transform.html>', $selector, $payload));
self::assertSame($expectation, (new TemplateView($context))->render());
}
@@ -206,7 +206,7 @@ class HtmlViewHelperTest extends FunctionalTestCase
*/
public function isTransformedWithOnFailure(?string $onFailure, string $payload, string $expectation): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource(sprintf(
'<f:transform.html %s>%s</f:transform.html>',
$onFailure !== null ? 'onFailure="' . $onFailure . '"' : '',
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TranslateViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TranslateViewHelperTest.php
index 35d31d229c0d..a3c90ccfd3a0 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TranslateViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TranslateViewHelperTest.php
@@ -37,7 +37,7 @@ class TranslateViewHelperTest extends FunctionalTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionCode(1351584844);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:translate />');
(new TemplateView($context))->render();
}
@@ -49,7 +49,7 @@ class TranslateViewHelperTest extends FunctionalTestCase
{
$this->expectException(\RuntimeException::class);
$this->expectExceptionCode(1639828178);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:translate key="key1" />');
(new TemplateView($context))->render();
}
@@ -112,7 +112,7 @@ class TranslateViewHelperTest extends FunctionalTestCase
{
$this->setUpBackendUserFromFixture(1);
$GLOBALS['LANG'] = GeneralUtility::makeInstance(LanguageServiceFactory::class)->create('default');
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertSame($expected, (new TemplateView($context))->render());
}
@@ -173,7 +173,7 @@ class TranslateViewHelperTest extends FunctionalTestCase
$extbaseRequestParameters = new ExtbaseRequestParameters();
$extbaseRequestParameters->setControllerExtensionName('backend');
$extbaseRequest = (new Request())->withAttribute('extbase', $extbaseRequestParameters);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
$context->setRequest($extbaseRequest);
self::assertSame($expected, (new TemplateView($context))->render());
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/ExternalViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/ExternalViewHelperTest.php
index e109beb8684c..f12c74c33743 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/ExternalViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/ExternalViewHelperTest.php
@@ -56,7 +56,7 @@ class ExternalViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertSame($expected, (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/ResourceViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/ResourceViewHelperTest.php
index c06b66c528b8..5f0b6fa2d005 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/ResourceViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Uri/ResourceViewHelperTest.php
@@ -38,7 +38,7 @@ class ResourceViewHelperTest extends FunctionalTestCase
{
$this->expectException(\RuntimeException::class);
$this->expectExceptionCode(1639672666);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:uri.resource path="Icons/Extension.svg" />');
$context->setRequest(new ServerRequest());
(new TemplateView($context))->render();
@@ -49,7 +49,7 @@ class ResourceViewHelperTest extends FunctionalTestCase
*/
public function renderingFailsWhenExtensionNameNotSetInExtbaseRequest(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<f:uri.resource path="Icons/Extension.svg" />');
$context->setRequest(new Request());
$this->expectException(\RuntimeException::class);
@@ -79,7 +79,7 @@ class ResourceViewHelperTest extends FunctionalTestCase
*/
public function render(string $template, string $expected): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
self::assertSame($expected, (new TemplateView($context))->render());
}
@@ -117,7 +117,7 @@ class ResourceViewHelperTest extends FunctionalTestCase
$extbaseRequestParameters = new ExtbaseRequestParameters();
$extbaseRequestParameters->setControllerExtensionName('Core');
$extbaseRequest = (new Request())->withAttribute('extbase', $extbaseRequestParameters);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource($template);
$context->setRequest($extbaseRequest);
self::assertEquals($expected, (new TemplateView($context))->render());
diff --git a/typo3/sysext/form/Tests/Functional/ViewHelpers/UploadedResourceViewHelperTest.php b/typo3/sysext/form/Tests/Functional/ViewHelpers/UploadedResourceViewHelperTest.php
index c6bdf84d8e1b..213dc2e749ae 100644
--- a/typo3/sysext/form/Tests/Functional/ViewHelpers/UploadedResourceViewHelperTest.php
+++ b/typo3/sysext/form/Tests/Functional/ViewHelpers/UploadedResourceViewHelperTest.php
@@ -35,7 +35,7 @@ class UploadedResourceViewHelperTest extends FunctionalTestCase
*/
public function accpetAttributeIsAdded(): void
{
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getTemplatePaths()->setTemplateSource('<formvh:form.uploadedResource accept="{0: \'image/jpeg\', 1: \'image/png\'}"/>');
self::assertSame('<input accept="image/jpeg,image/png" type="file" name="" />', (new TemplateView($context))->render());
}
diff --git a/typo3/sysext/frontend/Tests/Functional/Cache/CacheLifetimeCalculatorTest.php b/typo3/sysext/frontend/Tests/Functional/Cache/CacheLifetimeCalculatorTest.php
index a9e2356b1b88..0db3ab1e91ad 100644
--- a/typo3/sysext/frontend/Tests/Functional/Cache/CacheLifetimeCalculatorTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Cache/CacheLifetimeCalculatorTest.php
@@ -35,7 +35,7 @@ class CacheLifetimeCalculatorTest extends FunctionalTestCase
*/
public function getFirstTimeValueForRecordReturnCorrectData(): void
{
- $subject = new class($this->getContainer()->get('cache.core'), $this->getContainer()->get(EventDispatcherInterface::class), $this->getContainer()->get(ConnectionPool::class)) extends CacheLifetimeCalculator {
+ $subject = new class($this->get('cache.core'), $this->get(EventDispatcherInterface::class), $this->get(ConnectionPool::class)) extends CacheLifetimeCalculator {
public function getFirstTimeValueForRecord(string $tableDef, int $currentTimestamp): int
{
return parent::getFirstTimeValueForRecord($tableDef, $currentTimestamp);
diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
index 80c4f886fb61..a15f2f05e400 100644
--- a/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
@@ -67,7 +67,7 @@ class FluidTemplateContentObjectTest extends FunctionalTestCase
$contentObjectRenderer = new ContentObjectRenderer($tsfe);
$contentObjectRenderer->setRequest($this->prophesize(ServerRequestInterface::class)->reveal());
- $fluidTemplateContentObject = $this->getContainer()->get(ContentObjectFactory::class)->getContentObject(
+ $fluidTemplateContentObject = $this->get(ContentObjectFactory::class)->getContentObject(
'COA',
$this->prophesize(ServerRequestInterface::class)->reveal(),
$contentObjectRenderer
@@ -113,7 +113,7 @@ class FluidTemplateContentObjectTest extends FunctionalTestCase
$contentObjectRenderer = new ContentObjectRenderer($tsfe);
$contentObjectRenderer->setRequest($this->prophesize(ServerRequestInterface::class)->reveal());
- $fluidTemplateContentObject = $this->getContainer()->get(ContentObjectFactory::class)->getContentObject(
+ $fluidTemplateContentObject = $this->get(ContentObjectFactory::class)->getContentObject(
'COA',
$this->prophesize(ServerRequestInterface::class)->reveal(),
$contentObjectRenderer
diff --git a/typo3/sysext/install/Tests/Functional/Controller/BackendModuleControllerTest.php b/typo3/sysext/install/Tests/Functional/Controller/BackendModuleControllerTest.php
index 87c338ef2ca0..24408ed59623 100644
--- a/typo3/sysext/install/Tests/Functional/Controller/BackendModuleControllerTest.php
+++ b/typo3/sysext/install/Tests/Functional/Controller/BackendModuleControllerTest.php
@@ -61,8 +61,8 @@ class BackendModuleControllerTest extends FunctionalTestCase
public function environmentContextIsRespectedTest(string $module): void
{
$subject = new BackendModuleController(
- $this->getContainer()->get(UriBuilder::class),
- $this->getContainer()->get(ModuleTemplateFactory::class)
+ $this->get(UriBuilder::class),
+ $this->get(ModuleTemplateFactory::class)
);
$action = $module . 'Action';
diff --git a/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php b/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
index 8d936b4e7821..b79f7f120b0b 100644
--- a/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
+++ b/typo3/sysext/install/Tests/Functional/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
@@ -69,7 +69,7 @@ class PhpErrorCodeViewHelperTest extends FunctionalTestCase
$viewHelperInstance = new PhpErrorCodeViewHelper();
$this->getContainer()->set(PhpErrorCodeViewHelper::class, $viewHelperInstance);
- $context = $this->getContainer()->get(RenderingContextFactory::class)->create();
+ $context = $this->get(RenderingContextFactory::class)->create();
$context->getViewHelperResolver()->addNamespace('install', 'TYPO3\\CMS\\Install\\ViewHelpers');
$context->getTemplatePaths()->setTemplateSource('<install:format.phpErrorCode phpErrorCode="' . $errorCode . '" />');
self::assertSame($expected, (new TemplateView($context))->render());
diff --git a/typo3/sysext/linkvalidator/Tests/Functional/LinkAnalyzerTest.php b/typo3/sysext/linkvalidator/Tests/Functional/LinkAnalyzerTest.php
index 61d34521ca63..ae3611dbee98 100644
--- a/typo3/sysext/linkvalidator/Tests/Functional/LinkAnalyzerTest.php
+++ b/typo3/sysext/linkvalidator/Tests/Functional/LinkAnalyzerTest.php
@@ -35,7 +35,7 @@ class LinkAnalyzerTest extends FunctionalTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
public function findAllBrokenLinksDataProvider(): array
@@ -100,7 +100,7 @@ class LinkAnalyzerTest extends FunctionalTestCase
$this->importCSVDataSet($inputFile);
- $linkAnalyzer = $this->getContainer()->get(LinkAnalyzer::class);
+ $linkAnalyzer = $this->get(LinkAnalyzer::class);
$linkAnalyzer->init($searchFields, $pidList, $tsConfig);
$linkAnalyzer->getLinkStatistics($linkTypes);
@@ -152,7 +152,7 @@ class LinkAnalyzerTest extends FunctionalTestCase
$this->importCSVDataSet($inputFile);
- $linkAnalyzer = $this->getContainer()->get(LinkAnalyzer::class);
+ $linkAnalyzer = $this->get(LinkAnalyzer::class);
$linkAnalyzer->init($searchFields, $pidList, $tsConfig);
$linkAnalyzer->getLinkStatistics($linkTypes);
@@ -204,7 +204,7 @@ class LinkAnalyzerTest extends FunctionalTestCase
$this->importCSVDataSet($inputFile);
- $linkAnalyzer = $this->getContainer()->get(LinkAnalyzer::class);
+ $linkAnalyzer = $this->get(LinkAnalyzer::class);
$linkAnalyzer->init($searchFields, $pidList, $tsConfig);
$linkAnalyzer->getLinkStatistics($linkTypes);
@@ -255,7 +255,7 @@ class LinkAnalyzerTest extends FunctionalTestCase
$this->importCSVDataSet($inputFile);
- $linkAnalyzer = $this->getContainer()->get(LinkAnalyzer::class);
+ $linkAnalyzer = $this->get(LinkAnalyzer::class);
$linkAnalyzer->init($searchFields, $pidList, $tsConfig);
$linkAnalyzer->getLinkStatistics($linkTypes);
@@ -295,7 +295,7 @@ class LinkAnalyzerTest extends FunctionalTestCase
$this->importCSVDataSet($inputFile);
- $linkAnalyzer = $this->getContainer()->get(LinkAnalyzer::class);
+ $linkAnalyzer = $this->get(LinkAnalyzer::class);
$linkAnalyzer->init($searchFields, $pidList, $tsConfig);
$linkAnalyzer->getLinkStatistics($linkTypes);
diff --git a/typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php b/typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php
index 559aef95590e..92fe113e4492 100644
--- a/typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php
+++ b/typo3/sysext/linkvalidator/Tests/Functional/Repository/BrokenLinkRepositoryTest.php
@@ -217,7 +217,7 @@ class BrokenLinkRepositoryTest extends FunctionalTestCase
$this->importCSVDataSet($inputFile);
- $linkAnalyzer = $this->getContainer()->get(LinkAnalyzer::class);
+ $linkAnalyzer = $this->get(LinkAnalyzer::class);
$linkAnalyzer->init($searchFields, $pidList, $tsConfig);
$linkAnalyzer->getLinkStatistics($linkTypes);
$result = $this->brokenLinksRepository->getNumberOfBrokenLinksForRecordsOnPages(
@@ -340,7 +340,7 @@ class BrokenLinkRepositoryTest extends FunctionalTestCase
$this->importCSVDataSet($inputFile);
- $linkAnalyzer = $this->getContainer()->get(LinkAnalyzer::class);
+ $linkAnalyzer = $this->get(LinkAnalyzer::class);
$linkAnalyzer->init($searchFields, $pidList, $tsConfig);
$linkAnalyzer->getLinkStatistics($linkTypes);
@@ -639,7 +639,7 @@ class BrokenLinkRepositoryTest extends FunctionalTestCase
$this->importCSVDataSet($inputFile);
- $linkAnalyzer = $this->getContainer()->get(LinkAnalyzer::class);
+ $linkAnalyzer = $this->get(LinkAnalyzer::class);
$linkAnalyzer->init($searchFields, $pidList, $tsConfig);
$linkAnalyzer->getLinkStatistics($linkTypes);
@@ -778,7 +778,7 @@ class BrokenLinkRepositoryTest extends FunctionalTestCase
$this->setupBackendUserAndGroup($beuser['uid'], $beuser['fixture'], $beuser['groupFixture']);
$this->importCSVDataSet($inputFile);
- $linkAnalyzer = $this->getContainer()->get(LinkAnalyzer::class);
+ $linkAnalyzer = $this->get(LinkAnalyzer::class);
$linkAnalyzer->init($searchFields, $pidList, $tsConfig);
$linkAnalyzer->getLinkStatistics($linkTypes);
diff --git a/typo3/sysext/lowlevel/Tests/Functional/Database/QueryGeneratorTest.php b/typo3/sysext/lowlevel/Tests/Functional/Database/QueryGeneratorTest.php
index 06c2c520a865..c0704230e45c 100644
--- a/typo3/sysext/lowlevel/Tests/Functional/Database/QueryGeneratorTest.php
+++ b/typo3/sysext/lowlevel/Tests/Functional/Database/QueryGeneratorTest.php
@@ -29,7 +29,7 @@ class QueryGeneratorTest extends FunctionalTestCase
{
parent::setUp();
$this->setUpBackendUserFromFixture(1);
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
}
/**
diff --git a/typo3/sysext/recordlist/Tests/Functional/RecordList/DownloadRecordListTest.php b/typo3/sysext/recordlist/Tests/Functional/RecordList/DownloadRecordListTest.php
index dfe951e4c745..4d05205f018b 100644
--- a/typo3/sysext/recordlist/Tests/Functional/RecordList/DownloadRecordListTest.php
+++ b/typo3/sysext/recordlist/Tests/Functional/RecordList/DownloadRecordListTest.php
@@ -32,7 +32,7 @@ class DownloadRecordListTest extends FunctionalTestCase
{
parent::setUp();
$this->user = $this->setUpBackendUserFromFixture(1);
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->createFromUserPreferences($this->user);
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->createFromUserPreferences($this->user);
}
/**
@@ -40,7 +40,7 @@ class DownloadRecordListTest extends FunctionalTestCase
*/
public function downloadReturnsAListOfAllBackendUsers(): void
{
- $recordList = $this->getContainer()->get(DatabaseRecordList::class);
+ $recordList = $this->get(DatabaseRecordList::class);
$recordList->start(0, 'be_users', 0);
$recordList->setFields['be_users'] = [
'username',
@@ -77,7 +77,7 @@ class DownloadRecordListTest extends FunctionalTestCase
public function downloadReturnsAListOfSubpages(): void
{
$this->importCSVDataSet(__DIR__ . '/Fixtures/pages.csv');
- $recordList = $this->getContainer()->get(DatabaseRecordList::class);
+ $recordList = $this->get(DatabaseRecordList::class);
$recordList->start(1, 'pages', 0);
$recordList->setFields['pages'] = [
'uid',
@@ -166,7 +166,7 @@ class DownloadRecordListTest extends FunctionalTestCase
*/
public function downloadReturnsRawValues(): void
{
- $recordList = $this->getContainer()->get(DatabaseRecordList::class);
+ $recordList = $this->get(DatabaseRecordList::class);
$recordList->start(0, 'be_users', 0);
$recordList->setFields['be_users'] = [
'username',
diff --git a/typo3/sysext/redirects/Tests/Functional/EventListener/IncrementHitCountTest.php b/typo3/sysext/redirects/Tests/Functional/EventListener/IncrementHitCountTest.php
index 293e3e0c3240..7639defee551 100644
--- a/typo3/sysext/redirects/Tests/Functional/EventListener/IncrementHitCountTest.php
+++ b/typo3/sysext/redirects/Tests/Functional/EventListener/IncrementHitCountTest.php
@@ -45,7 +45,7 @@ class IncrementHitCountTest extends FunctionalTestCase
// Assert current hit count
self::assertEquals(3, (int)$matchedRecord['hitcount']);
- $this->getContainer()->get(EventDispatcherInterface::class)->dispatch(
+ $this->get(EventDispatcherInterface::class)->dispatch(
new RedirectWasHitEvent(
new ServerRequest('https://acme.com'),
new RedirectResponse($matchedRecord['target']),
@@ -66,7 +66,7 @@ class IncrementHitCountTest extends FunctionalTestCase
// Assert current hit count
self::assertEquals(0, (int)$matchedRecord['hitcount']);
- $this->getContainer()->get(EventDispatcherInterface::class)->dispatch(
+ $this->get(EventDispatcherInterface::class)->dispatch(
new RedirectWasHitEvent(
new ServerRequest('https://acme.com'),
new RedirectResponse($matchedRecord['target']),
@@ -84,7 +84,7 @@ class IncrementHitCountTest extends FunctionalTestCase
// Assert current hit count
self::assertEquals(3, (int)$matchedRecord['hitcount']);
- $this->getContainer()->get(EventDispatcherInterface::class)->dispatch(
+ $this->get(EventDispatcherInterface::class)->dispatch(
new RedirectWasHitEvent(
new ServerRequest('https://acme.com'),
new RedirectResponse($matchedRecord['target']),
diff --git a/typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php b/typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php
index 146378c51226..e163708dec86 100644
--- a/typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php
+++ b/typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php
@@ -41,7 +41,7 @@ class NoteVisibleFieldsTest extends FunctionalTestCase
public function noteFormContainsExpectedFields(): void
{
$this->setUpBackendUserFromFixture(1);
- $GLOBALS['LANG'] = $this->getContainer()->get(LanguageServiceFactory::class)->create('default');
+ $GLOBALS['LANG'] = $this->get(LanguageServiceFactory::class)->create('default');
$formEngineTestService = new FormTestService();
$formResult = $formEngineTestService->createNewRecordForm('sys_note');
--
GitLab