HexMakina / LeMarchand

LeMarchand.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
   public function __debugInfo() : array
   {
     $dbg = get_object_vars($this);
-    $dbg['configurations']['template_engine'] = isset($dbg['configurations']['template_engine'])? get_class($dbg['configurations']['template_engine']) : 'NOT SET';
+    $dbg['configurations']['template_engine'] = isset($dbg['configurations']['template_engine']) ? get_class($dbg['configurations']['template_engine']) : 'NOT SET';
 
     return $dbg;
   }
@@ -34,45 +34,45 @@ 
   public function get($configuration)
   {
     
-    if(!is_string($configuration))
+    if (!is_string($configuration))
       throw new LamentException($configuration);
 
-    if($this->has($configuration))
+    if ($this->has($configuration))
       return $this->configurations[$configuration];
 
     
     // fallbacks
-    if(preg_match('/^settings\./', $configuration, $m) === 1)
+    if (preg_match('/^settings\./', $configuration, $m) === 1)
     {
       $ret = $this->configurations;
-      foreach(explode('.', $configuration) as $k)
+      foreach (explode('.', $configuration) as $k)
       {
-        if(!isset($ret[$k]))
+        if (!isset($ret[$k]))
           throw new ConfigurationException($configuration);
         $ret = $ret[$k];
       }
 
       return $ret;
     }
-    elseif(class_exists($configuration)) // auto create instances
+    elseif (class_exists($configuration)) // auto create instances
     {
       
       $rc = new \ReflectionClass($configuration);
 
       $construction_args = [];
       $instance = null;
-      if(!is_null($rc->getConstructor()))
+      if (!is_null($rc->getConstructor()))
       {
-        foreach($rc->getConstructor()->getParameters() as $param)
+        foreach ($rc->getConstructor()->getParameters() as $param)
         {
-          $construction_args []= $this->get($param->getType().'');
+          $construction_args [] = $this->get($param->getType().'');
         }
         $instance = $rc->newInstanceArgs($construction_args);
       }
       else 
         $instance = $rc->newInstanceArgs();
 
-      if($rc->hasMethod('set_container'))
+      if ($rc->hasMethod('set_container'))
         $instance->set_container($this);
       
       return $instance;

Braces +17 added lines, -12 removed lines

@@ -34,11 +34,13 @@ 
   public function get($configuration)
   {
     
-    if(!is_string($configuration))
-      throw new LamentException($configuration);
+    if(!is_string($configuration)) {
+          throw new LamentException($configuration);
+    }
 
-    if($this->has($configuration))
-      return $this->configurations[$configuration];
+    if($this->has($configuration)) {
+          return $this->configurations[$configuration];
+    }
 
     
     // fallbacks
@@ -47,17 +49,19 @@ 
       $ret = $this->configurations;
       foreach(explode('.', $configuration) as $k)
       {
-        if(!isset($ret[$k]))
-          throw new ConfigurationException($configuration);
+        if(!isset($ret[$k])) {
+                  throw new ConfigurationException($configuration);
+        }
         $ret = $ret[$k];
       }
 
       return $ret;
-    }
-    elseif(class_exists($configuration)) // auto create instances
+    } elseif(class_exists($configuration)) {
+      // auto create instances
     {
       
       $rc = new \ReflectionClass($configuration);
+    }
 
       $construction_args = [];
       $instance = null;
@@ -68,12 +72,13 @@ 
           $construction_args []= $this->get($param->getType().'');
         }
         $instance = $rc->newInstanceArgs($construction_args);
+      } else {
+              $instance = $rc->newInstanceArgs();
       }
-      else 
-        $instance = $rc->newInstanceArgs();
 
-      if($rc->hasMethod('set_container'))
-        $instance->set_container($this);
+      if($rc->hasMethod('set_container')) {
+              $instance->set_container($this);
+      }
       
       return $instance;
     }