further restrict versions and adjust to twig 2

Author: dbu

.github/workflows/test-application.yaml

@@ -24,10 +24,6 @@ jobs:
                 include:
                     - php-version: '7.4'
                       dependencies: 'lowest'
-                    - php-version: '7.4'
-                      symfony-version: 3.3.*
-                    - php-version: '7.4'
-                      symfony-version: 3.4.*
                     - php-version: '7.4'
                       symfony-version: 4.4.*
                       test-installation: true

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+3.0.0 (unreleased)
+-----
+
+* Adjust to doctrine and twig BC breaks. If you extended classes or customized services, check for old `Twig_*` classes or `Doctrine\Common\Persistence` namespace.
+* Drop support for old Symfony versions
+* Drop support for old PHP versions
+
 2.1.1
 -----
 

README.md

@@ -23,9 +23,7 @@ a twig extension and php templating helper to walk PHPCR-ODM trees and support f
 
 ## Requirements
 
-* PHP 7.1 / 7.2
-* Symfony 2.8 / 3.3 / 3.4 / 4.0
-* See also the `require` section of [composer.json](composer.json)
+* See the `require` section of [composer.json](composer.json)
 
 ## Documentation
 

composer.json

@@ -15,24 +15,30 @@
     ],
     "require": {
         "php": "^7.4",
-        "symfony/framework-bundle": "^3.3 || ^4.4",
-        "symfony/security-core": "^3.3 || ^4.4"
+        "symfony/framework-bundle": "^4.4",
+        "symfony/security-core": "^4.4"
     },
     "require-dev": {
         "jackalope/jackalope-doctrine-dbal": "^1.3",
-        "symfony/security-bundle": "^3.3 || ^4.4",
-        "symfony/phpunit-bridge": "^4.2.2",
+        "symfony/security-bundle": "^4.4",
+        "symfony/phpunit-bridge": "^4.4.34",
         "mockery/mockery": "^0.9.4",
         "symfony-cmf/routing-bundle": "^2.1.0",
         "symfony-cmf/testing": "^4.0.0",
-        "doctrine/dbal": "2.5.*",
+        "doctrine/dbal": "^2.5",
+        "doctrine/doctrine-bundle": "^2.0",
         "doctrine/phpcr-odm": "^1.4|^2.0 ",
-        "symfony/browser-kit": "^3.3 || ^4.4",
-        "symfony/templating": "^3.3 || ^4.4",
-        "symfony/form": "^3.3 || ^4.4",
-        "symfony/translation": "^3.3 || ^4.4",
-        "symfony/validator": "^3.3 || ^4.4",
-        "symfony/asset": "^3.3 || ^4.4"
+        "doctrine/phpcr-bundle": "^2.3.0",
+        "symfony/browser-kit": "^4.4",
+        "symfony/form": "^4.4",
+        "symfony/monolog-bridge": "^4.4",
+        "symfony/monolog-bundle": "^3.0",
+        "symfony/templating": "^4.4",
+        "symfony/translation": "^4.4",
+        "symfony/twig-bundle": "^4.4",
+        "symfony/validator": "^4.4",
+        "symfony/yaml": "^4.4",
+        "symfony/asset": "^4.4"
     },
     "suggest": {
         "symfony/twig-bundle": "To get access to the CMF twig extension (^3.3 || ^4.4)",
@@ -55,7 +61,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2-dev"
+            "dev-master": "3.x-dev"
         }
     }
 }

src/Doctrine/Phpcr/NonTranslatableMetadataListener.php

@@ -12,7 +12,7 @@
 namespace Symfony\Cmf\Bundle\CoreBundle\Doctrine\Phpcr;
 
 use Doctrine\Common\EventSubscriber;
