danielsiepmann/tea
danielsiepmann/tea
1
0
mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-09-19 23:36:13 +02:00
Code Activity

[BUGFIX] Configure DI and avoid using ObjectManager in TYPO3 11LTS (#399)

Browse source 
`ObjectManager` is deprecated in V11.

Fixes #387
This commit is contained in:
Oliver Klee 2022-03-02 02:07:25 +01:00 committed by GitHub
parent 934f43572f
commit a1a84a511f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php
View file

@ -14,10 +14,20 @@ use TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface;
*/ */
trait StoragePageAgnosticTrait trait StoragePageAgnosticTrait
{ {
/**
* @var QuerySettingsInterface
*/
private $querySettings;
public function injectQuerySettings(QuerySettingsInterface $querySettings): void
{
$this->querySettings = $querySettings;
}
public function initializeObject(): void public function initializeObject(): void
{ {
/** @var QuerySettingsInterface $querySettings */ $querySettings = clone $this->querySettings;
$querySettings = $this->objectManager->get(QuerySettingsInterface::class);
$querySettings->setRespectStoragePage(false); $querySettings->setRespectStoragePage(false);
$this->setDefaultQuerySettings($querySettings); $this->setDefaultQuerySettings($querySettings);
} }

9
Configuration/Services.yaml Normal file
View file

@ -0,0 +1,9 @@
services:
_defaults:
autowire: true
autoconfigure: true
public: false
TTN\Tea\:
resource: '../Classes/*'
exclude: '../Classes/Domain/Model/*'

13
Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php
View file

@ -6,6 +6,7 @@ namespace TTN\Tea\Tests\Functional\Domain\Repository\Product;
use TTN\Tea\Domain\Model\Product\Tea; use TTN\Tea\Domain\Model\Product\Tea;
use TTN\Tea\Domain\Repository\Product\TeaRepository; use TTN\Tea\Domain\Repository\Product\TeaRepository;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Domain\Model\FileReference; use TYPO3\CMS\Extbase\Domain\Model\FileReference;
use TYPO3\CMS\Extbase\Object\ObjectManager; use TYPO3\CMS\Extbase\Object\ObjectManager;
@ -38,9 +39,15 @@ class TeaRepositoryTest extends FunctionalTestCase
$this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class); $this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
/** @var ObjectManager $objectManager */ /** @var Typo3Version $versionInformation */
$objectManager = GeneralUtility::makeInstance(ObjectManager::class); $versionInformation = GeneralUtility::makeInstance(Typo3Version::class);
$this->subject = $objectManager->get(TeaRepository::class); if ($versionInformation->getMajorVersion() >= 11) {
$this->subject = $this->getContainer()->get(TeaRepository::class);
} else {
/** @var ObjectManager $objectManager */
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$this->subject = $objectManager->get(TeaRepository::class);
}
} }
/** /**