Add support for Child Themes

modules/cms/ServiceProvider.php

@@ -67,10 +67,6 @@ public function boot()
 
         $this->bootMenuItemEvents();
         $this->bootRichEditorEvents();
-
-        if ($this->app->runningInBackend()) {
-            $this->bootBackendLocalization();
-        }
     }
 
     /**
@@ -109,8 +105,18 @@ protected function registerTwigParser()
             ];
 
             if ($useCache) {
+                $theme = Theme::getActiveTheme();
+                $themeDir = $theme->getDirName();
+                if ($parent = $theme->getConfig()['parent'] ?? false) {
+                    $themeDir .= '-' . $parent;
+                }
+
                 $options['cache'] = new TwigCacheFilesystem(
-                    storage_path().'/cms/twig',
+                    storage_path(implode(DIRECTORY_SEPARATOR, [
+                        'cms',
+                        'twig',
+                        $themeDir,
+                    ])) . DIRECTORY_SEPARATOR,
                     $forceBytecode ? TwigCacheFilesystem::FORCE_BYTECODE_INVALIDATION : 0
                 );
             }
@@ -381,24 +387,6 @@ protected function registerBackendSettings()
         });
     }
 
-    /**
-     * Boots localization from an active theme for backend items.
-     */
-    protected function bootBackendLocalization()
-    {
-        $theme = Theme::getActiveTheme();
-
-        if (is_null($theme)) {
-            return;
-        }
-
-        $langPath = $theme->getPath() . '/lang';
-
-        if (File::isDirectory($langPath)) {
-            Lang::addNamespace('themes.' . $theme->getId(), $langPath);
-        }
-    }
-
     /**
      * Registers events for menu items.
      */
