Skip to content

Commit 12aadb0

Browse files
authored
Merge pull request #468 from symfony-cmf/do-not-fail-on-deprecations
adjust dependencies to latest changes in symfony and doctrine
2 parents 2ae0f09 + bc92c06 commit 12aadb0

File tree

7 files changed

+14
-29
lines changed

7 files changed

+14
-29
lines changed

.github/workflows/test-application.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
include:
25-
- php-version: '7.2'
25+
- php-version: '7.4'
2626
dependencies: 'lowest'
27-
- php-version: '7.2'
2827
- php-version: '7.4'
2928
symfony-version: '^4.4'
3029
- php-version: '7.4'

README.md

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
# Symfony CMF Routing Bundle
22

3+
[![Tests](https://github.com/symfony-cmf/routing-bundle/actions/workflows/test-application.yaml/badge.svg)](https://github.com/symfony-cmf/routing-bundle/actions)
34
[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/routing-bundle/v/stable)](https://packagist.org/packages/symfony-cmf/routing-bundle)
4-
[![Latest Unstable Version](https://poser.pugx.org/symfony-cmf/routing-bundle/v/unstable)](https://packagist.org/packages/symfony-cmf/routing-bundle)
55
[![License](https://poser.pugx.org/symfony-cmf/routing-bundle/license)](https://packagist.org/packages/symfony-cmf/routing-bundle)
66

77
[![Total Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/downloads)](https://packagist.org/packages/symfony-cmf/routing-bundle)
88
[![Monthly Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/d/monthly)](https://packagist.org/packages/symfony-cmf/routing-bundle)
99
[![Daily Downloads](https://poser.pugx.org/symfony-cmf/routing-bundle/d/daily)](https://packagist.org/packages/symfony-cmf/routing-bundle)
1010

11-
Version/Branch | Travis | Coveralls |
12-
------ | ------ | --------- |
13-
2.1.1 | [![Build Status][travis_stable_badge]][travis_link] | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link] |
14-
master | [![Build Status][travis_unstable_badge]][travis_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
15-
1611
This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed
1712
under the [MIT License](LICENSE).
1813

@@ -57,13 +52,3 @@ Thanks to
5752
## License
5853

5954
This package is available under the [MIT license](src/Resources/meta/LICENSE).
60-
61-
[travis_stable_badge]: https://travis-ci.org/symfony-cmf/routing-bundle.svg?branch=2.x
62-
[travis_unstable_badge]: https://travis-ci.org/symfony-cmf/routing-bundle.svg?branch=master
63-
64-
[travis_link]: https://travis-ci.org/symfony-cmf/routing-bundle
65-
66-
[coveralls_stable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing-bundle/badge.svg?branch=2.x
67-
[coveralls_stable_link]: https://coveralls.io/github/symfony-cmf/routing-bundle?branch=2.x
68-
[coveralls_unstable_badge]: https://coveralls.io/repos/github/symfony-cmf/routing-bundle/badge.svg?branch=master
69-
[coveralls_unstable_link]: https://coveralls.io/github/symfony-cmf/routing-bundle?branch=master

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^7.2 || ^8.0",
18+
"php": "^7.4 || ^8.0",
1919
"symfony-cmf/routing": "^2.3.0",
2020
"symfony/framework-bundle": "^4.4 || ^5.0"
2121
},
@@ -26,7 +26,7 @@
2626
"matthiasnoback/symfony-dependency-injection-test": "^4.1.0",
2727
"matthiasnoback/symfony-config-test": "^4.1.0",
2828
"doctrine/orm": "^2.5",
29-
"symfony-cmf/testing": "^3.2",
29+
"symfony-cmf/testing": "^4.0",
3030
"doctrine/data-fixtures": "^1.0.0",
3131
"symfony/form": "^4.4 || ^5.0",
3232
"symfony/translation": "^4.4 || ^5.0",
@@ -35,7 +35,7 @@
3535
"doctrine/doctrine-bundle": "^2.0",
3636
"symfony/twig-bundle": "^4.4 || ^5.0",
3737
"symfony/monolog-bundle": "^3.5",
38-
"doctrine/phpcr-bundle": "^2.1",
38+
"doctrine/phpcr-bundle": "^2.3",
3939
"symfony/serializer": "^4.4 || ^5.0",
4040
"twig/twig": "^2.4.4 || ^3.0"
4141
},

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
</filter>
3232

3333
<php>
34-
<env name="KERNEL_CLASS" value="\Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel" />
34+
<env name="KERNEL_CLASS" value="\Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Kernel" />
3535
</php>
3636
</phpunit>

tests/Fixtures/App/config/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
framework:
2-
serializer: ~
2+
serializer:
3+
enable_annotations: false
4+
property_access: ~
5+
annotations: ~

tests/Functional/BaseTestCase.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Cmf\Bundle\RoutingBundle\Tests\Functional;
1313

14-
use Doctrine\ODM\PHPCR\DocumentManager;
14+
use Doctrine\ODM\PHPCR\DocumentManagerInterface;
1515
use PHPCR\Util\PathHelper;
1616
use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
1717
use Symfony\Cmf\Bundle\RoutingBundle\Tests\Fixtures\App\Document\Content;
@@ -20,13 +20,11 @@
2020
class BaseTestCase extends ComponentBaseTestCase
2121
{
2222
/**
23-
* @return DocumentManager
23+
* @return DocumentManagerInterface
2424
*/
2525
protected function getDm()
2626
{
27-
$dm = $this->db('PHPCR')->getOm();
28-
29-
return $dm;
27+
return $this->db('PHPCR')->getOm();
3028
}
3129

3230
/**

tests/Functional/Doctrine/Orm/OrmTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class OrmTestCase extends ComponentBaseTestCase
1818
{
19-
protected function getKernelConfiguration(): array
19+
protected static function getKernelConfiguration(): array
2020
{
2121
return [
2222
'environment' => 'orm',

0 commit comments

Comments
 (0)