Merge pull request #25 from ovenum/fix/pass-callable-as-path-option

lukasleitsch · web-flow · commit 204511b854e4 · 2022-11-01T19:16:00.000+01:00
Allow closure as option for template path
diff --git a/src/Paths.php b/src/Paths.php
@@ -6,19 +6,17 @@ class Paths
 {
     public static function getPathTemplates(): string
     {
-        $optionPath = option('leitsch.blade.templates');
+        $path = option('leitsch.blade.templates');
 
-        if ($optionPath !== null && is_dir($optionPath)) {
-            if (is_callable($optionPath)) {
-                return $optionPath();
-            }
+        if (is_callable($path)) {
+            return $path();
+        }
 
-            $path = kirby()->roots()->index() . "/" . $optionPath;
-        } else {
-            $path = kirby()->root('templates');
+        if ($path !== null) {
+            return kirby()->roots()->index() . '/' . $path;
         }
 
-        return $path;
+        return kirby()->root('templates');
     }
 
     public static function getPathViews(): string

Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,17 @@ class Paths`
`6`	`6`	`{`
`7`	`7`	`public static function getPathTemplates(): string`
`8`	`8`	`{`
`9`		`- $optionPath = option('leitsch.blade.templates');`
	`9`	`+ $path = option('leitsch.blade.templates');`
`10`	`10`
`11`		`- if ($optionPath !== null && is_dir($optionPath)) {`
`12`		`- if (is_callable($optionPath)) {`
`13`		`- return $optionPath();`
`14`		`- }`
	`11`	`+ if (is_callable($path)) {`
	`12`	`+ return $path();`
	`13`	`+ }`
`15`	`14`
`16`		`- $path = kirby()->roots()->index() . "/" . $optionPath;`
`17`		`- } else {`
`18`		`- $path = kirby()->root('templates');`
	`15`	`+ if ($path !== null) {`
	`16`	`+ return kirby()->roots()->index() . '/' . $path;`
`19`	`17`	`}`
`20`	`18`
`21`		`- return $path;`
	`19`	`+ return kirby()->root('templates');`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`public static function getPathViews(): string`