EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2022-05-29 12:41:12 +02:00
parent 6be75c968a 8b547c3524
commit 0d67e01bec
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/FilterService.php
+4 -15
View File
@@ -8,6 +8,7 @@ use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use TYPO3\CMS\Core\SingletonInterface; use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
class FilterService implements SingletonInterface class FilterService implements SingletonInterface
@@ -15,19 +16,6 @@ class FilterService implements SingletonInterface
public const DURATION_SHORT = 4; public const DURATION_SHORT = 4;
public const DURATION_LONG = 5; public const DURATION_LONG = 5;
/**
* @var ConfigurationManagerInterface
*/
protected $configurationManager;
/**
* @param ConfigurationManagerInterface $configurationManager
*/
public function __construct(ConfigurationManagerInterface $configurationManager)
{
$this->configurationManager = $configurationManager;
}
public function getNormalizedFilterSettings(array $filterSettings = [], array $forcedConceptUids = []): array public function getNormalizedFilterSettings(array $filterSettings = [], array $forcedConceptUids = []): array
{ {
$optionsResolver = new OptionsResolver(); $optionsResolver = new OptionsResolver();
@@ -323,8 +311,9 @@ class FilterService implements SingletonInterface
protected function getTypoScriptSettings(): array protected function getTypoScriptSettings(): array
{ {
$settings = $this /** @var ConfigurationManager $configurationManager */
->configurationManager $configurationManager = GeneralUtility::makeInstance(ConfigurationManager::class);
$settings = $configurationManager
->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT); ->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
return $settings['plugin.']['tx_epproducts.']['settings.']; return $settings['plugin.']['tx_epproducts.']['settings.'];
public/typo3conf/ext/ep_products/Classes/Service/ProductDataService.php
+5 -1
View File
@@ -77,11 +77,15 @@ class ProductDataService implements SingletonInterface
* *
* @return array * @return array
*/ */
public function getTeaser(array $filterSettings): array public function getTeaser(array $filterSettings): ?array
{ {
$teaserData = $this->productRepository->getTeasers($filterSettings); $teaserData = $this->productRepository->getTeasers($filterSettings);
$teasers = $this->preprocessTeasergroup($teaserData); $teasers = $this->preprocessTeasergroup($teaserData);
if (0 === count($teasers)) {
return null;
}
return reset($teasers); return reset($teasers);
} }