Properly using TreeRendererInterface instead of the ViewModel injection hack.

Author: Kyle Spraggs

src/ZfcTwig/Module.php

@@ -34,15 +34,6 @@ public function onBootstrap(MvcEvent $e)
 
             $environment->addExtension($extension);
         }
-
-        if ($config['disable_zf_model']) {
-            $events       = $application->getEventManager();
-            $sharedEvents = $events->getSharedManager();
-            $vmListener   = new InjectViewModelListener($serviceManager->get('ZfcTwigRenderer'));
-
-            $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, array($vmListener, 'injectViewModel'), -99);
-            $sharedEvents->attach('Zend\Stdlib\DispatchableInterface', MvcEvent::EVENT_DISPATCH, array($vmListener, 'injectViewModel'), -99);
-        }
     }
 
     public function getServiceConfig()

src/ZfcTwig/Service/ViewTwigRendererFactory.php

@@ -16,11 +16,15 @@ class ViewTwigRendererFactory implements FactoryInterface
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
+        $config = $serviceLocator->get('Configuration');
+        $config = $config['zfctwig'];
+
         $renderer = new TwigRenderer(
             $serviceLocator->get('ZfcTwigEnvironment'),
             $serviceLocator->get('ZfcTwigResolver')
         );
 
+        $renderer->setCanRenderTrees($config['disable_zf_model']);
         $renderer->setHelperPluginManager($serviceLocator->get('ZfcTwigViewHelperManager'));
 
         return $renderer;

src/ZfcTwig/View/Renderer/TwigRenderer.php

@@ -7,11 +7,17 @@
 use Zend\View\HelperPluginManager;
 use Zend\View\Model\ModelInterface;
 use Zend\View\Renderer\RendererInterface;
+use Zend\View\Renderer\TreeRendererInterface;
 use Zend\View\Resolver\ResolverInterface;
 use ZfcTwig\View\Resolver\TwigResolver;
 
-class TwigRenderer implements RendererInterface
+class TwigRenderer implements RendererInterface, TreeRendererInterface
 {
+    /**
+     * @var bool
+     */
+    protected $canRenderTrees = true;
+
     /**
      * @var Twig_Environment
      */
@@ -66,6 +72,26 @@ public function __call($method, $argv)
         return $this->__pluginCache[$method];
     }
 
+    /**
+     * @param boolean $canRenderTrees
+     * @return boolean
+     */
+    public function setCanRenderTrees($canRenderTrees)
+    {
+        $this->canRenderTrees = $canRenderTrees;
+        return $this;
+    }
+
+    /**
+     * Indicate whether the renderer is capable of rendering trees of view models
+     *
+     * @return bool
+     */
+    public function canRenderTrees()
+    {
+        return $this->canRenderTrees;
+    }
+
     /**
      * Get plugin instance, proxy to HelperPluginManager::get
      *
@@ -147,6 +173,8 @@ public function getHelperPluginManager()
      */
     public function render($nameOrModel, $values = array())
     {
+        $model = null;
+
         if ($nameOrModel instanceof ModelInterface) {
             $model       = $nameOrModel;
             $nameOrModel = $model->getTemplate();
@@ -160,11 +188,16 @@ public function render($nameOrModel, $values = array())
             $values = (array) $model->getVariables();
         }
 
+        $children = $model->getChildren();
+        if ($this->canRenderTrees() && !empty($children)) {
+            $nameOrModel = $children[0]->getTemplate();
+        }
+
         /** @var $template \Twig_Template */
         $template = $this->resolver->resolve($nameOrModel, $this);
         if ($template) {
             return $template->render($values);
         }
         return null;
     }
-}
+}