Add return types and trim filter values before exploding

EmicoEcommerce · Dec 8, 2021 · 259f0f7 · 259f0f7
1 parent ec59255
commit 259f0f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Model/Config.php b/Model/Config.php
@@ -390,17 +390,24 @@ public function getFilterWhitelist(Store $store = null)
      * @param Store|null $store
      * @return array
      */
-    public function getFilterValuesWhitelist(Store $store = null)
+    public function getFilterValuesWhitelist(Store $store = null): array
     {
         $filterList = $this->getStoreConfig('tweakwise/seo/filter_values_whitelist', $store);
+
+        if (empty($filterList)) {
+            return [];
+        }
+
+        $filterList = trim($filterList);
+
         $filterListExploded = explode(',', $filterList) ?: [];
         if (empty($filterListExploded)) {
             return [];
         }
 
         $return = [];
         foreach ($filterListExploded as $listItem) {
-            $item = explode('=', $listItem) ?: null;
+            $item = explode('=', trim($listItem)) ?: null;
             if ($item === null) {
                 continue;
             }

diff --git a/Model/Seo/FilterHelper.php b/Model/Seo/FilterHelper.php
@@ -118,7 +118,7 @@ protected function getAttributeCodeFromFilterItem(Item $item)
      * @param Item $item
      * @return string|null
      */
-    protected function getAttributeValueFromFilterItem(Item $item)
+    protected function getAttributeValueFromFilterItem(Item $item): ?string
     {
         return $item->getAttribute()->getTitle();
     }
@@ -174,13 +174,11 @@ protected function isFilterValueItemInWhiteList(Item $item): bool
             return false;
         }
 
-        $isIn = \in_array(
+        return \in_array(
             strtolower($attributeValue),
             array_map('strtolower', $filterValuesWhiteList[$attributeCode]),
             true
         );
-
-        return $isIn;
     }
 
     /**