More templating support

Sean Molenaar · Sean Molenaar · commit d77eecb3de05 · 2016-11-02T15:46:56.000+01:00
diff --git a/src/PHPDraft/Out/HTML/default.phtml b/src/PHPDraft/Out/HTML/default.phtml
@@ -23,7 +23,7 @@ $base = $this->categories;
         <link rel="stylesheet" href="<?= $style ?>">
     <?php endforeach; ?>
     <style>
-        <?= Minifier::minify_css(file_get_contents(__DIR__ . '/'.$this->template.'.css'));?>
+        <?= Minifier::minify_css(file_get_contents($this->find_include_file($this->template, 'css'), true));?>
     </style>
 </head>
 <body>
@@ -340,6 +340,6 @@ if (!empty($extras)):
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
         integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
         crossorigin="anonymous"></script>
-<script><?= Minifier::minify_js(file_get_contents(__DIR__ . '/' . $this->template . '.js')); ?></script>
+<script><?= Minifier::minify_js(file_get_contents($this->find_include_file($this->template, 'js'), true)); ?></script>
 </body>
 </html>
diff --git a/src/PHPDraft/Out/TemplateGenerator.php b/src/PHPDraft/Out/TemplateGenerator.php
@@ -84,22 +84,7 @@ public function __construct($template, $image)
      */
     public function get($object)
     {
-        $include = null;
-        if (stream_resolve_include_path('templates' . DIRECTORY_SEPARATOR . $this->template . DIRECTORY_SEPARATOR . $this->template . '.phtml')) {
-            $include =
-                'templates' . DIRECTORY_SEPARATOR . $this->template . DIRECTORY_SEPARATOR . $this->template . '.phtml';
-        }
-        if (stream_resolve_include_path($this->template . DIRECTORY_SEPARATOR . $this->template . '.phtml')) {
-            $include = $this->template . DIRECTORY_SEPARATOR . $this->template . '.phtml';
-        }
-
-        if (stream_resolve_include_path($this->template . '.phtml')) {
-            $include = $this->template . '.phtml';
-        }
-
-        if (stream_resolve_include_path('PHPDraft/Out/HTML/' . $this->template . '.phtml')) {
-            $include = 'PHPDraft/Out/HTML/' . $this->template . '.phtml';
-        }
+        $include = $this->find_include_file($this->template);
         if ($include === null) {
             file_put_contents('php://stderr', "Couldn't find template '$this->template'\n");
             exit(1);
@@ -143,6 +128,46 @@ public function get($object)
         require_once $include;
     }
 
+    /**
+     * Get the path to a file to include
+     *
+     * @param string $template The name of the template to include
+     * @param string $extension Extension of the file to include
+     *
+     * @return null|string File path or null if not found
+     */
+    function find_include_file($template, $extension = 'phtml')
+    {
+        $include = null;
+        $fextension = '.'.$extension;
+        if (stream_resolve_include_path('templates' . DIRECTORY_SEPARATOR . $template . DIRECTORY_SEPARATOR . $template . $fextension)) {
+            $include = 'templates' . DIRECTORY_SEPARATOR . $template . DIRECTORY_SEPARATOR . $template . $fextension;
+            return $include;
+        }
+        if (stream_resolve_include_path('templates' . DIRECTORY_SEPARATOR . $template . $fextension)) {
+            $include = 'templates' . DIRECTORY_SEPARATOR . $template . $fextension;
+            return $include;
+        }
+        if (stream_resolve_include_path($template . DIRECTORY_SEPARATOR . $template . $fextension)) {
+            $include = $template . DIRECTORY_SEPARATOR . $template . $fextension;
+            return $include;
+        }
+
+        if (stream_resolve_include_path($template . $fextension)) {
+            $include = $template . $fextension;
+            return $include;
+        }
+
+        if (stream_resolve_include_path('PHPDraft/Out/HTML/' . $template . $fextension)) {
+            $include = 'PHPDraft/Out/HTML/' . $template . $fextension;
+            return $include;
+        }
+
+        if ($include === null && $extension === 'phtml') {
+            return $this->find_include_file('default', $extension);
+        }
+    }
+
     /**
      * Get an icon for a specific HTTP Method
      *
