do not hard depend on symfony templating being activated (#255)

Author: dbu

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.1.0
+-----
+
+* Symfony 4 support
+* Removed PHP 5.6 and 7.0 support, removed support for Symfony 3.0 - 3.2
+
 2.0.0
 -----
 

composer.json

@@ -22,8 +22,8 @@
         "symfony/security-bundle": "^2.8 || ^3.3 || ^4.0",
         "symfony/phpunit-bridge": "^3.3 || ^4.0",
         "mockery/mockery": "^0.9.4",
-        "symfony-cmf/routing-bundle": "^2.1.0-RC1",
-        "symfony-cmf/testing": "^2.1.0-RC1",
+        "symfony-cmf/routing-bundle": "^2.1.0",
+        "symfony-cmf/testing": "^2.1.0",
         "doctrine/dbal": "2.5.*",
         "doctrine/phpcr-odm": "^1.4|^2.0 ",
         "symfony/browser-kit": "^2.8 || ^3.3 || ^4.0",
@@ -34,12 +34,12 @@
         "symfony/asset": "^2.8 || ^3.3 || ^4.0"
     },
     "suggest": {
-        "symfony/twig-bundle": "To get access to the CMF twig extension (^2.1)",
+        "symfony/twig-bundle": "To get access to the CMF twig extension (^2.8 || ^3.3 || ^4.0)",
         "doctrine/phpcr-bundle": "To be able to use the CMF twig extension (^1.0)",
         "doctrine/phpcr-odm": "To be able to use the CMF twig extension (^1.0)",
-        "symfony/security-bundle": "To be able to use the publish workflow system (^2.1)",
-        "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable (^2.0)",
-        "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener (^2.0)",
+        "symfony/security-bundle": "To be able to use the publish workflow system (^2.8 || ^3.3 || ^4.0)",
+        "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable (^2.1)",
+        "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener (^2.1)",
         "symfony-cmf/sonata-admin-integration-bundle": "To provide an admin interface for the PHPCR ODM documents."
     },
     "autoload": {

src/DependencyInjection/CmfCoreExtension.php

@@ -257,7 +257,7 @@ public function load(array $configs, ContainerBuilder $container)
             $container->setParameter($this->getAlias().'.persistence.phpcr.manager_name', $config['persistence']['phpcr']['manager_name']);
             $container->setParameter($this->getAlias().'.persistence.phpcr.basepath', $config['persistence']['phpcr']['basepath']);
 
-            $templatingHelper = $container->getDefinition($this->getAlias().'.templating.helper');
+            $templatingHelper = $container->getDefinition($this->getAlias().'.templating.cmf');
             $templatingHelper->addMethodCall('setDoctrineRegistry', [
                 new Reference($config['persistence']['phpcr']['manager_registry']),
                 '%cmf_core.persistence.phpcr.manager_name%',

src/Resources/config/services.xml

@@ -10,13 +10,17 @@
 
     <services>
 
+        <service id="cmf_core.templating.cmf" class="Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\Cmf" public="false">
+            <argument type="service" id="cmf_core.publish_workflow.checker" on-invalid="ignore"/>
+        </service>
+
         <service id="cmf_core.twig.children_extension" class="Symfony\Cmf\Bundle\CoreBundle\Twig\Extension\CmfExtension" public="false">
-            <argument type="service" id="cmf_core.templating.helper"/>
+            <argument type="service" id="cmf_core.templating.cmf"/>
             <tag name="twig.extension"/>
         </service>
 
         <service id="cmf_core.templating.helper" class="Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\CmfHelper" public="false">
-            <argument type="service" id="cmf_core.publish_workflow.checker" on-invalid="ignore"/>
+            <argument type="service" id="cmf_core.templating.cmf"/>
             <tag name="templating.helper" alias="cmf"/>
         </service>