From f75503a52ed1cad8357607cfcce4fdb032579101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Wed, 20 Oct 2021 18:46:46 +0200
Subject: [PATCH] Code cleanup

---
 .../Classes/Domain/Repository/AbstractRepository.php        | 2 +-
 .../ext/ep_products/Classes/Service/FilterService.php       | 6 ------
 .../Resources/Private/Assets/scss/components/_forms.scss    | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php
index 8d7d2e70..8709c127 100644
--- a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php
+++ b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php
@@ -226,7 +226,7 @@ abstract class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Reposit
      * @param array $filterSettings
      * @param bool $constraintDates
      */
-    protected function addFiltersettingsConditions(QueryBuilder $query, array $filterSettings, $constraintDates = true)
+    protected function addFiltersettingsConditions(QueryBuilder $query, array $filterSettings, bool $constraintDates = true)
     {
         if ($constraintDates) {
             $this->addDateFilterConditions($query, $filterSettings);
diff --git a/public/typo3conf/ext/ep_products/Classes/Service/FilterService.php b/public/typo3conf/ext/ep_products/Classes/Service/FilterService.php
index bc4087e4..c5e9f84f 100644
--- a/public/typo3conf/ext/ep_products/Classes/Service/FilterService.php
+++ b/public/typo3conf/ext/ep_products/Classes/Service/FilterService.php
@@ -31,9 +31,7 @@ use EP\EpProducts\Domain\Model\FilterOptions;
 use EP\EpProducts\Domain\Repository\DateRepository;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use TYPO3\CMS\Core\SingletonInterface;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
 
 class FilterService implements SingletonInterface
 {
@@ -197,9 +195,6 @@ class FilterService implements SingletonInterface
         $boardTypes = [];
         $dateMin = $dateMax = null;
 
-        $absPath = ExtensionManagementUtility::extPath('ep_theme');
-        $baseUrl = '/' . PathUtility::stripPathSitePrefix($absPath);
-
         foreach ($filterOptionsData as $row) {
             // Date
             if (null === $dateMin || $row['dateStart'] < $dateMin) {
@@ -237,7 +232,6 @@ class FilterService implements SingletonInterface
                         'uid' => $row['countryUid'],
                         'label' => $row['countryName'],
                         'code' => $row['countryCode'],
-                        'flag' => $baseUrl . 'Resources/Public/images/' . strtolower($row['countryCode']) . '.png',
                     ],
                     'regions' => [],
                 ];
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_forms.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_forms.scss
index e029efdf..2bdaed92 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_forms.scss
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_forms.scss
@@ -8,7 +8,7 @@
 
 .form-checkbox,
 .form-radio {
-    @apply border-gray-400 focus:border-gray-800 ring-0 focus:ring-0 text-ep-secondary sbw:text-sbw-secondary uch:text-uch-secondary h-4 w-4 ;
+    @apply border-gray-400 focus:border-gray-800 ring-0 focus:ring-0 text-ep-secondary sbw:text-sbw-secondary uch:text-uch-secondary h-4 w-4;
 
     &--has-error {
         @apply border-red-500;