@@ -104,13 +104,13 @@ discard block |
||
| 104 | 104 | $class_name = $this->cascadeNamespace($m[1].'\\'.$m[2]); |
| 105 | 105 | // vd($configuration, $class_name); |
| 106 | 106 | |
| 107 | - if(!isset($m[3])) |
|
| 107 | + if (!isset($m[3])) |
|
| 108 | 108 | return $this->getInstance($class_name); |
| 109 | 109 | |
| 110 | - if($m[3] === '::class') |
|
| 110 | + if ($m[3] === '::class') |
|
| 111 | 111 | return $class_name; |
| 112 | 112 | |
| 113 | - if($m[3] === '::new') |
|
| 113 | + if ($m[3] === '::new') |
|
| 114 | 114 | return $this->makeInstance($class_name); |
| 115 | 115 | } |
| 116 | 116 | |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | // not fully namespaced, lets cascade |
| 163 | 163 | foreach ($this->namespace_cascade as $ns) { |
| 164 | - if (class_exists($fully_namespaced = $ns . $class_name)) { |
|
| 164 | + if (class_exists($fully_namespaced = $ns.$class_name)) { |
|
| 165 | 165 | $this->resolved($class_name, $fully_namespaced); |
| 166 | 166 | return $fully_namespaced; |
| 167 | 167 | } |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | |
| 209 | 209 | private function getInstance($class, $construction_args = []) |
| 210 | 210 | { |
| 211 | - if(isset($this->instance_cache[$class])) |
|
| 211 | + if (isset($this->instance_cache[$class])) |
|
| 212 | 212 | return $this->instance_cache[$class]; |
| 213 | 213 | |
| 214 | 214 | return $this->makeInstance($class, $construction_args); |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | if ($param->getType()) { |
| 257 | 257 | $construction_args [] = $this->get($param->getType()->getName()); |
| 258 | 258 | } else { |
| 259 | - $setting = 'settings.Constructor.' . $constructor->class . '.' . $param->getName(); |
|
| 259 | + $setting = 'settings.Constructor.'.$constructor->class.'.'.$param->getName(); |
|
| 260 | 260 | $construction_args [] = $this->getSettings($setting); |
| 261 | 261 | } |
| 262 | 262 | // } catch (NotFoundExceptionInterface $e) { |
@@ -104,14 +104,17 @@ discard block |
||
| 104 | 104 | $class_name = $this->cascadeNamespace($m[1].'\\'.$m[2]); |
| 105 | 105 | // vd($configuration, $class_name); |
| 106 | 106 | |
| 107 | - if(!isset($m[3])) |
|
| 108 | - return $this->getInstance($class_name); |
|
| 107 | + if(!isset($m[3])) { |
|
| 108 | + return $this->getInstance($class_name); |
|
| 109 | + } |
|
| 109 | 110 | |
| 110 | - if($m[3] === '::class') |
|
| 111 | - return $class_name; |
|
| 111 | + if($m[3] === '::class') { |
|
| 112 | + return $class_name; |
|
| 113 | + } |
|
| 112 | 114 | |
| 113 | - if($m[3] === '::new') |
|
| 114 | - return $this->makeInstance($class_name); |
|
| 115 | + if($m[3] === '::new') { |
|
| 116 | + return $this->makeInstance($class_name); |
|
| 117 | + } |
|
| 115 | 118 | } |
| 116 | 119 | |
| 117 | 120 | // if it is an interface, we respond with an instance |
@@ -208,8 +211,9 @@ discard block |
||
| 208 | 211 | |
| 209 | 212 | private function getInstance($class, $construction_args = []) |
| 210 | 213 | { |
| 211 | - if(isset($this->instance_cache[$class])) |
|
| 212 | - return $this->instance_cache[$class]; |
|
| 214 | + if(isset($this->instance_cache[$class])) { |
|
| 215 | + return $this->instance_cache[$class]; |
|
| 216 | + } |
|
| 213 | 217 | |
| 214 | 218 | return $this->makeInstance($class, $construction_args); |
| 215 | 219 | } |