Refactor Fetch class

Author: Gregor Pollak

Provider/Fetch.php

@@ -38,22 +38,38 @@ public function values(string $path, array $scopes): array
     {
         $levels = $this->getPathLevels($path);
 
-        if (!$this->configCache) {
-            $this->configCache = $this->config->get('system');
-        }
+        $configCache = $this->getConfigCache();
 
         $values = array_fill_keys($scopes, []);
-        $defaultScopeValues = $this->getScopeValues($this->configCache['default'], $levels);
+        $defaultScopeValues = $this->getScopeValues($configCache['default'], $levels);
 
-        foreach ($scopes as $scope) {
-            if (!isset($this->configCache[$scope])) {
-                throw new InvalidArgumentException(__('Invalid scope key: ' . $scope));
-            }
-            if ($scope === 'default') {
-                $values[$scope] = $defaultScopeValues;
-                continue;
+        if (($key = array_search('default', $scopes)) !== false) {
+            $values['default'] = $defaultScopeValues;
+            unset($scopes[$key]);
+        }
+
+        $values = array_merge_recursive(
+            $values,
+            $this->getNonDefaultScopeValues($scopes, $levels, $defaultScopeValues)
+        );
+
+        foreach ($values as $scope => $scopeData) {
+            if (count($scopeData) == 0) {
+                unset($values[$scope]);
             }
+        }
 
+        return $values;
+    }
+
+    private function getNonDefaultScopeValues(
+        array $scopes,
+        array $levels,
+        array $defaultScopeValues
+    ): array {
+        $values = [];
+        foreach ($scopes as $scope) {
+            $values[$scope] = [];
             foreach ($this->configCache[$scope] as $scopeKey => $scopeData) {
                 if (is_numeric($scopeKey) || in_array($scopeKey, ['admin', 'default'])) {
                     continue;
@@ -68,12 +84,6 @@ public function values(string $path, array $scopes): array
             }
         }
 
-        foreach ($values as $scope => $scopeData) {
-            if (count($scopeData) == 0) {
-                unset($values[$scope]);
-            }
-        }
-
         return $values;
     }
 
@@ -109,33 +119,56 @@ protected function getScopeValues(array $scopeData, array $levels): array
             return [];
         }
 
-        $scopeData = $scopeData[$level1];
-        if ($level2 === '*' && $level3 === '*') {
-            return [$level1 => $scopeData];
+        if ($wildcardScopes = $this->getL3WildCardScopes($levels, $scopeData)) {
+            return $wildcardScopes;
         }
 
-        if ($level2 !== '*' && $level3 === '*') {
-            return [$level1 => [$level2 => $scopeData[$level2]]];
+        if ($wildcardScopes = $this->getL2WildCardScopes($levels, $scopeData)) {
+            return $wildcardScopes;
         }
 
-        if ($level2 === '*' && $level3 !== '*') {
-            $values = [$level1 => []];
-            foreach ($scopeData as $level2 => $l3scopeData) {
-                foreach ($l3scopeData as $key => $value) {
-                    if ($key === $level3) {
-                        $values[$level1][$level2] = $values[$level1][$level2] ?? [];
-                        $values[$level1][$level2][$level3] = $value;
-                    }
+        $scopeData = $scopeData[$level1];
+        if (isset($scopeData[$level2]) && isset($scopeData[$level2][$level3])) {
+            return [$level1 => [$level2 => [$level3 => $scopeData[$level2][$level3]]]];
+        }
+
+        return [];
+    }
+
+    private function getL2WildCardScopes(array $levels, array $scopeData): ?array
+    {
+        [$level1, $level2, $level3] = $levels;
+
+        $scopeData = $scopeData[$level1];
+        if ($level2 !== '*') {
+            return null;
+        }
+        $values = [$level1 => []];
+        foreach ($scopeData as $level2 => $l3scopeData) {
+            foreach ($l3scopeData as $key => $value) {
+                if ($key === $level3) {
+                    $values[$level1][$level2] = $values[$level1][$level2] ?? [];
+                    $values[$level1][$level2][$level3] = $value;
                 }
             }
-            return $values;
         }
+        return $values;
+    }
 
-        if (isset($scopeData[$level2]) && isset($scopeData[$level2][$level3])) {
-            return [$level1 => [$level2 => [$level3 => $scopeData[$level2][$level3]]]];
+    private function getL3WildCardScopes(array $levels, array $scopeData): ?array
+    {
+        [$level1, $level2, $level3] = $levels;
+
+        $scopeData = $scopeData[$level1];
+        if ($level2 === '*' && $level3 === '*') {
+            return [$level1 => $scopeData];
         }
 
-        return [];
+        if ($level2 !== '*' && $level3 === '*') {
+            return [$level1 => [$level2 => $scopeData[$level2]]];
+        }
+
+        return null;
     }
 
     /**
@@ -158,4 +191,13 @@ protected function getPathLevels(string $path): array
 
         return $levels;
     }
+
+    private function getConfigCache(): array
+    {
+        if (!$this->configCache) {
+            $this->configCache = $this->config->get('system');
+        }
+
+        return $this->configCache;
+    }
 }