Refactored to inject helper rather than extending it.

Resources/config/services.xml

@@ -5,17 +5,22 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="cmf_core.twig_extension_class">Symfony\Cmf\Bundle\CoreBundle\Twig\TwigExtension</parameter>
+        <parameter key="cmf_core.twig_extension_class">Symfony\Cmf\Bundle\CoreBundle\Twig\Extension\CmfExtension</parameter>
+        <parameter key="cmf_core.templating.helper_class">Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\CmfHelper</parameter>
         <parameter key="cmf_core.listener.request_aware_class">Symfony\Cmf\Bundle\CoreBundle\EventListener\RequestAwareListener</parameter>
     </parameters>
 
     <services>
 
         <service id="cmf_core.twig.children_extension" class="%cmf_core.twig_extension_class%">
+            <argument type="service" id="cmf_core.templating.helper"/>
+            <tag name="twig.extension"/>
+        </service>
+
+        <service id="cmf_core.templating.helper" class="%cmf_core.templating.helper_class%">
             <argument type="service" id="cmf_core.publish_workflow.checker" on-invalid="ignore"/>
             <argument type="service" id="doctrine_phpcr" on-invalid="ignore"/>
             <argument>%cmf_core.document_manager_name%</argument>
-            <tag name="twig.extension"/>
         </service>
 
         <service id="cmf_core.listener.request_aware" class="%cmf_core.listener.request_aware_class%">

Templating/Helper/CmfHelper.php

@@ -46,6 +46,15 @@ public function __construct(SecurityContextInterface $publishWorkflowChecker = n
         }
     }
 
