Merge pull request #5 from Alegzander/fix-bootstrap

removed getModuleNested method, because its broken
Alegzander · Jun 3, 2016 · 9978b43 · 9978b43
2 parents 6854022 + 45b14dc
commit 9978b43
Showing 1 changed file with 2 additions and 23 deletions.
diff --git a/Bootstrap.php b/Bootstrap.php
@@ -44,10 +44,8 @@ class Bootstrap implements \yii\base\BootstrapInterface
      */
     public function bootstrap($app)
     {
-        /** @var $module Module */
-        $module = $this->getModuleNested('oauth2', $app);
-
-        if ($module instanceof Module) {
+        /** @var $module Module */ 
+        if ($app->hasModule('oauth2') && $module = $app->getModule('oauth2') instanceof Module) {
             $this->_modelMap = array_merge($this->_modelMap, $module->modelMap);
             foreach ($this->_modelMap as $name => $definition) {
                 \Yii::$container->set("filsh\\yii2\\oauth2server\\models\\" . $name, $definition);
@@ -65,23 +63,4 @@ public function bootstrap($app)
             }
         }
     }
-
-    public function getModuleNested($needle, $app)
-    {
-        /** @var $module Module */
-        if (($module = $app->getModule($needle)) !== null)
-            return $module;
-
-        foreach ($app->getModules() as $id => $module) {
-            $server = $app->getModule($id)->getModule($needle);
-            if ($server != null) {
-                return $server;
-            } else {
-                $this->getModuleNested($module->getModules());
-            }
-        }
-
-        return false;
-    }
-
 }