From 7c8ad9f57feb828d16e58fb882ab82c79c1c8455 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Sat, 1 Feb 2020 15:49:12 +0100
Subject: [PATCH 1/2] Add support for `template_directory` in `theme.yaml`

---
 src/Controller/TwigAwareController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Controller/TwigAwareController.php b/src/Controller/TwigAwareController.php
index 0ba22bb3c..d2dc6d2e8 100644
--- a/src/Controller/TwigAwareController.php
+++ b/src/Controller/TwigAwareController.php
@@ -91,8 +91,14 @@ private function setTwigLoader(): void
         /** @var NativeFilesystemLoader $twigLoaders */
         $twigLoaders = $this->twig->getLoader();
 
+        $path = $this->config->getPath('theme');
+
+        if ($this->config->get('theme/template_directory')) {
+            $path = $path . DIRECTORY_SEPARATOR . $this->config->get('theme/template_directory');
+        }
+
         if ($twigLoaders instanceof FilesystemLoader) {
-            $twigLoaders->prependPath($this->config->getPath('theme'), '__main__');
+            $twigLoaders->prependPath($path, '__main__');
         }
     }
 

From 8218a3ef5f78ac8e8c34c7f6301c1ce5f8994cf9 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Sat, 1 Feb 2020 16:05:26 +0100
Subject: [PATCH 2/2] Update TwigAwareController.php

---
 src/Controller/TwigAwareController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/TwigAwareController.php b/src/Controller/TwigAwareController.php
index d2dc6d2e8..40bedb14e 100644
--- a/src/Controller/TwigAwareController.php
+++ b/src/Controller/TwigAwareController.php
@@ -94,7 +94,7 @@ private function setTwigLoader(): void
         $path = $this->config->getPath('theme');
 
         if ($this->config->get('theme/template_directory')) {
-            $path = $path . DIRECTORY_SEPARATOR . $this->config->get('theme/template_directory');
+            $path .= DIRECTORY_SEPARATOR . $this->config->get('theme/template_directory');
         }
 
         if ($twigLoaders instanceof FilesystemLoader) {