HexMakina / LeMarchand

LeMarchand.php

Spacing +13 added lines, -13 removed lines

@@ -14,10 +14,10 @@ 
     public const RX_SETTINGS = '/^settings\./';
     public const RX_MODEL_CLASS = '/([a-zA-Z]+)(Class|Model)$/';
 
-    public static function box($settings=null) : ContainerInterface
+    public static function box($settings = null) : ContainerInterface
     {
-      if(is_null(self::$instance)){
-        if(is_array($settings))
+      if (is_null(self::$instance)) {
+        if (is_array($settings))
           return (self::$instance = new LeMarchand($settings));
         throw new LamentException('MVC_TYPE ('.$mvc_type.') UNKOWN');
       }
@@ -48,14 +48,14 @@ 
 
     public function has($configuration)
     {
-      try{
+      try {
         $this->get($configuration);
         return true;
       }
-      catch(NotFoundExceptionInterface $e){
+      catch (NotFoundExceptionInterface $e) {
         return false;
       }
-      catch(ContainerExceptionInterface $e){
+      catch (ContainerExceptionInterface $e) {
         return false;
       }
     }
@@ -84,7 +84,7 @@ 
         // 4. is it a class ?
         if (preg_match(self::RX_MODEL_CLASS, $configuration, $m) === 1) {
             $class_name = $this->cascadeNamespace($m[1], 'Models');
-            if($m[2] === 'Model')
+            if ($m[2] === 'Model')
               return $this->getInstance($class_name);
             else
               return $class_name;
@@ -92,7 +92,7 @@ 
 
         if (preg_match(self::RX_INTERFACE_NAME, $configuration, $m) === 1) {
             $wire = $this->get('settings.interface_implementations');
-            if(isset($wire[$configuration]))
+            if (isset($wire[$configuration]))
               return $this->getInstance($wire[$configuration]);
         }
 
@@ -114,19 +114,19 @@ 
     //     throw new ConfigurationException($controller_name);
     // }
 
-    private function cascadeNamespace($class_name, $mvc_type=null)
+    private function cascadeNamespace($class_name, $mvc_type = null)
     {
         // is the controller name already instantiable ?
-        if(is_null($mvc_type) && class_exists($class_name))
+        if (is_null($mvc_type) && class_exists($class_name))
           return $class_name;
 
-        if($mvc_type !== 'Models' && $mvc_type !== 'Controllers'){
+        if ($mvc_type !== 'Models' && $mvc_type !== 'Controllers') {
             throw new LamentException('MVC_TYPE ('.$mvc_type.') UNKOWN');
         }
 
         // not fully namespaced, lets cascade
         foreach ($this->getSettings('settings.namespaces') as $ns) {
-            if(class_exists($full_name = $ns . $mvc_type . '\\' . $class_name))
+            if (class_exists($full_name = $ns.$mvc_type.'\\'.$class_name))
               return $full_name;
         }
         throw new ConfigurationException($class_name);
@@ -140,7 +140,7 @@ 
             $construction_args = [];
             if (!is_null($rc->getConstructor())) {
                 foreach ($rc->getConstructor()->getParameters() as $param) {
-                    $construction_args [] = $this->get($param->getType() . '');
+                    $construction_args [] = $this->get($param->getType().'');
                 }
                 $instance = $rc->newInstanceArgs($construction_args);
             } else {

Braces +19 added lines, -16 removed lines

@@ -17,8 +17,9 @@ 
     public static function box($settings=null) : ContainerInterface
     {
       if(is_null(self::$instance)){
-        if(is_array($settings))
-          return (self::$instance = new LeMarchand($settings));
+        if(is_array($settings)) {
+                  return (self::$instance = new LeMarchand($settings));
+        }
         throw new LamentException('MVC_TYPE ('.$mvc_type.') UNKOWN');
       }
 
@@ -51,11 +52,9 @@ 
       try{
         $this->get($configuration);
         return true;
-      }
-      catch(NotFoundExceptionInterface $e){
+      } catch(NotFoundExceptionInterface $e){
         return false;
-      }
-      catch(ContainerExceptionInterface $e){
+      } catch(ContainerExceptionInterface $e){
         return false;
       }
     }
@@ -84,16 +83,18 @@ 
         // 4. is it a class ?
         if (preg_match(self::RX_MODEL_CLASS, $configuration, $m) === 1) {
             $class_name = $this->cascadeNamespace($m[1], 'Models');
-            if($m[2] === 'Model')
-              return $this->getInstance($class_name);
-            else
-              return $class_name;
+            if($m[2] === 'Model') {
+                          return $this->getInstance($class_name);
+            } else {
+                          return $class_name;
+            }
         }
 
         if (preg_match(self::RX_INTERFACE_NAME, $configuration, $m) === 1) {
             $wire = $this->get('settings.interface_implementations');
-            if(isset($wire[$configuration]))
-              return $this->getInstance($wire[$configuration]);
+            if(isset($wire[$configuration])) {
+                          return $this->getInstance($wire[$configuration]);
+            }
         }
 
         throw new ConfigurationException($configuration);
@@ -117,8 +118,9 @@ 
     private function cascadeNamespace($class_name, $mvc_type=null)
     {
         // is the controller name already instantiable ?
-        if(is_null($mvc_type) && class_exists($class_name))
-          return $class_name;
+        if(is_null($mvc_type) && class_exists($class_name)) {
+                  return $class_name;
+        }
 
         if($mvc_type !== 'Models' && $mvc_type !== 'Controllers'){
             throw new LamentException('MVC_TYPE ('.$mvc_type.') UNKOWN');
@@ -126,8 +128,9 @@ 
 
         // not fully namespaced, lets cascade
         foreach ($this->getSettings('settings.namespaces') as $ns) {
-            if(class_exists($full_name = $ns . $mvc_type . '\\' . $class_name))
-              return $full_name;
+            if(class_exists($full_name = $ns . $mvc_type . '\\' . $class_name)) {
+                          return $full_name;
+            }
         }
         throw new ConfigurationException($class_name);
     }