From e0b930ef3759dfb958a22833acc64c94bfa36d85 Mon Sep 17 00:00:00 2001 From: Omar Date: Tue, 18 May 2021 12:24:07 +0200 Subject: [PATCH 1/3] Make pattern theme paths relative instead of absolute. Since twig 2.14.5 this is not supported. More info: https://github.com/twigphp/Twig/blob/v2.14.5/CHANGELOG --- .../src/Plugin/UiPatterns/Pattern/LibraryPattern.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ui_patterns_library/src/Plugin/UiPatterns/Pattern/LibraryPattern.php b/modules/ui_patterns_library/src/Plugin/UiPatterns/Pattern/LibraryPattern.php index f57aad21..79d9f667 100644 --- a/modules/ui_patterns_library/src/Plugin/UiPatterns/Pattern/LibraryPattern.php +++ b/modules/ui_patterns_library/src/Plugin/UiPatterns/Pattern/LibraryPattern.php @@ -78,7 +78,7 @@ protected function processCustomThemeHookProperty(PatternDefinition $definition) $module = $this->moduleHandler->getModule($definition->getProvider()); $return['path'] = $module->getPath() . '/templates'; if ($this->templateExists($definition->getBasePath(), $definition->getTemplate())) { - $return['path'] = str_replace($this->root, '', $definition->getBasePath()); + $return['path'] = str_replace($this->root . '/', '', $definition->getBasePath()); } } return $return; From 26b20fa2b3b5e171bf6df9e463de78f2e0b2faaa Mon Sep 17 00:00:00 2001 From: Omar Date: Fri, 21 May 2021 18:27:49 +0200 Subject: [PATCH 2/3] Issue #328: Prevent requiring absolute paths in base pattern --- src/Plugin/PatternBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin/PatternBase.php b/src/Plugin/PatternBase.php index bd773d96..f8354357 100644 --- a/src/Plugin/PatternBase.php +++ b/src/Plugin/PatternBase.php @@ -79,7 +79,7 @@ public function getLibraryDefinitions() { // Attach pattern base path to assets. if (!empty($definition['base path'])) { - $base_path = str_replace($this->root, '', $definition['base path']); + $base_path = str_replace($this->root . DIRECTORY_SEPARATOR, '', $definition['base path']); $this->processLibraries($items, $base_path); } From 90b30b2e52a959f9e0ac33025025b7a8b029df48 Mon Sep 17 00:00:00 2001 From: Omar Date: Fri, 21 May 2021 18:28:49 +0200 Subject: [PATCH 3/3] Issue #328: use DIRECTORY_SEPARATOR instead of linux slash --- .../src/Plugin/UiPatterns/Pattern/LibraryPattern.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ui_patterns_library/src/Plugin/UiPatterns/Pattern/LibraryPattern.php b/modules/ui_patterns_library/src/Plugin/UiPatterns/Pattern/LibraryPattern.php index 79d9f667..f2c8102d 100644 --- a/modules/ui_patterns_library/src/Plugin/UiPatterns/Pattern/LibraryPattern.php +++ b/modules/ui_patterns_library/src/Plugin/UiPatterns/Pattern/LibraryPattern.php @@ -78,7 +78,7 @@ protected function processCustomThemeHookProperty(PatternDefinition $definition) $module = $this->moduleHandler->getModule($definition->getProvider()); $return['path'] = $module->getPath() . '/templates'; if ($this->templateExists($definition->getBasePath(), $definition->getTemplate())) { - $return['path'] = str_replace($this->root . '/', '', $definition->getBasePath()); + $return['path'] = str_replace($this->root . DIRECTORY_SEPARATOR, '', $definition->getBasePath()); } } return $return;