@@ -96,17 +96,13 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | if ($this->isFirstLevelKey($configuration)) { |
| 98 | 98 | $ret = $this->configurations[$configuration]; |
| 99 | - } |
|
| 100 | - elseif ($this->isSettings($configuration)) { |
|
| 99 | + } elseif ($this->isSettings($configuration)) { |
|
| 101 | 100 | $ret = $this->getSettings($configuration); |
| 102 | - } |
|
| 103 | - elseif (class_exists($configuration)) { |
|
| 101 | + } elseif (class_exists($configuration)) { |
|
| 104 | 102 | $ret = $this->getInstance($configuration); |
| 105 | - } |
|
| 106 | - elseif ($this->isInterface($configuration)) { |
|
| 103 | + } elseif ($this->isInterface($configuration)) { |
|
| 107 | 104 | $ret = $this->wireInstance($configuration); |
| 108 | - } |
|
| 109 | - elseif ($this->hasModelOrController($configuration)) { |
|
| 105 | + } elseif ($this->hasModelOrController($configuration)) { |
|
| 110 | 106 | // 5. is it cascadable ? |
| 111 | 107 | preg_match(self::RX_MVC, $configuration, $m); |
| 112 | 108 | |
@@ -114,15 +110,15 @@ discard block |
||
| 114 | 110 | |
| 115 | 111 | if($this->hasClassNameModifier($configuration)){ |
| 116 | 112 | $ret = $class_name; |
| 117 | - } |
|
| 118 | - elseif($this->hasNewInstanceModifier($configuration)){ |
|
| 113 | + } elseif($this->hasNewInstanceModifier($configuration)){ |
|
| 119 | 114 | $ret = $this->makeInstance($class_name); |
| 120 | 115 | } |
| 121 | 116 | $ret = $this->getInstance($class_name); |
| 122 | 117 | } |
| 123 | 118 | |
| 124 | - if(is_null($ret)) |
|
| 125 | - throw new NotFoundException($configuration); |
|
| 119 | + if(is_null($ret)) { |
|
| 120 | + throw new NotFoundException($configuration); |
|
| 121 | + } |
|
| 126 | 122 | |
| 127 | 123 | return $ret; |
| 128 | 124 | } |