From 96d0ce1c20f5b16d4d91ea5b107ddbc3a090c939 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Mon, 17 Apr 2017 09:55:50 +1000
Subject: [PATCH] Add mergeConfig helper, useful for extension Refs
 https://github.com/octobercms/docs/commit/8575ece07d9de9cca8d624b71015d3cd543555de

---
 modules/system/traits/ConfigMaker.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/system/traits/ConfigMaker.php b/modules/system/traits/ConfigMaker.php
index 4ca58d8e7..c01252581 100644
--- a/modules/system/traits/ConfigMaker.php
+++ b/modules/system/traits/ConfigMaker.php
@@ -183,4 +183,20 @@ trait ConfigMaker
         $guessedPath = $classFile ? $classFile . '/' . $classFolder . $suffix : null;
         return $guessedPath;
     }
+
+    /**
+     * Merges two configuration sources, either prepared or not, and returns
+     * them as a single configuration object.
+     * @param mixed $configA
+     * @param mixed $configB
+     * @return stdClass The config object
+     */
+    public function mergeConfig($configA, $configB)
+    {
+        $configA = $this->makeConfig($configA);
+
+        $configB = $this->makeConfig($configB);
+
+        return (object) array_merge((array) $configA, (array) $configB);
+    }
 }