File tree Expand file tree Collapse file tree 4 files changed +28
-7
lines changed
Expand file tree Collapse file tree 4 files changed +28
-7
lines changed Original file line number Diff line number Diff line change 3737 "require" : {
3838 "php" : " ^8.3" ,
3939 "doctrine/persistence" : " ^4.0.0" ,
40- "nucleos/user-bundle" : " ^2.3 || ^3. 4.0" ,
40+ "nucleos/user-bundle" : " ^3.7 || ^4.0" ,
4141 "symfony/config" : " ^6.4 || ^7.0" ,
4242 "symfony/dependency-injection" : " ^6.4 || ^7.0" ,
4343 "symfony/event-dispatcher" : " ^6.4 || ^7.0" ,
Original file line number Diff line number Diff line change 1313
1414use Doctrine \DBAL \Types \Types ;
1515use Doctrine \ORM \Mapping as ORM ;
16+ use Nucleos \UserBundle \Entity \BaseGroup ;
17+ use Nucleos \UserBundle \Entity \BaseUser ;
1618use Nucleos \UserBundle \Model \Group ;
1719
20+ if (class_exists (BaseUser::class)) {
21+ abstract class InternalTestGroup extends BaseGroup {}
22+ } else {
23+ abstract class InternalTestGroup extends Group {}
24+ }
25+
1826#[ORM \Entity]
1927#[ORM \Table(name: 'user__group ' )]
20- class TestGroup extends Group
28+ class TestGroup extends InternalTestGroup
2129{
2230 #[ORM \Id]
2331 #[ORM \Column(type: Types::INTEGER )]
Original file line number Diff line number Diff line change 1515use Doctrine \Common \Collections \Collection ;
1616use Doctrine \DBAL \Types \Types ;
1717use Doctrine \ORM \Mapping as ORM ;
18+ use Nucleos \UserBundle \Entity \BaseUser ;
1819use Nucleos \UserBundle \Model \GroupInterface ;
1920use Nucleos \UserBundle \Model \User ;
2021
21- /**
22- * @phpstan-extends User<GroupInterface>
23- */
22+ if (class_exists (BaseUser::class)) {
23+ /**
24+ * @phpstan-extends BaseUser<GroupInterface>
25+ */
26+ abstract class InternalTestUser extends BaseUser {}
27+ } else {
28+ /**
29+ * @phpstan-extends User<GroupInterface>
30+ */
31+ abstract class InternalTestUser extends User {}
32+ }
33+
2434#[ORM \Entity]
2535#[ORM \Table(name: 'user__user ' )]
26- class TestUser extends User
36+ class TestUser extends InternalTestUser
2737{
2838 #[ORM \Id]
2939 #[ORM \Column(type: Types::INTEGER )]
Original file line number Diff line number Diff line change 7171 'algorithm ' => 'plaintext ' ,
7272 ]]]);
7373
74- $ containerConfigurator ->extension ('nucleos_user ' , ['db_driver ' => 'orm ' ]);
74+ // TODO: Remove when dropping support of NucleosUserBundle 3
75+ if (class_exists ('\Nucleos\UserBundle\Action\CheckEmailAction ' )) {
76+ $ containerConfigurator ->extension ('nucleos_user ' , ['db_driver ' => 'orm ' ]);
77+ }
7578
7679 $ containerConfigurator ->extension ('nucleos_user ' , ['firewall_name ' => 'main ' ]);
7780
You can’t perform that action at this time.
0 commit comments