+    protected function getDm()
+    {
+        if (!$this->dm) {
+            throw new \RuntimeException('Document Manager has not been initialized yet.');
+        }
+
+        return $this->dm;
+    }
+
     /**
      * Gets the helper name.
      *
@@ -81,7 +90,7 @@ public function getParentPath($document)
     public function getPath($document)
     {
         try {
-            return $this->dm->getUnitOfWork()->getDocumentId($document);
+            return $this->getDm()->getUnitOfWork()->getDocumentId($document);
         } catch (\Exception $e) {
             return false;
         }
@@ -95,7 +104,7 @@ public function getPath($document)
      */
     public function find($path)
     {
-        return $this->dm->find(null, $path);
+        return $this->getDm()->find(null, $path);
     }
 
     /**
@@ -113,7 +122,7 @@ public function find($path)
     private function getDocument($document, $ignoreRole = false, $class = null)
     {
         if (is_string($document)) {
-            $document = $this->dm->find(null, $document);
+            $document = $this->getDm()->find(null, $document);
         }
         if (null !== $ignoreRole && null === $this->publishWorkflowChecker) {
             throw new InvalidConfigurationException('You can not fetch only published documents when the publishWorkflowChecker is not set. Either enable the publish workflow or pass "ignoreRole = null" to skip publication checks.');
@@ -194,15 +203,15 @@ public function isPublished($document)
     public function getLocalesFor($document, $includeFallbacks = false)
     {
         if (is_string($document)) {
-            $document = $this->dm->find(null, $document);
+            $document = $this->getDm()->find(null, $document);
         }
 
         if (empty($document)) {
             return array();
         }
 
         try {
-            $locales = $this->dm->getLocalesFor($document, $includeFallbacks);
+            $locales = $this->getDm()->getLocalesFor($document, $includeFallbacks);
         } catch (MissingTranslationException $e) {
             $locales = array();
         }
@@ -220,13 +229,13 @@ public function getChild($parent, $name)
     {
         if (is_object($parent)) {
             try {
-                $parent = $this->dm->getUnitOfWork()->getDocumentId($parent);
+                $parent = $this->getDm()->getUnitOfWork()->getDocumentId($parent);
             } catch (\Exception $e) {
                 return false;
             }
         }
 
-        return $this->dm->find(null, "$parent/$name");
+        return $this->getDm()->find(null, "$parent/$name");
     }
 
     /**
@@ -249,9 +258,9 @@ public function getChildren($parent, $limit = false, $offset = false, $filter =
 
         if ($limit || $offset) {
             if (is_object($parent)) {
-                $parent = $this->dm->getUnitOfWork()->getDocumentId($parent);
+                $parent = $this->getDm()->getUnitOfWork()->getDocumentId($parent);
             }
-            $node = $this->dm->getPhpcrSession()->getNode($parent);
+            $node = $this->getDm()->getPhpcrSession()->getNode($parent);
             $children = (array) $node->getNodeNames();
             foreach ($children as $key => $child) {
                 // filter before fetching data already to save some traffic
@@ -268,7 +277,7 @@ public function getChildren($parent, $limit = false, $offset = false, $filter =
                 $children = array_slice($children, $key);
             }
         } else {
-            $children = $this->dm->getChildren($parent, $filter);
+            $children = $this->getDm()->getChildren($parent, $filter);
         }
 
         $result = array();
@@ -327,7 +336,7 @@ private function getChildrenPaths($path, array &$children, $depth)
 
         --$depth;
 
-        $node = $this->dm->getPhpcrSession()->getNode($path);
+        $node = $this->getDm()->getPhpcrSession()->getNode($path);
         $names = (array) $node->getNodeNames();
         foreach ($names as $name) {
             if (strpos($name, 'phpcr_locale:') === 0) {
@@ -353,7 +362,7 @@ public function getDescendants($parent, $depth = null)
 
         $children = array();
         if (is_object($parent)) {
-            $parent = $this->dm->getUnitOfWork()->getDocumentId($parent);
+            $parent = $this->getDm()->getUnitOfWork()->getDocumentId($parent);
         }
         $this->getChildrenPaths($parent, $children, $depth);
 
@@ -407,7 +416,7 @@ private function traversePrevDepth($depth, $anchorDepth, array $childNames, $pat
     {
         foreach ($childNames as $childName) {
             $childPath = "$path/$childName";
-            $node = $this->dm->getPhpcrSession()->getNode($childPath);
+            $node = $this->getDm()->getPhpcrSession()->getNode($childPath);
             if (null === $depth || PathHelper::getPathDepth($childPath) - $anchorDepth < $depth) {
                 $childNames = $node->getNodeNames()->getArrayCopy();
                 if (!empty($childNames)) {
@@ -440,17 +449,17 @@ private function traversePrevDepth($depth, $anchorDepth, array $childNames, $pat
     private function searchDepthPrev($path, $anchor, $depth = null, $ignoreRole = false, $class = null)
     {
         if (is_object($path)) {
-            $path = $this->dm->getUnitOfWork()->getDocumentId($path);
+            $path = $this->getDm()->getUnitOfWork()->getDocumentId($path);
         }
 
         if (null === $path || '/' === $path) {
             return null;
         }
 
-        $node = $this->dm->getPhpcrSession()->getNode($path);
+        $node = $this->getDm()->getPhpcrSession()->getNode($path);
 
         if (is_object($anchor)) {
-            $anchor = $this->dm->getUnitOfWork()->getDocumentId($anchor);
+            $anchor = $this->getDm()->getUnitOfWork()->getDocumentId($anchor);
         }
 
         if (0 !== strpos($path, $anchor)) {
@@ -514,17 +523,17 @@ private function searchDepthPrev($path, $anchor, $depth = null, $ignoreRole = fa
     private function searchDepthNext($path, $anchor, $depth = null, $ignoreRole = false, $class = null)
     {
         if (is_object($path)) {
-            $path = $this->dm->getUnitOfWork()->getDocumentId($path);
+            $path = $this->getDm()->getUnitOfWork()->getDocumentId($path);
         }
 
         if (null === $path || '/' === $path) {
             return null;
         }
 
-        $node = $this->dm->getPhpcrSession()->getNode($path);
+        $node = $this->getDm()->getPhpcrSession()->getNode($path);
 
         if (is_object($anchor)) {
-            $anchor = $this->dm->getUnitOfWork()->getDocumentId($anchor);
+            $anchor = $this->getDm()->getUnitOfWork()->getDocumentId($anchor);
         }
 
         if (0 !== strpos($path, $anchor)) {
@@ -588,14 +597,14 @@ private function searchDepthNext($path, $anchor, $depth = null, $ignoreRole = fa
     private function search($path, $reverse = false, $ignoreRole = false, $class = null)
     {
         if (is_object($path)) {
-            $path = $this->dm->getUnitOfWork()->getDocumentId($path);
+            $path = $this->getDm()->getUnitOfWork()->getDocumentId($path);
         }
 
         if (null === $path || '/' === $path) {
             return null;
         }
 
-        $node = $this->dm->getPhpcrSession()->getNode($path);
+        $node = $this->getDm()->getPhpcrSession()->getNode($path);
         $parentNode = $node->getParent();
         $childNames = $parentNode->getNodeNames()->getArrayCopy();
         if ($reverse) {

Tests/Functional/Twig/ServiceTest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Functional\Twig;
+
+use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
+
+class ServiceTest extends BaseTestCase
+{
+    public function testContainer()
+    {
+        $twig = $this->getContainer()->get('twig');
+        $ext = $twig->getExtension('cmf');
+        $this->assertNotEmpty($ext);
+    }
+}
+

Tests/Unit/Twig/Extension/CmfExtensionTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Unit\Twig\Extension;
+
+use Symfony\Cmf\Bundle\CoreBundle\Twig\Extension\CmfExtension;
+
+class CmfExtensionTest extends \PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        $this->cmfHelper = $this->getMockBuilder(
+            'Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\CmfHelper'
+        )->disableOriginalConstructor()->getMock();
+
+        $this->cmfExtension = new CmfExtension($this->cmfHelper);
+        $this->env = new \Twig_Environment();
+        $this->env->addExtension($this->cmfExtension);
+    }
+
+
+    public function testFunctions()
+    {
+        $functions = $this->cmfExtension->getFunctions();
+        $this->assertCount(15, $functions);
+    }
+}

Twig/Extension/CmfExtension.php

@@ -4,110 +4,50 @@
 
 use Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\CmfHelper;
 
-class CmfExtension extends CmfHelper implements \Twig_ExtensionInterface
+class CmfExtension extends \Twig_Extension
 {
+    protected $cmfHelper;
+
+    public function __construct(CmfHelper $cmfHelper)
+    {
+        $this->cmfHelper = $cmfHelper;
+    }
+
     /**
      * Get list of available functions
      *
      * @return array
      */
     public function getFunctions()
     {
-        $functions = array('cmf_is_published' => new \Twig_Function_Method($this, 'isPublished'));
-
-        if ($this->dm) {
-            $functions['cmf_child'] = new \Twig_Function_Method($this, 'getChild');
-            $functions['cmf_children'] = new \Twig_Function_Method($this, 'getChildren');
-            $functions['cmf_prev'] = new \Twig_Function_Method($this, 'getPrev');
-            $functions['cmf_next'] = new \Twig_Function_Method($this, 'getNext');
-            $functions['cmf_find'] = new \Twig_Function_Method($this, 'find');
-            $functions['cmf_find_many'] = new \Twig_Function_Method($this, 'findMany');
-            $functions['cmf_descendants'] = new \Twig_Function_Method($this, 'getDescendants');
-            $functions['cmf_nodename'] = new \Twig_Function_Method($this, 'getNodeName');
-            $functions['cmf_parent_path'] = new \Twig_Function_Method($this, 'getParentPath');
-            $functions['cmf_path'] = new \Twig_Function_Method($this, 'getPath');
-            $functions['cmf_document_locales'] = new \Twig_Function_Method($this, 'getLocalesFor');
-
-            if (interface_exists('Symfony\Cmf\Component\Routing\RouteAwareInterface')) {
-                $functions['cmf_prev_linkable'] = new \Twig_Function_Method($this, 'getPrevLinkable');
-                $functions['cmf_next_linkable'] = new \Twig_Function_Method($this, 'getNextLinkable');
-                $functions['cmf_linkable_children'] = new \Twig_Function_Method($this, 'getLinkableChildren');
-            }
+        $functions = array(
+            new \Twig_SimpleFunction('cmf_is_published', array($this->cmfHelper, 'isPublished')),
+            new \Twig_SimpleFunction('cmf_child', array($this->cmfHelper, 'getChild')),
+            new \Twig_SimpleFunction('cmf_children', array($this->cmfHelper, 'getChildren')),
+            new \Twig_SimpleFunction('cmf_prev', array($this->cmfHelper, 'getPrev')),
+            new \Twig_SimpleFunction('cmf_next', array($this->cmfHelper, 'getNext')),
+            new \Twig_SimpleFunction('cmf_find', array($this->cmfHelper, 'find')),
+            new \Twig_SimpleFunction('cmf_find_many', array($this->cmfHelper, 'findMany')),
+            new \Twig_SimpleFunction('cmf_descendants', array($this->cmfHelper, 'getDescendants')),
+            new \Twig_SimpleFunction('cmf_nodename', array($this->cmfHelper, 'getNodeName')),
+            new \Twig_SimpleFunction('cmf_parent_path', array($this->cmfHelper, 'getParentPath')),
+            new \Twig_SimpleFunction('cmf_path', array($this->cmfHelper, 'getPath')),
+            new \Twig_SimpleFunction('cmf_document_locales', array($this->cmfHelper, 'getLocalesFor')),
+        );
+
+        if (interface_exists('Symfony\Cmf\Component\Routing\RouteAwareInterface')) {
+            $functions = array_merge($functions, array(
+                new \Twig_SimpleFunction('cmf_prev_linkable', array($this->cmfHelper, 'getPrevLinkable')),
+                new \Twig_SimpleFunction('cmf_next_linkable', array($this->cmfHelper, 'getNextLinkable')),
+                new \Twig_SimpleFunction('cmf_linkable_children', array($this->cmfHelper, 'getLinkableChildren')),
+            ));
         }
 
         return $functions;
     }
 
-    // from \Twig_Extension
-
-    /**
-     * Initializes the runtime environment.
-     *
-     * This is where you can load some file that contains filter functions for instance.
-     *
-     * @param Twig_Environment $environment The current Twig_Environment instance
-     */
-    public function initRuntime(\Twig_Environment $environment)
-    {
-    }
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
-     */
-    public function getTokenParsers()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return array An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors()
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getFilters()
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of tests to add to the existing list.
-     *
-     * @return array An array of tests
-     */
-    public function getTests()
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of operators to add to the existing list.
-     *
-     * @return array An array of operators
-     */
-    public function getOperators()
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of global variables to add to the existing list.
-     *
-     * @return array An array of global variables
-     */
-    public function getGlobals()
+    public function getName()
     {
-        return array();
+        return 'cmf';
     }
 }