Exception handling for theme loading

core/theme/ThemeManager.php

@@ -53,6 +53,7 @@ protected static function loadThemeConfig(string $basePath)
         if (strpos($basePath, '@') === 0) {
             $dir = Yii::getAlias($basePath);
         } elseif (strpos($basePath, '/') !== 0) {
+            // todo: keep basepath as relative path
             $dir = $basePath = Yii::$app->basePath . DIRECTORY_SEPARATOR . $basePath;
         } else {
             $dir = $basePath;
@@ -89,7 +90,7 @@ final public function setup()
         $basePath = $this->getActiveThemeBasePath();
         if ($basePath) {
             $this->beforeSetup($basePath);
-
+            
             $themeConfig = $this->getThemeByBasePath($basePath);
             $theme = new Theme($themeConfig);
             $this->activate($theme);
@@ -133,7 +134,7 @@ protected function getActiveThemeBasePath()
      * @return ThemeConfig[]
      * @throws \yii\base\Exception
      */
-    public function getThemes($throwException = true)
+    public function getThemes($throwException = false)
     {
         if ($this->_themes) {
             return $this->_themes;

tests/core/theme/ThemeManagerTest.php

@@ -135,7 +135,7 @@ public function testNotReadableThemeDir()
         mkdir(Yii::getAlias('@app/themes/not-readable'), 0200);
 
         try {
-            $themeManager->getThemes();
+            $themeManager->getThemes(true);
         } finally {
             rmdir(Yii::getAlias('@app/themes/not-readable'));
         }
@@ -153,7 +153,7 @@ public function testEmptyThemeDir()
         mkdir(Yii::getAlias('@app/otherThemeLocation/emptyThemeDir'));
 
         try {
-            $themeManager->getThemes();
+            $themeManager->getThemes(true);
         } finally {
             rmdir(Yii::getAlias('@app/otherThemeLocation/emptyThemeDir'));
         }
@@ -193,6 +193,6 @@ public function testDuplicateThemeDefinition()
         Yii::$app->getPackageInstaller()->getConfigs()['luyadev/luya-core']->setValue('themes', ['@app/themes/blank']);
 
         $themeManager = new ThemeManager();
-        $themeManager->getThemes();
+        $themeManager->getThemes(true);
     }
 }