-use Doctrine\Common\Persistence\Event\LoadClassMetadataEventArgs;
+use Doctrine\Persistence\Event\LoadClassMetadataEventArgs;
 use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
 
 /**

src/Doctrine/Phpcr/TranslatableMetadataListener.php

@@ -12,7 +12,7 @@
 namespace Symfony\Cmf\Bundle\CoreBundle\Doctrine\Phpcr;
 
 use Doctrine\Common\EventSubscriber;
-use Doctrine\Common\Persistence\Event\LoadClassMetadataEventArgs;
+use Doctrine\Persistence\Event\LoadClassMetadataEventArgs;
 use Doctrine\ODM\PHPCR\Mapping\ClassMetadata;
 use Symfony\Cmf\Bundle\CoreBundle\Translatable\TranslatableInterface;
 

src/Resources/views/Form/checkbox_url_label_form_type.html.twig

@@ -1,9 +1,9 @@
 {% block cmf_core_checkbox_url_label_row %}
-{% spaceless %}
+{% apply spaceless %}
 {{ form_errors(form) }}
 <label class="checkbox">
     <input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
     {{ label | trans(paths, translation_domain) | raw }}
 </label>
-{% endspaceless %}
+{% endapply %}
 {% endblock %}

src/Templating/Helper/Cmf.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Templating\Helper;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\ODM\PHPCR\Translation\MissingTranslationException;
 use PHPCR\Util\PathHelper;
@@ -20,7 +20,6 @@
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Templating\Helper\Helper;
 
 /**
  * Layout helper for the CMF.

src/Twig/Extension/CmfExtension.php

@@ -13,8 +13,10 @@
 
 use Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\Cmf;
 use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
-class CmfExtension extends \Twig_Extension
+class CmfExtension extends AbstractExtension
 {
     protected $helper;
 
@@ -31,27 +33,27 @@ public function __construct(Cmf $helper)
     public function getFunctions()
     {
         $functions = [
-            new \Twig_SimpleFunction('cmf_is_published', [$this, 'isPublished']),
-            new \Twig_SimpleFunction('cmf_child', [$this, 'getChild']),
-            new \Twig_SimpleFunction('cmf_children', [$this, 'getChildren']),
-            new \Twig_SimpleFunction('cmf_prev', [$this, 'getPrev']),
-            new \Twig_SimpleFunction('cmf_next', [$this, 'getNext']),
-            new \Twig_SimpleFunction('cmf_find', [$this, 'find']),
-            new \Twig_SimpleFunction('cmf_find_translation', [$this, 'findTranslation']),
-            new \Twig_SimpleFunction('cmf_find_many', [$this, 'findMany']),
-            new \Twig_SimpleFunction('cmf_descendants', [$this, 'getDescendants']),
-            new \Twig_SimpleFunction('cmf_nodename', [$this, 'getNodeName']),
-            new \Twig_SimpleFunction('cmf_parent_path', [$this, 'getParentPath']),
-            new \Twig_SimpleFunction('cmf_path', [$this, 'getPath']),
-            new \Twig_SimpleFunction('cmf_document_locales', [$this, 'getLocalesFor']),
+            new TwigFunction('cmf_is_published', [$this, 'isPublished']),
+            new TwigFunction('cmf_child', [$this, 'getChild']),
+            new TwigFunction('cmf_children', [$this, 'getChildren']),
+            new TwigFunction('cmf_prev', [$this, 'getPrev']),
+            new TwigFunction('cmf_next', [$this, 'getNext']),
+            new TwigFunction('cmf_find', [$this, 'find']),
+            new TwigFunction('cmf_find_translation', [$this, 'findTranslation']),
+            new TwigFunction('cmf_find_many', [$this, 'findMany']),
+            new TwigFunction('cmf_descendants', [$this, 'getDescendants']),
+            new TwigFunction('cmf_nodename', [$this, 'getNodeName']),
+            new TwigFunction('cmf_parent_path', [$this, 'getParentPath']),
+            new TwigFunction('cmf_path', [$this, 'getPath']),
+            new TwigFunction('cmf_document_locales', [$this, 'getLocalesFor']),
         ];
 
         if (interface_exists(RouteReferrersReadInterface::class)) {
             $functions = array_merge($functions, [
-                new \Twig_SimpleFunction('cmf_is_linkable', [$this, 'isLinkable']),
-                new \Twig_SimpleFunction('cmf_prev_linkable', [$this, 'getPrevLinkable']),
-                new \Twig_SimpleFunction('cmf_next_linkable', [$this, 'getNextLinkable']),
-                new \Twig_SimpleFunction('cmf_linkable_children', [$this, 'getLinkableChildren']),
+                new TwigFunction('cmf_is_linkable', [$this, 'isLinkable']),
+                new TwigFunction('cmf_prev_linkable', [$this, 'getPrevLinkable']),
+                new TwigFunction('cmf_next_linkable', [$this, 'getNextLinkable']),
+                new TwigFunction('cmf_linkable_children', [$this, 'getLinkableChildren']),
             ]);
         }
 

tests/Fixtures/App/DataFixture/LoadHierarchyRouteData.php

@@ -12,7 +12,7 @@
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Fixtures\App\DataFixture;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Cmf\Bundle\CoreBundle\Tests\Fixtures\App\Document\RouteAware;
 
 /**