diff --git a/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php b/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php
index b34e7fb38383be7bb0a996bb596ea9aecb0b1584..e2b59e444f8cb375ce8d6ae196c97efc6b1ef9af 100644
--- a/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php
+++ b/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserGroupRepository.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Domain\Repository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
use TYPO3\CMS\Extbase\Persistence\Repository;
@@ -27,8 +28,7 @@ class BackendUserGroupRepository extends Repository
{
public function initializeObject()
{
- /** @var Typo3QuerySettings $querySettings */
- $querySettings = $this->objectManager->get(Typo3QuerySettings::class);
+ $querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
$querySettings->setRespectStoragePage(false);
$this->setDefaultQuerySettings($querySettings);
}
diff --git a/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php b/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php
index 291ce41d37a9325aa42b8c92ca84ccb212dff78e..aaab1fd4e971ff8501f0b0608517f67d4ec73782 100644
--- a/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php
+++ b/typo3/sysext/extbase/Classes/Domain/Repository/BackendUserRepository.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Domain\Repository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
use TYPO3\CMS\Extbase\Persistence\Repository;
@@ -27,8 +28,7 @@ class BackendUserRepository extends Repository
{
public function initializeObject()
{
- /** @var Typo3QuerySettings $querySettings */
- $querySettings = $this->objectManager->get(Typo3QuerySettings::class);
+ $querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
$querySettings->setRespectStoragePage(false);
$this->setDefaultQuerySettings($querySettings);
}
diff --git a/typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php b/typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php
index a0718f80bbb7d835338cfbdbe99efdf3e9fa0a64..cca1e1593a33fb161d947c764fa33aa4cca9f497 100644
--- a/typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php
+++ b/typo3/sysext/extbase/Classes/Domain/Repository/CategoryRepository.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Domain\Repository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
use TYPO3\CMS\Extbase\Persistence\Repository;
@@ -27,8 +28,7 @@ class CategoryRepository extends Repository
{
public function initializeObject()
{
- /** @var Typo3QuerySettings $querySettings */
- $querySettings = $this->objectManager->get(Typo3QuerySettings::class);
+ $querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
$querySettings->setRespectStoragePage(false);
$this->setDefaultQuerySettings($querySettings);
}
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
index 34b1543ce700009a1e5671ab3ffe4c7e822d3695..84ab7b3b0bbec59abbdd3283b82e6b1bc0c2ce90 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/*
* This file is part of the TYPO3 CMS project.
*
@@ -15,6 +17,7 @@
namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Repository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository;
use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
@@ -28,30 +31,30 @@ class BackendUserGroupRepositoryTest extends UnitTestCase
/**
* @test
*/
- public function initializeObjectSetsRespectStoragePidToFalse()
+ public function initializeObjectSetsRespectStoragePidToFalse(): void
{
$objectManager = $this->createMock(ObjectManagerInterface::class);
- $fixture = new BackendUserGroupRepository($objectManager);
+ $subject = new BackendUserGroupRepository($objectManager);
$querySettings = $this->createMock(Typo3QuerySettings::class);
$querySettings->expects(self::once())->method('setRespectStoragePage')->with(false);
- $objectManager->expects(self::once())->method('get')->with(Typo3QuerySettings::class)->willReturn($querySettings);
- $fixture->initializeObject();
+ GeneralUtility::addInstance(Typo3QuerySettings::class, $querySettings);
+ $subject->initializeObject();
}
/**
* @test
*/
- public function initializeObjectSetsDefaultQuerySettings()
+ public function initializeObjectSetsDefaultQuerySettings(): void
{
$objectManager = $this->createMock(ObjectManagerInterface::class);
- /** @var $fixture \TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository */
- $fixture = $this->getMockBuilder(BackendUserGroupRepository::class)
+ /** @var $subject \TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository */
+ $subject = $this->getMockBuilder(BackendUserGroupRepository::class)
->setMethods(['setDefaultQuerySettings'])
->setConstructorArgs([$objectManager])
->getMock();
$querySettings = $this->createMock(Typo3QuerySettings::class);
- $objectManager->expects(self::once())->method('get')->with(Typo3QuerySettings::class)->willReturn($querySettings);
- $fixture->expects(self::once())->method('setDefaultQuerySettings')->with($querySettings);
- $fixture->initializeObject();
+ GeneralUtility::addInstance(Typo3QuerySettings::class, $querySettings);
+ $subject->expects(self::once())->method('setDefaultQuerySettings')->with($querySettings);
+ $subject->initializeObject();
}
}
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
index 8b71bb73ca74fcf788cccbbecf609556213cafa0..551e9adade0da52d6a5bcf0856cc641d11c0b0e3 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/*
* This file is part of the TYPO3 CMS project.
*
@@ -15,6 +17,7 @@
namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Repository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository;
use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
@@ -28,30 +31,30 @@ class BackendUserRepositoryTest extends UnitTestCase
/**
* @test
*/
- public function initializeObjectSetsRespectStoragePidToFalse()
+ public function initializeObjectSetsRespectStoragePidToFalse(): void
{
$objectManager = $this->createMock(ObjectManagerInterface::class);
- $fixture = new BackendUserGroupRepository($objectManager);
+ $subject = new BackendUserGroupRepository($objectManager);
$querySettings = $this->createMock(Typo3QuerySettings::class);
$querySettings->expects(self::once())->method('setRespectStoragePage')->with(false);
- $objectManager->expects(self::once())->method('get')->with(Typo3QuerySettings::class)->willReturn($querySettings);
- $fixture->initializeObject();
+ GeneralUtility::addInstance(Typo3QuerySettings::class, $querySettings);
+ $subject->initializeObject();
}
/**
* @test
*/
- public function initializeObjectSetsDefaultQuerySettings()
+ public function initializeObjectSetsDefaultQuerySettings(): void
{
$objectManager = $this->createMock(ObjectManagerInterface::class);
- /** @var $fixture \TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository */
- $fixture = $this->getMockBuilder(BackendUserGroupRepository::class)
+ /** @var $subject \TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository */
+ $subject = $this->getMockBuilder(BackendUserGroupRepository::class)
->setMethods(['setDefaultQuerySettings'])
->setConstructorArgs([$objectManager])
->getMock();
$querySettings = $this->createMock(Typo3QuerySettings::class);
- $objectManager->expects(self::once())->method('get')->with(Typo3QuerySettings::class)->willReturn($querySettings);
- $fixture->expects(self::once())->method('setDefaultQuerySettings')->with($querySettings);
- $fixture->initializeObject();
+ GeneralUtility::addInstance(Typo3QuerySettings::class, $querySettings);
+ $subject->expects(self::once())->method('setDefaultQuerySettings')->with($querySettings);
+ $subject->initializeObject();
}
}
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
index 3ce662fd3bc18292eec074469040a41112860b7b..fd75200ed80e29fe1d41c614bc168c799cdf1e52 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/*
* This file is part of the TYPO3 CMS project.
*
@@ -15,6 +17,7 @@
namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Repository;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Domain\Repository\CategoryRepository;
use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
@@ -28,14 +31,14 @@ class CategoryRepositoryTest extends UnitTestCase
/**
* @test
*/
- public function initializeObjectSetsRespectStoragePidToFalse()
+ public function initializeObjectSetsRespectStoragePidToFalse(): void
{
/** @var $objectManager \TYPO3\CMS\Extbase\Object\ObjectManagerInterface */
$objectManager = $this->createMock(ObjectManagerInterface::class);
- $fixture = new CategoryRepository($objectManager);
+ $subject = new CategoryRepository($objectManager);
$querySettings = $this->createMock(Typo3QuerySettings::class);
$querySettings->expects(self::once())->method('setRespectStoragePage')->with(false);
- $objectManager->expects(self::once())->method('get')->with(Typo3QuerySettings::class)->willReturn($querySettings);
- $fixture->initializeObject();
+ GeneralUtility::addInstance(Typo3QuerySettings::class, $querySettings);
+ $subject->initializeObject();
}
}
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php
index a1d7de56e7a4d15811381fc621068090744acd1f..5d0c3051b18494212bee92222d76621077b031ca 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
/*
* This file is part of the TYPO3 CMS project.
*
@@ -26,10 +28,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
*/
class Typo3QuerySettingsTest extends UnitTestCase
{
- /**
- * @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings
- */
- protected $typo3QuerySettings;
+ protected ?Typo3QuerySettings $subject = null;
/**
* setup test environment
@@ -37,16 +36,13 @@ class Typo3QuerySettingsTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->typo3QuerySettings = new Typo3QuerySettings(
+ $this->subject = new Typo3QuerySettings(
new Context(),
$this->prophesize(ConfigurationManagerInterface::class)->reveal()
);
}
- /**
- * @return array
- */
- public function booleanValueProvider()
+ public function booleanValueProvider(): array
{
return [
'TRUE setting' => [true],
@@ -54,10 +50,7 @@ class Typo3QuerySettingsTest extends UnitTestCase
];
}
- /**
- * @return array
- */
- public function arrayValueProvider()
+ public function arrayValueProvider(): array
{
return [
'empty array' => [[]],
@@ -82,125 +75,120 @@ class Typo3QuerySettingsTest extends UnitTestCase
* @dataProvider booleanValueProvider
* @param bool $input
*/
- public function setRespectStoragePageSetsRespectStoragePageCorrectly($input)
+ public function setRespectStoragePageSetsRespectStoragePageCorrectly(bool $input): void
{
- $this->typo3QuerySettings->setRespectStoragePage($input);
- self::assertEquals($input, $this->typo3QuerySettings->getRespectStoragePage());
+ $this->subject->setRespectStoragePage($input);
+ self::assertEquals($input, $this->subject->getRespectStoragePage());
}
/**
* @test
*/
- public function setRespectStoragePageAllowsChaining()
+ public function setRespectStoragePageAllowsChaining(): void
{
- self::assertTrue($this->typo3QuerySettings->setRespectStoragePage(true) instanceof QuerySettingsInterface);
+ self::assertTrue($this->subject->setRespectStoragePage(true) instanceof QuerySettingsInterface);
}
/**
* @test
* @dataProvider arrayValueProvider
- *
* @param array $input
*/
- public function setStoragePageIdsSetsStoragePageIdsCorrectly($input)
+ public function setStoragePageIdsSetsStoragePageIdsCorrectly(array $input): void
{
- $this->typo3QuerySettings->setStoragePageIds($input);
- self::assertEquals($input, $this->typo3QuerySettings->getStoragePageIds());
+ $this->subject->setStoragePageIds($input);
+ self::assertEquals($input, $this->subject->getStoragePageIds());
}
/**
* @test
*/
- public function setStoragePageIdsAllowsChaining()
+ public function setStoragePageIdsAllowsChaining(): void
{
- self::assertTrue($this->typo3QuerySettings->setStoragePageIds([1, 2, 3]) instanceof QuerySettingsInterface);
+ self::assertTrue($this->subject->setStoragePageIds([1, 2, 3]) instanceof QuerySettingsInterface);
}
/**
* @test
* @dataProvider booleanValueProvider
- *
* @param bool $input
*/
- public function setRespectSysLanguageSetsRespectSysLanguageCorrectly($input)
+ public function setRespectSysLanguageSetsRespectSysLanguageCorrectly(bool $input): void
{
- $this->typo3QuerySettings->setRespectSysLanguage($input);
- self::assertEquals($input, $this->typo3QuerySettings->getRespectSysLanguage());
+ $this->subject->setRespectSysLanguage($input);
+ self::assertEquals($input, $this->subject->getRespectSysLanguage());
}
/**
* @test
*/
- public function setRespectSysLanguageAllowsChaining()
+ public function setRespectSysLanguageAllowsChaining(): void
{
- self::assertTrue($this->typo3QuerySettings->setRespectSysLanguage(true) instanceof QuerySettingsInterface);
+ self::assertTrue($this->subject->setRespectSysLanguage(true) instanceof QuerySettingsInterface);
}
/**
* @test
*/
- public function setLanguageUidAllowsChaining()
+ public function setLanguageUidAllowsChaining(): void
{
- self::assertTrue($this->typo3QuerySettings->setLanguageUid(42) instanceof QuerySettingsInterface);
+ self::assertTrue($this->subject->setLanguageUid(42) instanceof QuerySettingsInterface);
}
/**
* @test
* @dataProvider booleanValueProvider
- *
* @param bool $input
*/
- public function setIgnoreEnableFieldsSetsIgnoreEnableFieldsCorrectly($input)
+ public function setIgnoreEnableFieldsSetsIgnoreEnableFieldsCorrectly(bool $input): void
{
- $this->typo3QuerySettings->setIgnoreEnableFields($input);
- self::assertEquals($input, $this->typo3QuerySettings->getIgnoreEnableFields());
+ $this->subject->setIgnoreEnableFields($input);
+ self::assertEquals($input, $this->subject->getIgnoreEnableFields());
}
/**
* @test
*/
- public function setIgnoreEnableFieldsAllowsChaining()
+ public function setIgnoreEnableFieldsAllowsChaining(): void
{
- self::assertTrue($this->typo3QuerySettings->setIgnoreEnableFields(true) instanceof QuerySettingsInterface);
+ self::assertTrue($this->subject->setIgnoreEnableFields(true) instanceof QuerySettingsInterface);
}
/**
* @test
* @dataProvider arrayValueProvider
- *
* @param array $input
*/
- public function setEnableFieldsToBeIgnoredSetsEnableFieldsToBeIgnoredCorrectly($input)
+ public function setEnableFieldsToBeIgnoredSetsEnableFieldsToBeIgnoredCorrectly(array $input): void
{
- $this->typo3QuerySettings->setEnableFieldsToBeIgnored($input);
- self::assertEquals($input, $this->typo3QuerySettings->getEnableFieldsToBeIgnored());
+ $this->subject->setEnableFieldsToBeIgnored($input);
+ self::assertEquals($input, $this->subject->getEnableFieldsToBeIgnored());
}
/**
* @test
*/
- public function setEnableFieldsToBeIgnoredAllowsChaining()
+ public function setEnableFieldsToBeIgnoredAllowsChaining(): void
{
- self::assertTrue($this->typo3QuerySettings->setEnableFieldsToBeIgnored(['starttime', 'endtime']) instanceof QuerySettingsInterface);
+ self::assertTrue($this->subject->setEnableFieldsToBeIgnored(['starttime', 'endtime']) instanceof QuerySettingsInterface);
}
/**
* @test
* @dataProvider booleanValueProvider
- *
* @param bool $input
*/
- public function setIncludeDeletedSetsIncludeDeletedCorrectly($input)
+ public function setIncludeDeletedSetsIncludeDeletedCorrectly(bool $input): void
{
- $this->typo3QuerySettings->setIncludeDeleted($input);
- self::assertEquals($input, $this->typo3QuerySettings->getIncludeDeleted());
+ $this->subject->setIncludeDeleted($input);
+ self::assertEquals($input, $this->subject->getIncludeDeleted());
}
/**
* @test
*/
- public function setIncludeDeletedAllowsChaining()
+ public function setIncludeDeletedAllowsChaining(): void
{
- self::assertTrue($this->typo3QuerySettings->setIncludeDeleted(true) instanceof QuerySettingsInterface);
+ self::assertTrue($this->subject->setIncludeDeleted(true) instanceof QuerySettingsInterface);
}
}