Parse config on instantiation (do not defer)

xola · Jul 17, 2014 · 926d7d7 · 926d7d7
1 parent f7ad5ba
commit 926d7d7
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/Service/Omnipay.php b/Service/Omnipay.php
@@ -14,7 +14,21 @@ class Omnipay
 
     public function __construct(Container $container)
     {
-        $this->parameters = $container->getParameterBag()->all();
+        $this->initConfig($container->getParameterBag()->all());
+    }
+
+    private function initConfig($parameters)
+    {
+        $key = 'omnipay';
+        $configs = array($key);
+        foreach ($parameters as $param => $value) {
+            if (!preg_match("/^$key/", $param)) {
+                continue;
+            }
+            $this->assignArrayByPath($configs, $param, $value);
+        }
+
+        $this->config = isset($configs[$key]) ? $configs[$key] : null;
     }
 
     /**
@@ -86,20 +100,6 @@ public function getGatewayName($key)
 
     public function getConfig()
     {
-        if (!isset($this->config)) {
-            // Config has not been parsed yet. So do it.
-            $key = 'omnipay';
-            $configs = array($key);
-            foreach ($this->parameters as $param => $value) {
-                if (!preg_match("/^$key/", $param)) {
-                    continue;
-                }
-                $this->assignArrayByPath($configs, $param, $value);
-            }
-
-            $this->config = isset($configs[$key]) ? $configs[$key] : null;
-        }
-
         return $this->config;
     }