@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use BEAR\Package\Exception\InvalidModuleException; |
| 10 | 10 | use Ray\Di\AbstractModule; |
| 11 | 11 | use Ray\Di\AssistedModule; |
| 12 | -use Ray\Di\NullModule; |
|
| 13 | 12 | |
| 14 | 13 | class Module |
| 15 | 14 | { |
@@ -21,17 +21,17 @@ |
||
| 21 | 21 | $contextsArray = array_reverse(explode('-', $context)); |
| 22 | 22 | $module = new AssistedModule; |
| 23 | 23 | foreach ($contextsArray as $contextItem) { |
| 24 | - $class = $appMeta->name . '\Module\\' . ucwords($contextItem) . 'Module'; |
|
| 25 | - if (! class_exists($class)) { |
|
| 26 | - $class = 'BEAR\Package\Context\\' . ucwords($contextItem) . 'Module'; |
|
| 24 | + $class = $appMeta->name.'\Module\\'.ucwords($contextItem).'Module'; |
|
| 25 | + if (!class_exists($class)) { |
|
| 26 | + $class = 'BEAR\Package\Context\\'.ucwords($contextItem).'Module'; |
|
| 27 | 27 | } |
| 28 | - if (! is_a($class, AbstractModule::class, true)) { |
|
| 28 | + if (!is_a($class, AbstractModule::class, true)) { |
|
| 29 | 29 | throw new InvalidContextException($contextItem); |
| 30 | 30 | } |
| 31 | 31 | /* @var $module AbstractModule */ |
| 32 | 32 | $module = is_subclass_of($class, AbstractAppModule::class) ? new $class($appMeta, $module) : new $class($module); |
| 33 | 33 | } |
| 34 | - if (! $module instanceof AbstractModule) { |
|
| 34 | + if (!$module instanceof AbstractModule) { |
|
| 35 | 35 | throw new InvalidModuleException; // @codeCoverageIgnore |
| 36 | 36 | } |
| 37 | 37 | $module->override(new AppMetaModule($appMeta)); |