HexMakina / LeMarchand

LeMarchand.php

Spacing +13 added lines, -13 removed lines

@@ -65,7 +65,7 @@ 
 
         foreach ($dbg['interface_wiring'] as $interface => $wire) {
             if (is_array($wire)) {
-                $wire = array_shift($wire) . ' --array #' . count($wire);
+                $wire = array_shift($wire).' --array #'.count($wire);
             }
             $dbg['interface_wiring'][$interface] = $wire;
         }
@@ -110,44 +110,44 @@ 
             // 5. is it cascadable ?
             preg_match(self::RX_MVC, $configuration, $m);
 
-            $class_name = $this->cascadeNamespace($m[1] . '\\' . $m[2]);
+            $class_name = $this->cascadeNamespace($m[1].'\\'.$m[2]);
 
-            if($this->hasClassNameModifier($configuration)){
+            if ($this->hasClassNameModifier($configuration)) {
               $ret = $class_name;
             }
-            elseif($this->hasNewInstanceModifier($configuration)){
+            elseif ($this->hasNewInstanceModifier($configuration)) {
               $ret = $this->makeInstance($class_name);
             }
             $ret = $this->getInstance($class_name);
         }
 
-        if(is_null($ret))
+        if (is_null($ret))
           throw new NotFoundException($configuration);
 
         return $ret;
     }
 
-    private function isFirstLevelKey($configuration){
+    private function isFirstLevelKey($configuration) {
       return isset($this->configurations[$configuration]);
     }
 
-    private function isSettings($configuration){
+    private function isSettings($configuration) {
       return preg_match(self::RX_SETTINGS, $configuration) === 1;
     }
 
-    private function isInterface($configuration){
+    private function isInterface($configuration) {
       return preg_match(self::RX_INTERFACE, $configuration) === 1;
     }
 
-    private function isModelOrController($configuration){
+    private function isModelOrController($configuration) {
       return preg_match(self::RX_MVC, $configuration) === 1;
     }
 
-    private function hasClassNameModifier($configuration){
+    private function hasClassNameModifier($configuration) {
       return strpos($configuration, '::class') !== false;
     }
 
-    private function hasNewInstanceModifier($configuration){
+    private function hasNewInstanceModifier($configuration) {
       return strpos($configuration, '::new') !== false;
     }
 
@@ -189,7 +189,7 @@ 
 
         // not fully namespaced, lets cascade
         foreach ($this->namespace_cascade as $ns) {
-            if (class_exists($fully_namespaced = $ns . $class_name)) {
+            if (class_exists($fully_namespaced = $ns.$class_name)) {
                 $this->resolved($class_name, $fully_namespaced);
                 return $fully_namespaced;
             }
@@ -283,7 +283,7 @@ 
                 if ($param->getType()) {
                     $construction_args [] = $this->get($param->getType()->getName());
                 } else {
-                    $setting = 'settings.Constructor.' . $constructor->class . '.' . $param->getName();
+                    $setting = 'settings.Constructor.'.$constructor->class.'.'.$param->getName();
                     $construction_args [] = $this->getSettings($setting);
                 }
                 // } catch (NotFoundExceptionInterface $e) {

Braces +8 added lines, -12 removed lines

@@ -96,17 +96,13 @@ 
 
         if ($this->isFirstLevelKey($configuration)) {
             $ret = $this->configurations[$configuration];
-        }
-        elseif ($this->isSettings($configuration)) {
+        } elseif ($this->isSettings($configuration)) {
             $ret = $this->getSettings($configuration);
-        }
-        elseif (class_exists($configuration)) {
+        } elseif (class_exists($configuration)) {
             $ret = $this->getInstance($configuration);
-        }
-        elseif ($this->isInterface($configuration)) {
+        } elseif ($this->isInterface($configuration)) {
             $ret = $this->wireInstance($configuration);
-        }
-        elseif ($this->hasModelOrController($configuration)) {
+        } elseif ($this->hasModelOrController($configuration)) {
             // 5. is it cascadable ?
             preg_match(self::RX_MVC, $configuration, $m);
 
@@ -114,15 +110,15 @@ 
 
             if($this->hasClassNameModifier($configuration)){
               $ret = $class_name;
-            }
-            elseif($this->hasNewInstanceModifier($configuration)){
+            } elseif($this->hasNewInstanceModifier($configuration)){
               $ret = $this->makeInstance($class_name);
             }
             $ret = $this->getInstance($class_name);
         }
 
-        if(is_null($ret))
-          throw new NotFoundException($configuration);
+        if(is_null($ret)) {
+                  throw new NotFoundException($configuration);
+        }
 
         return $ret;
     }