Fix some typos in constructor and getWithMerge method.

consolidation · Jun 26, 2017 · 5fec42d · 5fec42d
1 parent a8d0e1a
commit 5fec42d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/Util/ApplyConfig.php b/src/Util/ApplyConfig.php
@@ -21,7 +21,7 @@ class ApplyConfig
 {
     protected $config;
 
-    public function __constructor($config, $group, $prefix = '', $postfix = '.')
+    public function __construct($config, $group, $prefix = '', $postfix = '.')
     {
         if (!empty($group) && empty($postfix)) {
             $postfix = '.';

diff --git a/src/Util/ConfigGroup.php b/src/Util/ConfigGroup.php
@@ -24,7 +24,7 @@ abstract class ConfigGroup
     protected $prefix;
     protected $postfix;
 
-    public function __constructor($config, $group, $prefix = '', $postfix = '.')
+    public function __construct($config, $group, $prefix = '', $postfix = '.')
     {
         $this->config = $config;
         $this->group = $group;

diff --git a/src/Util/ConfigMerge.php b/src/Util/ConfigMerge.php
@@ -22,16 +22,16 @@ public function getWithMerge($key, $group, $prefix = '', $postfix = '.')
     {
         $configKey = "{$prefix}{$group}${postfix}{$key}";
         $result = [];
-        if ($this->has($configKey)) {
-            $result = $this->get($configKey);
-        } elseif ($this->hasDefault($configKey)) {
-            $result = $this->getDefault($configKey);
+        if ($this->config->has($configKey)) {
+            $result = $this->config->get($configKey);
+        } elseif ($this->config->hasDefault($configKey)) {
+            $result = $this->config->getDefault($configKey);
         }
         if (!is_array($result)) {
             throw new \UnexpectedValueException($configKey . ' must be a list of settings to apply.');
         }
-        $moreGeneralGroupname = preg_replace('#\.[^.]*$#', '', $group);
-        if ($moreGeneralGroupname != $group) {
+        $moreGeneralGroupname = $this->moreGeneralGroupName($group);
+        if ($moreGeneralGroupname) {
             $result += $this->getWithMerge($key, $moreGeneralGroupname, $prefix, $postfix);
         }
         return $result;