Adding pushComposers and unshiftComposers #194

- Added new methods on the engine to help with adding and unshifting composers Signed-off-by: RJ Garcia <rj@bighead.net>
thephpleague · Jan 15, 2018 · 7954b5f · 7954b5f
1 parent bce7243
commit 7954b5f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/Engine.php b/src/Engine.php
@@ -43,7 +43,6 @@ public function __construct($config = []) {
             if ($c->get('config')['validate_paths']) {
                 $rt = new RenderTemplate\ValidatePathRenderTemplate($rt, $c->get('fileExists'));
             }
-            // $rt = new RenderTemplate\LayoutRenderTemplate($rt);
             $rt = array_reduce($c->get('renderTemplate.factories'), function($rt, $create) {
                 return $create($rt);
             }, $rt);
@@ -56,6 +55,20 @@ public function __construct($config = []) {
         $this->container->add('renderTemplate.factories', function() {
             return [];
         });
+
+        $this->addMethods([
+            'pushComposers' => function(Engine $e, $def_composer) {
+                $e->getContainer()->wrapComposed('compose', function($composed, $c) use ($def_composer) {
+                    return array_merge($composed, $def_composer($c));
+                });
+            },
+            'unshiftComposers' => function(Engine $e, $def_composer) {
+                $e->getContainer()->wrapComposed('compose', function($composed, $c) use ($def_composer) {
+                    return array_merge($def_composer($c), $composed);
+                });
+            },
+        ]);
+
         $this->register(new Extension\Data\DataExtension());
         $this->register(new Extension\Path\PathExtension());
         $this->register(new Extension\RenderContext\RenderContextExtension());

diff --git a/src/Extension/Data/DataExtension.php b/src/Extension/Data/DataExtension.php
@@ -12,12 +12,13 @@ public function register(Plates\Engine $plates) {
         $c->add('data.globals', []);
         $c->add('data.template_data', []);
         $c->merge('config', ['merge_parent_data' => true]);
-        $c->wrapComposed('compose', function($composers, $c) {
-            return array_merge(array_filter([
+
+        $plates->unshiftComposers(function($c) {
+            return array_filter([
                 'data.perTemplateData' => $c->get('data.template_data') ? perTemplateDataCompose($c->get('data.template_data')) : null,
                 'data.mergeParentData' => $c->get('config')['merge_parent_data'] ? mergeParentDataCompose() : null,
                 'data.addGlobals' => $c->get('data.globals') ? addGlobalsCompose($c->get('data.globals')) : null,
-            ]), $composers);
+            ]);
         });
 
         $plates->addMethods([

diff --git a/src/Extension/Path/PathExtension.php b/src/Extension/Path/PathExtension.php
@@ -32,11 +32,11 @@ public function register(Plates\Engine $plates) {
                 'path.id' => idResolvePath(),
             ]);
         });
-        $c->wrapComposed('compose', function($composed, $c) {
-            return array_merge([
+        $plates->unshiftComposers(function($c) {
+            return [
                 'path.resolvePath' => resolvePathCompose($c->get('path.resolvePath')),
                 'path.normalizeName' => normalizeNameCompose($c->get('path.normalizeName'))
-            ], $composed);
+            ];
         });
     }
 }