Merge pull request #276 from symfony-cmf/upgrade-versions

dbu · web-flow · commit 4358d365e6dd · 2021-11-29T16:10:25.000+01:00
Upgrade versions
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -0,0 +1,55 @@
+name: Test application
+
+on:
+    pull_request:
+    push:
+        branches:
+            - 'master'
+            - '[0-9]+.x'
+            - '[0-9]+.[0-9]+'
+            - '[0-9]+.[0-9]+.x'
+
+jobs:
+    test:
+        name: 'PHP ${{ matrix.php-version }}, Symfony ${{ matrix.symfony-version }} ${{ matrix.dependencies}}'
+        runs-on: ubuntu-20.04
+        env:
+            SYMFONY_PHPUNIT_VERSION: 8
+            SYMFONY_DEPRECATIONS_HELPER: "/.*each.*/"
+            SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
+
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - php-version: '7.4'
+                      dependencies: 'lowest'
+                    - php-version: '7.4'
+                      symfony-version: 4.4.*
+                      test-installation: true
+
+        steps:
+            - name: Checkout project
+              uses: actions/checkout@v2
+
+            - name: Install and configure PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php-version }}
+                  tools: 'composer:v2'
+
+            - name: Install Symfony Flex
+              run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
+
+            - name: Install dependencies with Composer
+              uses: ramsey/composer-install@v1
+              with:
+                  dependency-versions: ${{ matrix.dependencies }}
+                  composer-options: --prefer-dist
+
+            - name: Execute test cases
+              run: make test
+
+            - name: Test installation
+              if: ${{ matrix.test-installation == true }}
+              run: make test
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/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
 -----
 
diff --git a/README.md b/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
 
diff --git a/composer.json b/composer.json
@@ -14,30 +14,37 @@
         }
     ],
     "require": {
-        "php": "^7.1",
-        "symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
-        "symfony/security-core": "^2.8 || ^3.3 || ^4.0"
+        "php": "^7.4",
+        "symfony/framework-bundle": "^4.4",
+        "symfony/security-core": "^4.4"
     },
     "require-dev": {
-        "symfony/security-bundle": "^2.8 || ^3.3 || ^4.0",
-        "symfony/phpunit-bridge": "^4.2.2",
+        "jackalope/jackalope-doctrine-dbal": "^1.3",
+        "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": "^2.1.11",
-        "doctrine/dbal": "2.5.*",
+        "symfony-cmf/testing": "^4.0.0",
+        "doctrine/dbal": "^2.5",
+        "doctrine/doctrine-bundle": "^2.0",
         "doctrine/phpcr-odm": "^1.4|^2.0 ",
-        "symfony/browser-kit": "^2.8 || ^3.3 || ^4.0",
-        "symfony/templating": "^2.8 || ^3.3 || ^4.0",
-        "symfony/form": "^2.8 || ^3.3 || ^4.0",
-        "symfony/translation": "^2.8 || ^3.3 || ^4.0",
-        "symfony/validator": "^2.8 || ^3.3 || ^4.0",
-        "symfony/asset": "^2.8 || ^3.3 || ^4.0"
+        "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 (^2.8 || ^3.3 || ^4.0)",
+        "symfony/twig-bundle": "To get access to the CMF twig extension (^3.3 || ^4.4)",
         "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.8 || ^3.3 || ^4.0)",
+        "symfony/security-bundle": "To be able to use the publish workflow system (^3.3 || ^4.4)",
         "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."
@@ -54,7 +61,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2-dev"
+            "dev-master": "3.x-dev"
         }
     }
 }
