Skip to content

Commit 645433b

Browse files
committed
adjust dependencies to latest changes in symfony and doctrine
1 parent 2ae0f09 commit 645433b

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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)