@@ -448,6 +436,7 @@ protected function registerHalcyonModels()
     {
         Event::listen('system.console.theme.sync.getAvailableModelClasses', function () {
             return [
+                Classes\Theme::class,
                 Classes\Meta::class,
                 Classes\Page::class,
                 Classes\Layout::class,

modules/cms/classes/AutoDatasource.php

@@ -22,6 +22,11 @@ class AutoDatasource extends Datasource implements DatasourceInterface
      */
     protected $datasources = [];
 
+    /**
+     * @var string The cache key to use for this datasource instance
+     */
+    protected $cacheKey = 'halcyon-datastore-auto';
+
     /**
      * @var array Local cache of paths available in the datasources
      */
@@ -48,17 +53,29 @@ class AutoDatasource extends Datasource implements DatasourceInterface
      * @param array $datasources Array of datasources to utilize. Lower indexes = higher priority ['datasourceName' => $datasource]
      * @return void
      */
-    public function __construct(array $datasources)
+    public function __construct(array $datasources, ?string $cacheKey = null)
     {
         $this->datasources = $datasources;
 
+        if ($cacheKey) {
+            $this->cacheKey = $cacheKey;
+        }
+
         $this->activeDatasourceKey = array_keys($datasources)[0];
 
         $this->populateCache();
 
         $this->postProcessor = new Processor;
     }
 
+    /**
+     * Returns the in memory path cache map
+     */
+    public function getPathCache(): array
+    {
+        return $this->pathCache;
+    }
+
     /**
      * Populate the local cache of paths available in each datasource
      *
@@ -69,6 +86,13 @@ public function populateCache($refresh = false)
     {
         $pathCache = [];
         foreach ($this->datasources as $datasource) {
+            // Allow AutoDatasource instances to handle their own internal caching
+            if ($datasource instanceof AutoDatasource) {
+                $datasource->populateCache($refresh);
+                $pathCache[] = array_merge(...array_reverse($datasource->getPathCache()));
+                continue;
+            }
+
             // Remove any existing cache data
             if ($refresh && $this->allowCacheRefreshes) {
                 Cache::forget($datasource->getPathsCacheKey());
@@ -309,7 +333,7 @@ protected function getValidPaths(string $dirName, array $options = [])
      */
     protected function makeFilePath(string $dirName, string $fileName, string $extension)
     {
-        return $dirName . '/' . $fileName . '.' . $extension;
+        return ltrim($dirName . '/' . $fileName . '.' . $extension, '/');
     }
 
     /**
@@ -507,7 +531,7 @@ public function makeCacheKey($name = ''): string
      */
     public function getPathsCacheKey(): string
     {
-        return 'halcyon-datastore-auto';
+        return $this->cacheKey;
     }
 
     /**

modules/cms/classes/CmsObject.php

@@ -124,7 +124,7 @@ public static function loadCached($theme, $fileName)
      * This method is used internally by the system.
      * @param \Cms\Classes\Theme $theme Specifies a parent theme.
      * @param boolean $skipCache Indicates if objects should be reloaded from the disk bypassing the cache.
-     * @return Collection Returns a collection of CMS objects.
+     * @return CmsObjectCollection Returns a collection of CMS objects.
      */
     public static function listInTheme($theme, $skipCache = false)
     {

modules/cms/classes/CodeParser.php

@@ -5,6 +5,7 @@
 use Cache;
 use Config;
 use SystemException;
+use Winter\Storm\Support\Str;
 
 /**
  * Parses the PHP code section of CMS objects.
@@ -233,18 +234,22 @@ protected function storeCachedInfo($result)
 
     /**
      * Returns path to the cached parsed file
-     * @return string
      */
-    protected function getCacheFilePath()
+    protected function getCacheFilePath(): string
     {
-        $hash = md5($this->filePath);
-        $result = storage_path().'/cms/cache/';
-        $result .= substr($hash, 0, 2).'/';
-        $result .= substr($hash, 2, 2).'/';
-        $result .= basename($this->filePath);
-        $result .= '.php';
+        $pathSegments = [
+            storage_path('cms' . DIRECTORY_SEPARATOR . 'cache'),
+            trim(
+                Str::after(
+                    pathinfo($this->filePath, PATHINFO_DIRNAME),
+                    base_path()
+                ),
+                DIRECTORY_SEPARATOR
+            ),
+            basename($this->filePath) . '.php',
+        ];
 
-        return $result;
+        return implode(DIRECTORY_SEPARATOR, $pathSegments);
     }
 
     /**

modules/cms/classes/Controller.php

@@ -4,8 +4,10 @@
 use Url;
 use App;
 use View;
+use File;
 use Lang;
 use Flash;
+use Cache;
 use Config;
 use Session;
 use Request;
@@ -1353,22 +1355,57 @@ public function currentPageUrl($parameters = [], $routePersistence = true)
      * @param mixed $url Specifies the theme-relative URL. If null, the theme path is returned.
      * @return string
      */
-    public function themeUrl($url = null)
+    public function themeUrl($url = null): string
+    {
+        return is_array($url)
+            ? $this->themeCombineAssets($url)
+            : $this->getTheme()->assetUrl($url);
+    }
+
+    /**
+     * Generates a URL to the AssetCombiner for the provided array of assets
+     */
+    protected function themeCombineAssets(array $url): string
     {
         $themeDir = $this->getTheme()->getDirName();
+        $parentTheme = $this->getTheme()->getConfig()['parent'] ?? false;
 
-        if (is_array($url)) {
-            $_url = Url::to(CombineAssets::combine($url, themes_path().'/'.$themeDir));
-        }
-        else {
-            $_url = Config::get('cms.themesPath', '/themes').'/'.$themeDir;
-            if ($url !== null) {
-                $_url .= '/'.$url;
+        $cacheKey = __METHOD__ . '.' . md5(json_encode($url));
+
+        if (!($assets = Cache::get($cacheKey))) {
+            $assets = [];
+            $sources = [
+                themes_path($themeDir)
+            ];
+
+            if ($parentTheme) {
+                $sources[] = themes_path($parentTheme);
             }
-            $_url = Url::asset($_url);
+
+            foreach ($url as $file) {
+                // Leave Combiner Aliases assets unmodified
+                if (str_starts_with($file, '@')) {
+                    $assets[] = $file;
+                    continue;
+                }
+
+                foreach ($sources as $source) {
+                    $asset = $source . DIRECTORY_SEPARATOR . $file;
+                    if (File::exists($asset)) {
+                        $assets[] = $asset;
+                        break 2;
+                    }
+                }
+
+                // Skip combining missing assets and log an error
+                Log::error("$file could not be found in any of the theme's sources (" . implode(', ', $sources) . ',');
+                continue;
+            }
+
+            Cache::put($cacheKey, $assets);
         }
 
-        return $_url;
+        return Url::to(CombineAssets::combine($assets));
     }
 
     /**