File tree Expand file tree Collapse file tree 3 files changed +11
-11
lines changed Expand file tree Collapse file tree 3 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -16,16 +16,18 @@ jobs:
16
16
matrix :
17
17
php : ['8.1', '8.2', '8.3']
18
18
symfony : ['5.4.*', '6.4.*', '7.0.*']
19
- doctrine-orm : ['2.14.* ', '2.18.*', ' 3.0.* ']
19
+ doctrine-orm : ['^ 2.14', '^ 3.0']
20
20
composer-flags : ['--prefer-stable']
21
21
can-fail : [false]
22
+ include :
23
+ - php : " 8.1"
24
+ symfony : " 5.4.*"
25
+ doctrine-orm : " ^2.14"
26
+ composer-flags : ' --prefer-stable --prefer-lowest'
27
+ can-fail : false
22
28
exclude :
23
29
- php : " 8.1"
24
30
symfony : " 7.0.*"
25
- - doctrine-orm : " 2.14.*"
26
- symfony : " 6.4.*"
27
- - doctrine-orm : " 2.14.*"
28
- symfony : " 7.0.*"
29
31
30
32
name : " PHP ${{ matrix.php }} - Doctrine ${{ matrix.doctrine-orm }} - Symfony ${{ matrix.symfony }}${{ matrix.composer-flags != '' && format(' - Composer {0}', matrix.composer-flags) || '' }}"
31
33
40
42
run : " dev/bin/docker-compose build --build-arg PHP_VERSION=${{ matrix.php }} --build-arg XDEBUG_VERSION='3.3.1' php"
41
43
42
44
- name : " require specific Doctrine ORM version"
43
- run : " dev/bin/php composer require --ansi ${{ matrix.composer-flags }} doctrine/orm:${{ matrix.doctrine-orm }}"
45
+ run : " dev/bin/php composer require --ansi ${{ matrix.composer-flags }} --no-install doctrine/orm:${{ matrix.doctrine-orm }}"
44
46
45
47
- name : " install dependencies"
46
48
run : " dev/bin/php composer update --ansi ${{ matrix.composer-flags }}"
Original file line number Diff line number Diff line change 17
17
],
18
18
"require" : {
19
19
"php" : " ^8.1" ,
20
- "doctrine/doctrine-bundle" : " ^2.0.8 " ,
20
+ "doctrine/doctrine-bundle" : " ^2.8.0 " ,
21
21
"doctrine/orm" : " ^2.14|^3.0" ,
22
22
"league/oauth2-server" : " ^8.3" ,
23
23
"nyholm/psr7" : " ^1.4" ,
Original file line number Diff line number Diff line change 5
5
namespace League \Bundle \OAuth2ServerBundle \Tests ;
6
6
7
7
use Doctrine \DBAL \Platforms \SqlitePlatform ;
8
- use Doctrine \ORM \Configuration as OrmConfiguration ;
8
+ use Doctrine \ORM \Mapping \ Annotation ;
9
9
use League \Bundle \OAuth2ServerBundle \Manager \AccessTokenManagerInterface ;
10
10
use League \Bundle \OAuth2ServerBundle \Manager \AuthorizationCodeManagerInterface ;
11
11
use League \Bundle \OAuth2ServerBundle \Manager \ClientManagerInterface ;
@@ -80,9 +80,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
80
80
],
81
81
];
82
82
83
- if (method_exists (OrmConfiguration::class, 'setLazyGhostObjectEnabled ' )) {
84
- $ doctrine ['orm ' ] = ['enable_lazy_ghost_objects ' => true ];
85
- }
83
+ $ doctrine ['orm ' ] = ['enable_lazy_ghost_objects ' => !interface_exists (Annotation::class)];
86
84
87
85
$ container ->loadFromExtension ('doctrine ' , $ doctrine );
88
86
You can’t perform that action at this time.
0 commit comments