Merge pull request #468 from symfony-cmf/do-not-fail-on-deprecations

adjust dependencies to latest changes in symfony and doctrine

Author: dbu

.github/workflows/test-application.yaml

@@ -22,9 +22,8 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - php-version: '7.2'
+                    - php-version: '7.4'
                       dependencies: 'lowest'
-                    - php-version: '7.2'
                     - php-version: '7.4'
                       symfony-version: '^4.4'
                     - php-version: '7.4'

README.md

@@ -1,18 +1,13 @@
 # Symfony CMF Routing Bundle
 
+[![Tests](https://github.com/symfony-cmf/routing-bundle/actions/workflows/test-application.yaml/badge.svg)](https://github.com/symfony-cmf/routing-bundle/actions)
 [![Latest Stable Version](https://poser.pugx.org/symfony-cmf/routing-bundle/v/stable)](https://packagist.org/packages/symfony-cmf/routing-bundle)
-[![Latest Unstable Version](https://poser.pugx.org/symfony-cmf/routing-bundle/v/unstable)](https://packagist.org/packages/symfony-cmf/routing-bundle)
 [![License](https://poser.pugx.org/symfony-cmf/routing-bundle/license)](https://packagist.org/packages/symfony-cmf/routing-bundle)
 
 [![Total Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/downloads)](https://packagist.org/packages/symfony-cmf/routing-bundle)
 [![Monthly Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/d/monthly)](https://packagist.org/packages/symfony-cmf/routing-bundle)
 [![Daily Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/d/daily)](https://packagist.org/packages/symfony-cmf/routing-bundle)
 
-Version/Branch | Travis | Coveralls |
------- | ------ | --------- |
-2.1.1   | [![Build Status][travis_stable_badge]][travis_link]     | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link]     |
-master | [![Build Status][travis_unstable_badge]][travis_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
-
 This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
 under the [MIT License](LICENSE).
 
@@ -57,13 +52,3 @@ Thanks to
 ## License
 
 This package is available under the [MIT license](src/Resources/meta/LICENSE).
-
-[travis_stable_badge]: https://travis-ci.org/symfony-cmf/routing-bundle.svg?branch=2.x
-[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/routing-bundle.svg?branch=master
-
-[travis_link]: https://travis-ci.org/symfony-cmf/routing-bundle
-
-[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing-bundle/badge.svg?branch=2.x
-[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/routing-bundle?branch=2.x
-[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing-bundle/badge.svg?branch=master
-[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/routing-bundle?branch=master

composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "symfony-cmf/routing": "^2.3.0",
         "symfony/framework-bundle": "^4.4 || ^5.0"
     },
@@ -26,7 +26,7 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.1.0",
         "matthiasnoback/symfony-config-test": "^4.1.0",
         "doctrine/orm": "^2.5",
-        "symfony-cmf/testing": "^3.2",
+        "symfony-cmf/testing": "^4.0",
         "doctrine/data-fixtures": "^1.0.0",
         "symfony/form": "^4.4 || ^5.0",
         "symfony/translation": "^4.4 || ^5.0",
@@ -35,7 +35,7 @@
         "doctrine/doctrine-bundle": "^2.0",
         "symfony/twig-bundle": "^4.4 || ^5.0",
         "symfony/monolog-bundle": "^3.5",
-        "doctrine/phpcr-bundle": "^2.1",
+        "doctrine/phpcr-bundle": "^2.3",
         "symfony/serializer": "^4.4 || ^5.0",
         "twig/twig": "^2.4.4 || ^3.0"
     },

phpunit.xml.dist

@@ -31,6 +31,6 @@
     </filter>
 
     <php>
-        <env name="KERNEL_CLASS" value="\Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel" />
+	    <env name="KERNEL_CLASS" value="\Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel" />
     </php>
 </phpunit>

tests/Fixtures/App/config/config.yml

@@ -1,2 +1,5 @@
 framework:
-    serializer: ~
+    serializer:
+        enable_annotations: false
+    property_access: ~
+    annotations: ~

tests/Functional/BaseTestCase.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional;
 
-use Doctrine\ODM\PHPCR\DocumentManager;
+use Doctrine\ODM\PHPCR\DocumentManagerInterface;
 use PHPCR\Util\PathHelper;
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 use Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Document\Content;
@@ -20,13 +20,11 @@
 class BaseTestCase extends ComponentBaseTestCase
 {
     /**
-     * @return DocumentManager
+     * @return DocumentManagerInterface
      */
     protected function getDm()
     {
-        $dm = $this->db('PHPCR')->getOm();
-
-        return $dm;
+        return $this->db('PHPCR')->getOm();
     }
 
     /**

tests/Functional/Doctrine/Orm/OrmTestCase.php

@@ -16,7 +16,7 @@
 
 class OrmTestCase extends ComponentBaseTestCase
 {
-    protected function getKernelConfiguration(): array
+    protected static function getKernelConfiguration(): array
     {
         return [
             'environment' => 'orm',