Improve view engines and their integration in the Admin

packages/admin/src/Charcoal/Admin/Action/Account/LostPasswordAction.php

@@ -180,7 +180,7 @@ public function results()
     protected function setDependencies(Container $container)
     {
         parent::setDependencies($container);
-        $this->setEmailFactory($container['admin/email/factory']);
+        $this->setEmailFactory($container['email/factory']);
     }
 
     /**

packages/admin/src/Charcoal/Admin/Action/Widget/LoadAction.php

@@ -151,7 +151,7 @@ public function run(RequestInterface $request, ResponseInterface $response)
                 $widget->setData($widgetOptions);
             }
 
-            $widgetHtml = $widget->renderTemplate($widget->template());
+            $widgetHtml = $widget->render($widget->template());
             $sharedJs   = $widget->renderTemplate('{{&jsRequirements}}');
             $uniqueJs   = $widget->renderTemplate('{{&js}}');
             $widgetId   = $widget->widgetId();
@@ -319,7 +319,7 @@ protected function setDependencies(Container $container)
         parent::setdependencies($container);
 
         $this->setWidgetFactory($container['widget/factory']);
-        $this->setWidgetView($container['admin/view']);
+        $this->setWidgetView($container['view']);
     }
 
 

packages/admin/src/Charcoal/Admin/AdminModule.php

@@ -10,6 +10,7 @@
 use Charcoal\App\Module\AbstractModule;
 // From 'charcoal-admin'
 use Charcoal\Admin\ServiceProvider\AdminServiceProvider;
+use Charcoal\View\ViewAggregator;
 
 /**
  * Charcoal Administration Module
@@ -46,6 +47,12 @@ public function setUp()
         }
         $container->register(new AdminServiceProvider());
 
+        /* Last resort solution
+        if ($container['view'] instanceof ViewAggregator) {
+            $container['view']->using('mustache');
+        }
+        */
+
         $module = $this;
         $container['charcoal/admin/module'] = function () use ($module) {
             return $module;
@@ -105,7 +112,7 @@ public function setupHandlers(
         $container->extend('notFoundHandler', function ($handler, $container) {
             $appConfig = $container['config'];
             $adminConfig = $container['admin/config'];
-            $adminView = $container['admin/view'];
+            $adminView = $container['view'];
             if ($handler instanceof HandlerInterface) {
                 $config = $handler->createConfig($appConfig['handlers.defaults']);
                 $config->merge($adminConfig['handlers.defaults']);
@@ -129,7 +136,7 @@ public function setupHandlers(
         $container->extend('notAllowedHandler', function ($handler, $container) {
             $appConfig = $container['config'];
             $adminConfig = $container['admin/config'];
-            $adminView = $container['admin/view'];
+            $adminView = $container['view'];
             if ($handler instanceof HandlerInterface) {
                 $config = $handler->createConfig($appConfig['handlers.defaults']);
                 $config->merge($adminConfig['handlers.defaults']);
@@ -153,7 +160,7 @@ public function setupHandlers(
         $container->extend('phpErrorHandler', function ($handler, $container) {
             $appConfig = $container['config'];
             $adminConfig = $container['admin/config'];
-            $adminView = $container['admin/view'];
+            $adminView = $container['view'];
             if ($handler instanceof HandlerInterface) {
                 $config = $handler->createConfig($appConfig['handlers.defaults']);
                 $config->merge($adminConfig['handlers.defaults']);
@@ -177,7 +184,7 @@ public function setupHandlers(
         $container->extend('errorHandler', function ($handler, $container) {
             $appConfig = $container['config'];
             $adminConfig = $container['admin/config'];
-            $adminView = $container['admin/view'];
+            $adminView = $container['view'];
             if ($handler instanceof HandlerInterface) {
                 $config = $handler->createConfig($appConfig['handlers.defaults']);
                 $config->merge($adminConfig['handlers.defaults']);
@@ -203,7 +210,7 @@ public function setupHandlers(
         $container->extend('maintenanceHandler', function ($handler, $container) {
             $appConfig = $container['config'];
             $adminConfig = $container['admin/config'];
-            $adminView = $container['admin/view'];
+            $adminView = $container['view'];
             if ($handler instanceof HandlerInterface) {
                 $config = $handler->createConfig($appConfig['handlers.defaults']);
                 $config->merge($adminConfig['handlers.defaults']);

packages/admin/src/Charcoal/Admin/AdminWidget.php

@@ -469,7 +469,7 @@ protected function setDependencies(Container $container)
 
         // Satisfies AdminWidget dependencies
         $this->setModelFactory($container['model/factory']);
-        $this->setView($container['admin/view']);
+        $this->setView($container['view']);
     }
 
     /**

packages/admin/src/Charcoal/Admin/Docs/Template/Object/DocTemplate.php

@@ -114,7 +114,7 @@ public function title()
         }
 
         if ($this->isObjRenderable($obj)) {
-            $this->title = $obj->render((string)$objLabel, $obj);
+            $this->title = $obj->renderTemplate((string)$objLabel, $obj);
         } else {
             $this->title = (string)$objLabel;
         }

packages/admin/src/Charcoal/Admin/Property/AbstractProperty.php

@@ -530,7 +530,7 @@ protected function setDependencies(Container $container)
         $this->setTranslator($container['translator']);
 
         // Fulfills the ViewableTrait dependencies
-        $this->setView($container['admin/view']);
+        $this->setView($container['view']);
 
         // Fulfills the DebugAwareTrait dependencies
         $this->setDebug($container['debug']);

packages/admin/src/Charcoal/Admin/Property/Input/ReadonlyInput.php

@@ -106,7 +106,7 @@ public function displayVal()
         $display->setData($propertyData);
         $display->setPropertyVal($propertyValue);
 
-        return $this->view()->renderTemplate($displayType, $display);
+        return $this->view()->render($displayType, $display);
     }
 
     /**

packages/admin/src/Charcoal/Admin/Script/Notification/AbstractNotificationScript.php

@@ -106,7 +106,7 @@ protected function setDependencies(Container $container)
         parent::setDependencies($container);
         $this->setNotificationFactory($container['model/factory']);
         $this->setRevisionFactory($container['model/factory']);
-        $this->emailFactory = $container['admin/email/factory'];
+        $this->emailFactory = $container['email/factory'];
         $this->userFactory = $container['model/factory'];
         $this->objectFactory = $container['model/factory'];
     }

packages/admin/src/Charcoal/Admin/Service/SelectizeRenderer.php

@@ -123,6 +123,6 @@ public function renderTemplate($templateIdent, $context, $controllerIdent = null
             $template = $context;
         }
 
-        return $this->view->render($templateIdent, $template);
+        return $this->view->renderTemplate($templateIdent, $template);
     }
 }

packages/admin/src/Charcoal/Admin/ServiceProvider/AdminServiceProvider.php

@@ -44,7 +44,6 @@
 use Charcoal\View\ViewInterface;
 // From 'charcoal-admin'
 use Charcoal\Admin\Config as AdminConfig;
-use Charcoal\Admin\Route\TemplateRoute as AdminTemplateRoute;
 use Charcoal\Admin\Property\PropertyInputInterface;
 use Charcoal\Admin\Property\PropertyDisplayInterface;
 use Charcoal\Admin\Service\SelectizeRenderer;
@@ -84,8 +83,6 @@ public function register(Container $container)
         $this->registerFactoryServices($container);
         $this->registerElfinderServices($container);
         $this->registerSelectizeServices($container);
-        $this->registerModelDependencies($container);
-        $this->registerRouteServices($container);
         $this->registerMetadataExtensions($container);
         $this->registerAuthExtensions($container);
         $this->registerViewExtensions($container);
@@ -181,42 +178,6 @@ protected function registerAdminServices(Container $container)
             };
         }
 
-        /**
-         * @param Container $container Pimple DI Container.
-         * @return FactoryInterface
-         */
-        $container['admin/email/factory'] = function (Container $container): FactoryInterface {
-            return new GenericFactory([
-                'map' => [
-                    'email' => Email::class
-                ],
-                'base_class' => EmailInterface::class,
-                'default_class' => Email::class,
-                'arguments' => [[
-                    'logger'             => $container['logger'],
-                    'config'             => $container['email/config'],
-                    'view'               => $container['admin/view'],
-                    'template_factory'   => $container['template/factory'],
-                    'queue_item_factory' => $container['model/factory'],
-                    'log_factory'        => $container['model/factory'],
-                    'tracker'            => $container['email/tracker']
-                ]]
-            ]);
-        };
-
-        /**
-         * The admin view instance.
-         *
-         * @param GenericView $view The view instance.
-         * @param Container $container A container instance.
-         * @return ViewInterface
-         */
-        $container['admin/view'] = function (Container $container): ViewInterface {
-            return new GenericView([
-                'engine' => $container['view/engine/mustache']
-            ]);
-        };
-
         /**
          * Extend view/config.
          *
@@ -233,31 +194,6 @@ protected function registerAdminServices(Container $container)
         });
     }
 
-    /**
-     * @param Container $container A Pimple DI container.
-     * @return void
-     */
-    protected function registerModelDependencies(Container $container)
-    {
-        /**
-         * @param Container $container A Pimple DI container.
-         * @return array The model dependencies array.
-         */
-        $container->extend('model/dependencies', function (array $modelDependencies, Container $container) {
-            $modelDependencies['view'] = $container['admin/view'];
-            return $modelDependencies;
-        });
-    }
-
-    /**
-     * @param  Container $container A service container.
-     * @return void
-     */
-    protected function registerRouteServices(Container $container)
-    {
-        $container['route/controller/template/class'] = AdminTemplateRoute::class;
-    }
-
     /**
      * Registers metadata extensions.
      *
@@ -523,7 +459,7 @@ protected function registerSelectizeServices(Container $container)
                 'logger'           => $container['logger'],
                 'translator'       => $container['translator'],
                 'template_factory' => $container['template/factory'],
-                'view'             => $container['admin/view']
+                'view'             => $container['view']
             ]);
         };
     }
@@ -594,7 +530,7 @@ protected function registerFactoryServices(Container $container)
                 'arguments'        => [[
                     'container'      => $container,
                     'logger'         => $container['logger'],
-                    'view'           => $container['admin/view'],
+                    'view'           => $container['view'],
                     'layout_builder' => $container['layout/builder']
                 ]],
                 'resolver_options' => [

packages/admin/src/Charcoal/Admin/Template/Object/CollectionTemplate.php

@@ -164,7 +164,7 @@ public function title()
             }
 
             if ($listIdent && $hasView) {
-                $listIdent = $model->render($listIdent);
+                $listIdent = $model->renderTemplate($listIdent);
             }
 
             if (isset($adminMetadata['lists'][$listIdent]['label'])) {
@@ -191,7 +191,7 @@ public function title()
         }
 
         if ($hasView) {
-            $this->title = $model->render((string)$objLabel, $model);
+            $this->title = $model->renderTemplate((string)$objLabel);
         } else {
             $this->title = (string)$objLabel;
         }

packages/admin/src/Charcoal/Admin/Template/Object/EditTemplate.php

@@ -212,7 +212,7 @@ protected function renderTitle($title)
     {
         $obj = $this->obj();
         if ($this->isObjRenderable($obj)) {
-            return $obj->render((string)$title, $obj);
+            return $obj->renderTemplate((string)$title, $obj);
         } else {
             return (string)$title;
         }

packages/admin/src/Charcoal/Admin/Ui/ActionContainerTrait.php

@@ -228,7 +228,7 @@ protected function parseActionItem($action, $ident, $renderer = false)
             }
 
             if (isset($action['extraTemplate'])) {
-                $action['extraTemplate'] = $this->render($action['extraTemplate']);
+                $action['extraTemplate'] = $this->renderTemplate($action['extraTemplate']);
             }
 
             if (isset($action['dataAttributes']) && is_array($action['dataAttributes'])) {

packages/admin/src/Charcoal/Admin/Ui/CollectionContainerTrait.php

@@ -830,7 +830,7 @@ public function objectRows()
                 $displayType = $this->display->displayType();
                 $this->display->setPropertyVal($object->propertyValue($propertyIdent));
 
-                $propertyValue = $this->view()->renderTemplate($displayType, $this->display);
+                $propertyValue = $this->view()->render($displayType, $this->display);
 
                 $cell = $this->parsePropertyCell($object, $property, $propertyValue);
                 $objectProperties[] = $cell;

packages/admin/src/Charcoal/Admin/Ui/NestedWidgetContainerTrait.php

@@ -284,7 +284,7 @@ protected function renderData($data)
 
         // Make sure there's an "out"
         if ($obj instanceof ViewableInterface && ($obj->view() instanceof ViewInterface)) {
-            $data = $obj->view()->render($data, $obj->viewController());
+            $data = $obj->view()->renderTemplate($data, $obj->viewController());
         } else {
             $data = preg_replace_callback('~\{\{\s*(.*?)\s*\}\}~i', [ $this, 'parseDataToken' ], $data);
         }

packages/admin/src/Charcoal/Admin/Widget/CollectionMapWidget.php

@@ -327,7 +327,7 @@ public function dataFromObject()
         }
 
         if ($collectionIdent && $this->isObjRenderable($proto)) {
-            $collectionIdent = $proto->render($collectionIdent);
+            $collectionIdent = $proto->renderTemplate($collectionIdent);
         }
 
         if (!$collectionIdent) {

packages/admin/src/Charcoal/Admin/Widget/DocWidget.php

@@ -275,7 +275,7 @@ public function setNextUrl($url)
 
         $obj = $this->obj();
         if ($obj && $this->isObjRenderable($obj)) {
-            $url = $obj->render($url);
+            $url = $obj->renderTemplate($url);
         }
 
         $this->nextUrl = $url;
@@ -572,7 +572,7 @@ protected function dataFromObject()
         }
 
         if ($formIdent && $this->isObjRenderable($obj)) {
-            $formIdent = $obj->render($formIdent);
+            $formIdent = $obj->renderTemplate($formIdent);
         }
 
         if (isset($adminMetadata['forms'][$formIdent])) {

packages/admin/src/Charcoal/Admin/Widget/FormGroup/NestedWidgetFormGroup.php

@@ -116,17 +116,16 @@ public function setWidgetId($widgetId)
     /**
      * @return Translation|string|null
      */
-    public function description()
+    public function setDescription($description)
     {
-        return $this->renderTemplate((string)parent::description());
+        parent::setDescription($this->renderTemplate($description));
+        return $this;
     }
 
-    /**
-     * @return Translation|string|null
-     */
-    public function notes()
+    public function setNotes($notes)
     {
-        return $this->renderTemplate((string)parent::notes());
+        parent::setNotes($this->renderTemplate($notes));
+        return $this;
     }
 
     /**
@@ -161,7 +160,7 @@ protected function setDependencies(Container $container)
         $this->setWidgetFactory($container['widget/factory']);
 
         // Satisfies Charcoal\View\ViewableInterface dependencies
-        $this->setView($container['admin/view']);
+        $this->setView($container['view']);
     }
 
     /**