Theme bootstrap and layout fix

core/base/Module.php

@@ -189,10 +189,6 @@ public function init()
  throw new InvalidConfigException(sprintf('The required component "%s" is not registered in the configuration file', $component));
  }
  }
-
- if (Yii::$app->themeManager->hasActiveTheme) {
- $this->layout = Yii::$app->themeManager->activeTheme->layout;
- }
 
  static::onLoad();
  }

core/theme/ThemeManager.php

@@ -128,11 +128,12 @@ protected function getActiveThemeBasePath()
  /**
  * Get all theme configs as array list.
  *
+ * @param bool $throwException
+ *
  * @return ThemeConfig[]
- * @throws Exception
- * @throws InvalidConfigException
+ * @throws \yii\base\Exception
  */
- public function getThemes()
+ public function getThemes($throwException = true)
  {
  if ($this->_themes) {
  return $this->_themes;
@@ -141,8 +142,14 @@ public function getThemes()
  $themeDefinitions = $this->getThemeDefinitions();
 
  foreach ($themeDefinitions as $themeDefinition) {
- $themeConfig = static::loadThemeConfig($themeDefinition);
- $this->registerTheme($themeConfig);
+ try {
+ $themeConfig = static::loadThemeConfig($themeDefinition);
+ $this->registerTheme($themeConfig);
+ } catch (\yii\base\Exception $ex) {
+ if ($throwException) {
+ throw $ex;
+ }
+ }
  }
 
  return $this->_themes;

core/web/Bootstrap.php

@@ -137,6 +137,10 @@ public function run($app)
  } else {
  // Frontend context
  $app->themeManager->setup();
+
+ if ($app->themeManager->hasActiveTheme) {
+ $app->layout = $app->themeManager->activeTheme->layout;
+ }
  }
  }
 

core/web/View.php

@@ -33,6 +33,11 @@ public function init()
  {
  // call parent initializer
  parent::init();
+
+ if (empty($this->theme) && Yii::$app->themeManager->hasActiveTheme) {
+ $this->theme = Yii::$app->themeManager->activeTheme;
+ }
+
  // auto register csrf tags if enabled
  if ($this->autoRegisterCsrf && Yii::$app->request->enableCsrfValidation) {
  $this->registerCsrfMetaTags();

tests/core/base/ModuleTest.php

@@ -62,10 +62,8 @@ public function testThemeLayoutPath()
 
  /** @var \luya\base\Module $module */
  $module = Yii::$app->getModule('unitmodule');
- $module->init();
+ $module->luyaBootstrap(Yii::$app);
 
- $this->assertEquals('theme', $module->layout);
-
  $module->useAppLayoutPath = false;
  $this->assertContains('/modules/unitmodule/views/layouts', $module->getLayoutPath());
  }
@@ -77,9 +75,7 @@ public function testThemeUseAppLayoutPath()
 
  /** @var \luya\base\Module $module */
  $module = Yii::$app->getModule('unitmodule');
- $module->init();
-
- $this->assertEquals('theme', $module->layout);
+ $module->luyaBootstrap(Yii::$app);
 
  $module->useAppLayoutPath = true;
  $this->assertContains('/themes/moduleTest/views/layouts', $module->getLayoutPath());

tests/core/web/BootstrapTest.php

@@ -42,5 +42,6 @@ public function testThemeManagerSetup()
  $boot->bootstrap(Yii::$app);
 
  $this->assertTrue(Yii::$app->themeManager->hasActiveTheme);
+ $this->assertEquals('theme', Yii::$app->layout);
  }
 }

tests/core/web/ViewTest.php

@@ -2,6 +2,8 @@
 
 namespace luyatests\core\web;
 
+use luya\theme\Theme;
+use Yii;
 use luya\web\View;
 use luya\web\Asset;
 
@@ -50,4 +52,19 @@ public function testGetPublicHtml()
  $url = $view->getPublicHtml();
  $this->assertContains('public_html', $url);
  }
+
+ public function testThemeSetup()
+ {
+ Yii::$app->themeManager->activeThemeName = '@app/themes/blank';
+ Yii::$app->themeManager->setup();
+
+ $view = new View();
+
+ $this->assertInstanceOf(Theme::class, $view->theme);
+
+ $expectedPath = realpath(Yii::getAlias('@luyatests/data/themes/blank'));
+ $this->assertEquals($expectedPath, $view->theme->basePath, 'Theme base path not correct.');
+ $this->assertEquals($expectedPath, Yii::getAlias('@activeTheme'), 'Alias path is not correct.');
+
+ }
 }