diff --git a/src/Doctrine/Phpcr/NonTranslatableMetadataListener.php b/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;
 
 /**
diff --git a/src/Doctrine/Phpcr/TranslatableMetadataListener.php b/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;
 
diff --git a/src/Resources/views/Form/checkbox_url_label_form_type.html.twig b/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 %}
diff --git a/src/Templating/Helper/Cmf.php b/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.
diff --git a/src/Twig/Extension/CmfExtension.php b/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']),
             ]);
         }
 
diff --git a/tests/Fixtures/App/DataFixture/LoadHierarchyRouteData.php b/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;
 
 /**
diff --git a/tests/Fixtures/App/DataFixture/LoadRouteData.php b/tests/Fixtures/App/DataFixture/LoadRouteData.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 Doctrine\ODM\PHPCR\Document\Generic;
 use Symfony\Cmf\Bundle\CoreBundle\Tests\Fixtures\App\Document\Content;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
diff --git a/tests/Functional/DependencyInjection/CmfCoreExtensionTest.php b/tests/Functional/DependencyInjection/CmfCoreExtensionTest.php
@@ -23,7 +23,7 @@ class CmfCoreExtensionTest extends TestCase
      */
     private $container;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->container = new ContainerBuilder();
         $this->container->registerExtension(new CmfCoreExtension());
diff --git a/tests/Functional/Form/CheckboxUrlLabelFormTypeTest.php b/tests/Functional/Form/CheckboxUrlLabelFormTypeTest.php
@@ -23,7 +23,7 @@
 
 class CheckboxUrlLabelFormTypeTest extends BaseTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->db('PHPCR')->loadFixtures([LoadRouteData::class]);
     }
diff --git a/tests/Functional/PublishWorkflow/PublishWorkflowTest.php b/tests/Functional/PublishWorkflow/PublishWorkflowTest.php
@@ -26,7 +26,7 @@ class PublishWorkflowTest extends BaseTestCase
      */
     private $publishWorkflowChecker;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->publishWorkflowChecker = $this->getContainer()->get('cmf_core.publish_workflow.checker');
     }
diff --git a/tests/Functional/Templating/Helper/CmfHierarchyTest.php b/tests/Functional/Templating/Helper/CmfHierarchyTest.php
@@ -31,7 +31,7 @@ class CmfHierarchyTest extends BaseTestCase
      */
     private $helper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $dbManager = $this->db('PHPCR');
         $dbManager->loadFixtures([LoadHierarchyRouteData::class]);
diff --git a/tests/Unit/DependencyInjection/CmfCoreExtensionTest.php b/tests/Unit/DependencyInjection/CmfCoreExtensionTest.php
@@ -28,7 +28,7 @@ class CmfCoreExtensionTest extends TestCase
      */
     protected $extension;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->extension = new CmfCoreExtension();
     }
diff --git a/tests/Unit/PublishWorkflow/PublishWorkflowCheckerTest.php b/tests/Unit/PublishWorkflow/PublishWorkflowCheckerTest.php
@@ -33,7 +33,7 @@ class PublishWorkflowCheckerTest extends TestCase
 
     private $tokenStorage;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->role = 'IS_FOOBAR';
         $this->authorizationChecker = \Mockery::mock(AuthorizationCheckerInterface::class);
@@ -49,7 +49,7 @@ public function setUp()
         );
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         \Mockery::close();
     }
diff --git a/tests/Unit/PublishWorkflow/Voter/PublishTimePeriodVoterTest.php b/tests/Unit/PublishWorkflow/Voter/PublishTimePeriodVoterTest.php
@@ -31,7 +31,7 @@ class PublishTimePeriodVoterTest extends TestCase
      */
     private $token;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->voter = new PublishTimePeriodVoter();
         $this->token = new AnonymousToken('', '');
diff --git a/tests/Unit/PublishWorkflow/Voter/PublishableVoterTest.php b/tests/Unit/PublishWorkflow/Voter/PublishableVoterTest.php
diff --git a/tests/Unit/Templating/Helper/CmfTest.php b/tests/Unit/Templating/Helper/CmfTest.php
diff --git a/tests/Unit/Twig/Extension/CmfExtensionTest.php b/tests/Unit/Twig/Extension/CmfExtensionTest.php
