Merge branch 'release/1.7-beta'

Author: ekandreas

bladerunner.php

@@ -3,7 +3,7 @@
 Plugin Name:        Bladerunner
 Plugin URI:         http://bladerunner.elseif.se
 Description:        Laravel Blade template engine for WordPress
-Version:            1.6.3
+Version:            1.7-beta
 Author:             Andreas Ek
 Author URI:         https://www.elseif.se/
 License:            MIT License

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "ekandreas/bladerunner",
     "type": "wordpress-plugin",
-    "version": "1.6.3",
+    "version": "1.7-beta",
     "description": "WordPress Blade L5 template engine",
     "keywords": ["laravel", "blade", "wordpress"],
     "license": "MIT",
@@ -14,7 +14,10 @@
     "require": {
         "php": ">=5.6",
         "illuminate/config": "5.*",
-        "illuminate/view": "5.*"
+        "illuminate/view": "5.*",
+        "hassankhan/config": "0.*",
+        "symfony/yaml": "3.*",
+        "brain/hierarchy":"2.*"
     },
     "autoload": {
         "psr-4": {

globals/filters.php

@@ -1,19 +1,60 @@
 <?php
+
 /**
  * Template Hierarchy should search for .blade.php files
  */
 array_map(function ($type) {
     add_filter("{$type}_template_hierarchy", function ($templates) {
-        return call_user_func_array('array_merge', array_map(function ($template) {
+        $result = call_user_func_array('array_merge', array_map(function ($template) {
             $transforms = [
                 '%^/?(templates)?/?%' => Bladerunner\Config::repo('bladerunner.disable_option_hack') ? 'templates/' : '',
                 '%(\.blade)?(\.php)?$%' => ''
             ];
             $normalizedTemplate = preg_replace(array_keys($transforms), array_values($transforms), $template);
+
+            $controllerPaths = collect([
+                apply_filters('bladerunner/controller/paths', []),
+                get_stylesheet_directory() . '/controllers',
+            ])->flatMap(function ($path) use ($normalizedTemplate) {
+                $controllerPath = "{$path}/{$normalizedTemplate}.php";
+                if (file_exists($controllerPath)) {
+                    add_filter('bladerunner/controllers/heap', function ($heap) use ($controllerPath) {
+                        if (!in_array($controllerPath, $heap)) {
+                            $heap[] = $controllerPath;
+                        }
+                        return $heap;
+                    });
+                }
+                return ["{$path}/{$normalizedTemplate}.php"];
+            })->unique()->toArray();
+
             return ["{$normalizedTemplate}.blade.php", "{$normalizedTemplate}.php"];
         }, $templates));
+
+
+        return $result;
     });
 }, [
     'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home',
     'frontpage', 'page', 'paged', 'search', 'single', 'singular', 'attachment'
 ]);
+
+add_filter('template_include', function ($template) {
+    $heap = apply_filters('bladerunner/controllers/heap', []);
+    if ($heap) {
+        foreach ($heap as $controllerFile) {
+            require_once $controllerFile;
+            $class = get_declared_classes();
+            $class = '\\' . end($class);
+            $controller = new $class();
+            if (is_subclass_of($class, "\\Bladerunner\\Controller") && $controller->__getView()) {
+                $controller->__setup();
+                echo view($controller->__getView(), $controller->__getData());
+                return null;
+            }
+        }
+    }
+    return $template;
+}, PHP_INT_MAX);
+
+//TODO: Make the filter bladerunner/controller/path to array as bladerunner/controller/paths to get use in eg plugins

globals/setup.php

@@ -1,4 +1,5 @@
 <?php
+
 use Illuminate\Contracts\Container\Container as ContainerContract;
 
 /**
@@ -42,6 +43,10 @@
         (new \Bladerunner\BladeProvider($app))->register();
         return new \Bladerunner\Blade($app['view'], $app);
     });
+
+    \Bladerunner\Container::current('blade')->compiler()->directive('controller', function () {
+        return '<?php (new \Bladerunner\ControllerDebug(get_defined_vars())); ?>';
+    });
 });
 
 /**