Refactored code to use PHP8 attributes instead of annotations

In this change, Doctrine and validation annotations have been replaced with PHP8 Attributes. The Rector tool has been configured with a list of annotations to convert to attributes. As a consequence, the PHPStan's rules have been updated to reflect these changes. The PHP8's nullable operator (?) has been added where required, and comments in field declaration have been replaced with #[Attribute] syntax.
This commit is contained in:
Julien Fastré 2024-04-08 12:11:29 +02:00
parent 0ff4593863
commit 5be85a4fc6
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
35 changed files with 164 additions and 531 deletions

View File

@ -5,3 +5,45 @@
**Note**: It is not necessary to apply this tag on service definition: the tag is automatically applyied if the **Note**: It is not necessary to apply this tag on service definition: the tag is automatically applyied if the
service implements `\Chill\MainBundle\Security\ProvideRoleInterface`. service implements `\Chill\MainBundle\Security\ProvideRoleInterface`.
- those annotation can be converted to attribute:
- `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity`
- `Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential`
- `Chill\PersonBundle\Validator\Constraints\Household\MaxHolder`
- `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer`
- `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity`
- `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap`
- `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck`
- `Chill\PersonBundle\Validator\Constraints\Person\Birthdate`
- `Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter`
- `Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate`
- `Chill\ActivityBundle\Validator\Constraints\ActivityValidity`
- `Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists`
- `Chill\MainBundle\Validation\Constraint\PhonenumberConstraint`
- `Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency`
- `Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation`
Here is the rector rule that can be used to switch attributes to annotations:
```php
$rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class, [
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\MaxHolder'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\Birthdate'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\ActivityBundle\Validator\Constraints\ActivityValidity'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validation\Constraint\PhonenumberConstraint'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation'),
]);
```

View File

@ -0,0 +1,50 @@
# See https://github.com/doctrine/orm/issues/11313 for a follow-up
parameters:
ignoreErrors:
-
message: """
#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
use Order\\:\\:Ascending instead$#
"""
count: 1
path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
-
message: """
#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
use Order\\:\\:Ascending instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Entity/Notification.php
-
message: """
#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
use Order\\:\\:Descending instead$#
"""
count: 1
path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
-
message: """
#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
use Order\\:\\:Descending instead$#
"""
count: 1
path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
-
message: """
#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
use Order\\:\\:Descending instead$#
"""
count: 2
path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
message: """
#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
use Order\\:\\:Descending instead$#
"""
count: 2
path: src/Bundle/ChillPersonBundle/Entity/Person.php

View File

@ -1,53 +1,5 @@
parameters: parameters:
ignoreErrors: ignoreErrors:
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 5
path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 5
path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
-
message: """
#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
"""
count: 2
path: src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 3
path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 4
path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 4
path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
- -
message: """ message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\: #^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
@ -56,86 +8,6 @@ parameters:
count: 2 count: 2
path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 9
path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 4
path: src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 7
path: src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 4
path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, use method or constructor injection in your controller instead$#
"""
count: 2
path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 6
path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 6
path: src/Bundle/ChillEventBundle/Controller/EventTypeController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 10
path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 6
path: src/Bundle/ChillEventBundle/Controller/RoleController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 6
path: src/Bundle/ChillEventBundle/Controller/StatusController.php
- -
message: """ message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\: #^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
@ -144,14 +16,6 @@ parameters:
count: 1 count: 1
path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 2
path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
- -
message: """ message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\: #^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
@ -160,14 +24,6 @@ parameters:
count: 1 count: 1
path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 7
path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
- -
message: """ message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\: #^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
@ -176,14 +32,6 @@ parameters:
count: 3 count: 3
path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 7
path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
- -
message: """ message: """
#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\: #^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
@ -192,14 +40,6 @@ parameters:
count: 2 count: 2
path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
-
message: """
#^Parameter \\$passwordEncoder of method Chill\\\\MainBundle\\\\Command\\\\ChillImportUsersCommand\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\UserPasswordEncoderInterface\\:
since Symfony 5\\.3, use \\{@link UserPasswordHasherInterface\\} instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
- -
message: """ message: """
#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\: #^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
@ -216,30 +56,6 @@ parameters:
count: 1 count: 1
path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
-
message: """
#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\MessageDigestPasswordEncoder\\:
since Symfony 5\\.3, use \\{@link MessageDigestPasswordHasher\\} instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 2
path: src/Bundle/ChillMainBundle/Controller/AbsenceController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Controller/AddressApiController.php
- -
message: """ message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\: #^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
@ -248,46 +64,6 @@ parameters:
count: 1 count: 1
path: src/Bundle/ChillMainBundle/Controller/MenuController.php path: src/Bundle/ChillMainBundle/Controller/MenuController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 5
path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
message: """
#^Parameter \\$passwordEncoder of method Chill\\\\MainBundle\\\\Controller\\\\PasswordController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\UserPasswordEncoderInterface\\:
since Symfony 5\\.3, use \\{@link UserPasswordHasherInterface\\} instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 5
path: src/Bundle/ChillMainBundle/Controller/ScopeController.php
- -
message: """ message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\: #^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
@ -295,13 +71,6 @@ parameters:
""" """
count: 1 count: 1
path: src/Bundle/ChillMainBundle/Controller/SearchController.php path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 6
path: src/Bundle/ChillMainBundle/Controller/UserController.php
- -
message: """ message: """
@ -311,30 +80,6 @@ parameters:
count: 1 count: 1
path: src/Bundle/ChillMainBundle/Controller/UserController.php path: src/Bundle/ChillMainBundle/Controller/UserController.php
-
message: """
#^Parameter \\$passwordEncoder of method Chill\\\\MainBundle\\\\Controller\\\\UserController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\UserPasswordEncoderInterface\\:
since Symfony 5\\.3, use \\{@link UserPasswordHasherInterface\\} instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Controller/UserController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Controller/UserProfileController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Controller/WorkflowController.php
- -
message: """ message: """
#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\EncoderFactory\\: #^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\EncoderFactory\\:
@ -343,30 +88,6 @@ parameters:
count: 1 count: 1
path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
-
message: """
#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\MessageDigestPasswordEncoder\\:
since Symfony 5\\.3, use \\{@link MessageDigestPasswordHasher\\} instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
-
message: """
#^Parameter \\$passwordEncoder of method Chill\\\\MainBundle\\\\Form\\\\UserPasswordType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\UserPasswordEncoderInterface\\:
since Symfony 5\\.3, use \\{@link UserPasswordHasherInterface\\} instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Form/UserPasswordType.php
-
message: """
#^Call to deprecated method isMasterRequest\\(\\) of class Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\KernelEvent\\:
since symfony/http\\-kernel 5\\.3, use isMainRequest\\(\\) instead$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
- -
message: """ message: """
#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\: #^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
@ -375,14 +96,6 @@ parameters:
count: 2 count: 2
path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
message: """
#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Exception\\\\UsernameNotFoundException\\:
since Symfony 5\\.3 to be removed in 6\\.0, use UserNotFoundException instead\\.$#
"""
count: 1
path: src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
- -
message: """ message: """
#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\: #^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
@ -407,54 +120,6 @@ parameters:
count: 1 count: 1
path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 3
path: src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 5
path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 3
path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 6
path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
- -
message: """ message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\: #^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
@ -463,53 +128,6 @@ parameters:
count: 13 count: 13
path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 6
path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 3
path: src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 4
path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 8
path: src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
- -
message: """ message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\: #^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
@ -518,30 +136,6 @@ parameters:
count: 4 count: 4
path: src/Bundle/ChillPersonBundle/Controller/PersonController.php path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 8
path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 4
path: src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 1
path: src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
- -
message: """ message: """
#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\: #^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
@ -550,22 +144,6 @@ parameters:
count: 7 count: 7
path: src/Bundle/ChillReportBundle/Controller/ReportController.php path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 9
path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
message: """
#^Call to deprecated method getDoctrine\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
since Symfony 5\\.4, inject an instance of ManagerRegistry in your controller instead$#
"""
count: 8
path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
- -
message: """ message: """
#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\: #^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:

View File

@ -32,3 +32,4 @@ includes:
- phpstan-baseline-level-4.neon - phpstan-baseline-level-4.neon
- phpstan-baseline-level-5.neon - phpstan-baseline-level-5.neon
- phpstan-deprecations-sf54.neon - phpstan-deprecations-sf54.neon
- phpstan-baseline-deprecations-doctrine-orm.neon

View File

@ -11,6 +11,7 @@ declare(strict_types=1);
use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector; use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
use Rector\Config\RectorConfig; use Rector\Config\RectorConfig;
use Rector\Php80\Rector\Class_\AnnotationToAttributeRector;
use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\LevelSetList;
return static function (RectorConfig $rectorConfig): void { return static function (RectorConfig $rectorConfig): void {
@ -69,4 +70,22 @@ return static function (RectorConfig $rectorConfig): void {
\Rector\Symfony\Symfony28\Rector\MethodCall\GetToConstructorInjectionRector::class, \Rector\Symfony\Symfony28\Rector\MethodCall\GetToConstructorInjectionRector::class,
\Rector\Symfony\Symfony34\Rector\Closure\ContainerGetNameToTypeInTestsRector::class, \Rector\Symfony\Symfony34\Rector\Closure\ContainerGetNameToTypeInTestsRector::class,
]); ]);
$rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\MaxHolder'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\Birthdate'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\ActivityBundle\Validator\Constraints\ActivityValidity'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validation\Constraint\PhonenumberConstraint'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency'),
new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation'),
]);
}; };

View File

@ -25,7 +25,6 @@ use Chill\MainBundle\Entity\HasScopesInterface;
use Chill\MainBundle\Entity\Location; use Chill\MainBundle\Entity\Location;
use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Entity\User; use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface; use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Person;
@ -42,19 +41,12 @@ use Symfony\Component\Validator\Constraints as Assert;
/** /**
* Class Activity. * Class Activity.
*
* @ActivityValidator\ActivityValidity
*
* TODO see if necessary
* UserCircleConsistency(
* "CHILL_ACTIVITY_SEE_DETAILS",
* getUserFunction="getUser",
* path="scope")
*/ */
#[DiscriminatorMap(typeProperty: 'type', mapping: ['activity' => Activity::class])] #[DiscriminatorMap(typeProperty: 'type', mapping: ['activity' => Activity::class])]
#[ORM\Entity(repositoryClass: \Chill\ActivityBundle\Repository\ActivityRepository::class)] #[ORM\Entity(repositoryClass: \Chill\ActivityBundle\Repository\ActivityRepository::class)]
#[ORM\HasLifecycleCallbacks] #[ORM\HasLifecycleCallbacks]
#[ORM\Table(name: 'activity')] #[ORM\Table(name: 'activity')]
#[ActivityValidator\ActivityValidity] // TODO see if necessary
class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface, TrackCreationInterface, TrackUpdateInterface class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface, TrackCreationInterface, TrackUpdateInterface
{ {
use TrackCreationTrait; use TrackCreationTrait;

View File

@ -13,9 +13,7 @@ namespace Chill\ActivityBundle\Validator\Constraints;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_CLASS)]
* @Annotation
*/
class ActivityValidity extends Constraint class ActivityValidity extends Constraint
{ {
final public const IS_REQUIRED_MESSAGE = ' is required'; final public const IS_REQUIRED_MESSAGE = ' is required';

View File

@ -13,7 +13,6 @@ namespace Chill\CustomFieldsBundle\Entity;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\Order;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
/** /**
@ -36,7 +35,7 @@ class CustomFieldsGroup
* @var Collection<CustomField> * @var Collection<CustomField>
*/ */
#[ORM\OneToMany(targetEntity: CustomField::class, mappedBy: 'customFieldGroup')] #[ORM\OneToMany(targetEntity: CustomField::class, mappedBy: 'customFieldGroup')]
#[ORM\OrderBy(['ordering' => 'ASC'])] #[ORM\OrderBy(['ordering' => \Doctrine\Common\Collections\Criteria::ASC])]
private Collection $customFields; private Collection $customFields;
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)]

View File

@ -28,13 +28,10 @@ use Symfony\Component\Serializer\Annotation as Serializer;
* *
* The property `$deleteAt` allow a deletion of the document after the given date. But this property should * The property `$deleteAt` allow a deletion of the document after the given date. But this property should
* be set before the document is actually written by the StoredObjectManager. * be set before the document is actually written by the StoredObjectManager.
*
* @AsyncFileExists(
* message="The file is not stored properly"
* )
*/ */
#[ORM\Entity] #[ORM\Entity]
#[ORM\Table('chill_doc.stored_object')] #[ORM\Table('chill_doc.stored_object')]
#[AsyncFileExists(message: 'The file is not stored properly')]
class StoredObject implements Document, TrackCreationInterface class StoredObject implements Document, TrackCreationInterface
{ {
use TrackCreationTrait; use TrackCreationTrait;

View File

@ -13,13 +13,17 @@ namespace Chill\DocStoreBundle\Validator\Constraints;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
* @Annotation
*/
final class AsyncFileExists extends Constraint final class AsyncFileExists extends Constraint
{ {
public string $message = "The file '{{ filename }}' is not stored properly."; public string $message = "The file '{{ filename }}' is not stored properly.";
public function __construct(?array $options = null, ?string $message = null, ?array $groups = null, $payload = null)
{
parent::__construct($options ?? [], $groups, $payload);
$this->message = $message;
}
public function validatedBy() public function validatedBy()
{ {
return AsyncFileExistsValidator::class; return AsyncFileExistsValidator::class;

View File

@ -65,18 +65,14 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255, nullable: true)] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255, nullable: true)]
private ?string $name = null; private ?string $name = null;
/**
* @PhonenumberConstraint(type="any")
*/
#[Serializer\Groups(['read', 'write', 'docgen:read'])] #[Serializer\Groups(['read', 'write', 'docgen:read'])]
#[ORM\Column(type: 'phone_number', nullable: true)] #[ORM\Column(type: 'phone_number', nullable: true)]
#[PhonenumberConstraint(type: 'any')]
private ?PhoneNumber $phonenumber1 = null; private ?PhoneNumber $phonenumber1 = null;
/**
* @PhonenumberConstraint(type="any")
*/
#[Serializer\Groups(['read', 'write', 'docgen:read'])] #[Serializer\Groups(['read', 'write', 'docgen:read'])]
#[ORM\Column(type: 'phone_number', nullable: true)] #[ORM\Column(type: 'phone_number', nullable: true)]
#[PhonenumberConstraint(type: 'any')]
private ?PhoneNumber $phonenumber2 = null; private ?PhoneNumber $phonenumber2 = null;
#[Serializer\Groups(['read'])] #[Serializer\Groups(['read'])]

View File

@ -14,7 +14,6 @@ namespace Chill\MainBundle\Entity;
use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\Order;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Component\Validator\Context\ExecutionContextInterface; use Symfony\Component\Validator\Context\ExecutionContextInterface;
@ -58,7 +57,7 @@ class Notification implements TrackUpdateInterface
* @var Collection<NotificationComment> * @var Collection<NotificationComment>
*/ */
#[ORM\OneToMany(targetEntity: NotificationComment::class, mappedBy: 'notification', orphanRemoval: true)] #[ORM\OneToMany(targetEntity: NotificationComment::class, mappedBy: 'notification', orphanRemoval: true)]
#[ORM\OrderBy(['createdAt' => 'ASC'])] #[ORM\OrderBy(['createdAt' => \Doctrine\Common\Collections\Criteria::ASC])]
private Collection $comments; private Collection $comments;
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE)] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE)]

View File

@ -111,10 +111,9 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
/** /**
* The user's mobile phone number. * The user's mobile phone number.
*
* @PhonenumberConstraint()
*/ */
#[ORM\Column(type: 'phone_number', nullable: true)] #[ORM\Column(type: 'phone_number', nullable: true)]
#[PhonenumberConstraint]
private ?PhoneNumber $phonenumber = null; private ?PhoneNumber $phonenumber = null;
/** /**

View File

@ -24,12 +24,10 @@ use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer; use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints as Assert;
/**
* @EntityWorkflowCreation(groups={"creation"})
*/
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['entity_workflow' => EntityWorkflow::class])] #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['entity_workflow' => EntityWorkflow::class])]
#[ORM\Entity] #[ORM\Entity]
#[ORM\Table('chill_main_workflow_entity')] #[ORM\Table('chill_main_workflow_entity')]
#[EntityWorkflowCreation(groups: ['creation'])]
class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
{ {
use TrackCreationTrait; use TrackCreationTrait;

View File

@ -102,7 +102,7 @@ class SortExportElementTest extends KernelTestCase
private function makeTranslator(): TranslatorInterface private function makeTranslator(): TranslatorInterface
{ {
return new class () implements TranslatorInterface { return new class () implements TranslatorInterface {
public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null) public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null)
{ {
return $id; return $id;
} }

View File

@ -13,9 +13,7 @@ namespace Chill\MainBundle\Validation\Constraint;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD)]
* @Annotation
*/
class PhonenumberConstraint extends Constraint class PhonenumberConstraint extends Constraint
{ {
public $notLandlineMessage = 'This is not a landline phonenumber'; public $notLandlineMessage = 'This is not a landline phonenumber';
@ -29,7 +27,13 @@ class PhonenumberConstraint extends Constraint
* *
* @var string 'landline', 'mobile' or 'any' * @var string 'landline', 'mobile' or 'any'
*/ */
public $type; public string $type;
public function __construct(?array $options = null, ?string $type = null, ?array $groups = null, $payload = null)
{
parent::__construct($options ?? [], $groups, $payload);
$this->type = $type ?? 'any';
}
public function validatedBy() public function validatedBy()
{ {

View File

@ -13,9 +13,7 @@ namespace Chill\MainBundle\Validator\Constraints\Entity;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_CLASS)]
* @Annotation
*/
class UserCircleConsistency extends Constraint class UserCircleConsistency extends Constraint
{ {
public $getUserFunction = 'getUser'; public $getUserFunction = 'getUser';

View File

@ -17,9 +17,8 @@ namespace Chill\MainBundle\Workflow\Validator;
* * a handler exists; * * a handler exists;
* * a related entity does exists; * * a related entity does exists;
* * a workflow can be associated with this entity. * * a workflow can be associated with this entity.
*
* @Annotation
*/ */
#[\Attribute(\Attribute::TARGET_CLASS)]
class EntityWorkflowCreation extends \Symfony\Component\Validator\Constraint class EntityWorkflowCreation extends \Symfony\Component\Validator\Constraint
{ {
public string $messageEntityNotFound = 'Related entity is not found'; public string $messageEntityNotFound = 'Related entity is not found';

View File

@ -53,17 +53,14 @@ use UnexpectedValueException;
/** /**
* AccompanyingPeriod Class. * AccompanyingPeriod Class.
*
* @AccompanyingPeriodValidity(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
*
* @LocationValidity(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
*
* @ConfidentialCourseMustHaveReferrer(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
*/ */
#[DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period' => AccompanyingPeriod::class])] #[DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period' => AccompanyingPeriod::class])]
#[Assert\GroupSequenceProvider] #[Assert\GroupSequenceProvider]
#[ORM\Entity] #[ORM\Entity]
#[ORM\Table(name: 'chill_person_accompanying_period')] #[ORM\Table(name: 'chill_person_accompanying_period')]
#[AccompanyingPeriodValidity(groups: [AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED])]
#[LocationValidity(groups: [AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED])]
#[ConfidentialCourseMustHaveReferrer(groups: [AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED])]
class AccompanyingPeriod implements class AccompanyingPeriod implements
GroupSequenceProviderInterface, GroupSequenceProviderInterface,
HasCentersInterface, HasCentersInterface,
@ -215,12 +212,11 @@ class AccompanyingPeriod implements
private ?Origin $origin = null; private ?Origin $origin = null;
/** /**
* @ParticipationOverlap(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
*
* @var Collection<AccompanyingPeriodParticipation> * @var Collection<AccompanyingPeriodParticipation>
*/ */
#[Groups(['read', 'docgen:read'])] #[Groups(['read', 'docgen:read'])]
#[ORM\OneToMany(targetEntity: AccompanyingPeriodParticipation::class, mappedBy: 'accompanyingPeriod', orphanRemoval: true, cascade: ['persist', 'refresh', 'remove', 'merge', 'detach'])] #[ORM\OneToMany(targetEntity: AccompanyingPeriodParticipation::class, mappedBy: 'accompanyingPeriod', orphanRemoval: true, cascade: ['persist', 'refresh', 'remove', 'merge', 'detach'])]
#[ParticipationOverlap(groups: [AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED])]
private Collection $participations; private Collection $participations;
#[ORM\ManyToOne(targetEntity: Person::class, inversedBy: 'periodLocatedOn')] #[ORM\ManyToOne(targetEntity: Person::class, inversedBy: 'periodLocatedOn')]
@ -251,11 +247,10 @@ class AccompanyingPeriod implements
/** /**
* @var Collection<resource> * @var Collection<resource>
*
* @ResourceDuplicateCheck(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED, "Default", "default"})
*/ */
#[Groups(['read', 'docgen:read'])] #[Groups(['read', 'docgen:read'])]
#[ORM\OneToMany(targetEntity: AccompanyingPeriod\Resource::class, mappedBy: 'accompanyingPeriod', cascade: ['persist', 'remove'], orphanRemoval: true)] #[ORM\OneToMany(targetEntity: AccompanyingPeriod\Resource::class, mappedBy: 'accompanyingPeriod', cascade: ['persist', 'remove'], orphanRemoval: true)]
#[ResourceDuplicateCheck(groups: [AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED, 'Default', 'default'])]
private Collection $resources; private Collection $resources;
/** /**

View File

@ -24,7 +24,6 @@ use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
use Chill\ThirdPartyBundle\Entity\ThirdParty; use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\Order;
use Doctrine\Common\Collections\ReadableCollection; use Doctrine\Common\Collections\ReadableCollection;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer; use Symfony\Component\Serializer\Annotation as Serializer;
@ -47,7 +46,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
*/ */
#[Serializer\Groups(['read', 'docgen:read'])] #[Serializer\Groups(['read', 'docgen:read'])]
#[ORM\OneToMany(targetEntity: AccompanyingPeriodWorkEvaluation::class, mappedBy: 'accompanyingPeriodWork', cascade: ['remove', 'persist'], orphanRemoval: true)] #[ORM\OneToMany(targetEntity: AccompanyingPeriodWorkEvaluation::class, mappedBy: 'accompanyingPeriodWork', cascade: ['remove', 'persist'], orphanRemoval: true)]
#[ORM\OrderBy(['startDate' => 'DESC', 'id' => 'DESC'])] #[ORM\OrderBy(['startDate' => \Doctrine\Common\Collections\Criteria::DESC, 'id' => 'DESC'])]
private Collection $accompanyingPeriodWorkEvaluations; private Collection $accompanyingPeriodWorkEvaluations;
#[Serializer\Groups(['read', 'docgen:read', 'read:accompanyingPeriodWork:light'])] #[Serializer\Groups(['read', 'docgen:read', 'read:accompanyingPeriodWork:light'])]

View File

@ -25,12 +25,10 @@ use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Component\Validator\Context\ExecutionContextInterface; use Symfony\Component\Validator\Context\ExecutionContextInterface;
/**
* @MaxHolder(groups={"household_memberships"})
*/
#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['household' => Household::class])] #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['household' => Household::class])]
#[ORM\Entity] #[ORM\Entity]
#[ORM\Table(name: 'chill_person_household')] #[ORM\Table(name: 'chill_person_household')]
#[MaxHolder(groups: ['household_memberships'])]
class Household class Household
{ {
/** /**

View File

@ -47,12 +47,6 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
/** /**
* Person Class. * Person Class.
*
* @PersonHasCenter
*
* @HouseholdMembershipSequential(
* groups={"household_memberships"}
* )
*/ */
#[DiscriminatorMap(typeProperty: 'type', mapping: ['person' => Person::class])] #[DiscriminatorMap(typeProperty: 'type', mapping: ['person' => Person::class])]
#[ORM\Entity] #[ORM\Entity]
@ -60,6 +54,8 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
#[ORM\Index(name: 'person_birthdate', columns: ['birthdate'])] // @ORM\HasLifecycleCallbacks #[ORM\Index(name: 'person_birthdate', columns: ['birthdate'])] // @ORM\HasLifecycleCallbacks
#[ORM\Table(name: 'chill_person_person')] #[ORM\Table(name: 'chill_person_person')]
#[ORM\HasLifecycleCallbacks] #[ORM\HasLifecycleCallbacks]
#[PersonHasCenter]
#[HouseholdMembershipSequential(groups: ['household_memberships'])]
class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateInterface, \Stringable class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateInterface, \Stringable
{ {
final public const BOTH_GENDER = 'both'; final public const BOTH_GENDER = 'both';
@ -122,10 +118,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
/** /**
* The person's birthdate. * The person's birthdate.
*
* @Birthdate
*/ */
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATE_MUTABLE, nullable: true)] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATE_MUTABLE, nullable: true)]
#[Birthdate]
private ?\DateTime $birthdate = null; private ?\DateTime $birthdate = null;
/** /**
@ -316,10 +311,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
/** /**
* The person's mobile phone number. * The person's mobile phone number.
*
* @PhonenumberConstraint(type="mobile")
*/ */
#[ORM\Column(type: 'phone_number', nullable: true)] #[ORM\Column(type: 'phone_number', nullable: true)]
#[PhonenumberConstraint(type: 'mobile')]
private ?PhoneNumber $mobilenumber = null; private ?PhoneNumber $mobilenumber = null;
/** /**
@ -350,12 +344,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
/** /**
* The person's phonenumber. * The person's phonenumber.
*
* @PhonenumberConstraint(
* type="landline",
* )
*/ */
#[ORM\Column(type: 'phone_number', nullable: true)] #[ORM\Column(type: 'phone_number', nullable: true)]
#[PhonenumberConstraint(type: 'landline')]
private ?PhoneNumber $phonenumber = null; private ?PhoneNumber $phonenumber = null;
/** /**

View File

@ -23,13 +23,11 @@ use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap; use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints as Assert;
/**
* @RelationshipNoDuplicate
*/
#[DiscriminatorMap(typeProperty: 'type', mapping: ['relationship' => Relationship::class])] #[DiscriminatorMap(typeProperty: 'type', mapping: ['relationship' => Relationship::class])]
#[ORM\Entity] #[ORM\Entity]
#[DiscriminatorColumn(name: 'relation_id', type: 'integer')] #[DiscriminatorColumn(name: 'relation_id', type: 'integer')]
#[ORM\Table(name: 'chill_person_relationships')] #[ORM\Table(name: 'chill_person_relationships')]
#[RelationshipNoDuplicate]
class Relationship implements TrackCreationInterface, TrackUpdateInterface class Relationship implements TrackCreationInterface, TrackUpdateInterface
{ {
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE)] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE)]

View File

@ -27,7 +27,7 @@ class ByStepAggregatorTest extends AbstractAggregatorTest
public function getAggregator() public function getAggregator()
{ {
$translator = new class () implements TranslatorInterface { $translator = new class () implements TranslatorInterface {
public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null) public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null)
{ {
return $id; return $id;
} }

View File

@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_CLASS)]
* @Annotation
*/
class AccompanyingPeriodValidity extends Constraint class AccompanyingPeriodValidity extends Constraint
{ {
public $messageSocialIssueCannotBeDeleted = 'The social %name% issue cannot be deleted because it is associated with an activity or an action'; public $messageSocialIssueCannotBeDeleted = 'The social %name% issue cannot be deleted because it is associated with an activity or an action';

View File

@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_CLASS)]
* @Annotation
*/
class ConfidentialCourseMustHaveReferrer extends Constraint class ConfidentialCourseMustHaveReferrer extends Constraint
{ {
public string $message = 'A confidential parcours must have a referrer'; public string $message = 'A confidential parcours must have a referrer';

View File

@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_CLASS)]
* @Annotation
*/
class LocationValidity extends Constraint class LocationValidity extends Constraint
{ {
public $messagePeriodMustRemainsLocated = 'The period must remain located'; public $messagePeriodMustRemainsLocated = 'The period must remain located';

View File

@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_PROPERTY)]
* @Annotation
*/
class ParticipationOverlap extends Constraint class ParticipationOverlap extends Constraint
{ {
public $message = '{{ name }} is already associated to this accompanying course.'; public $message = '{{ name }} is already associated to this accompanying course.';

View File

@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_PROPERTY)]
* @Annotation
*/
class ResourceDuplicateCheck extends Constraint class ResourceDuplicateCheck extends Constraint
{ {
public $message = '{{ name }} is already associated to this accompanying course.'; public $message = '{{ name }} is already associated to this accompanying course.';

View File

@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Validator\Constraints\Household;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_CLASS)]
* @Annotation
*/
class HouseholdMembershipSequential extends Constraint class HouseholdMembershipSequential extends Constraint
{ {
public $message = 'household_membership.Person with membership covering'; public $message = 'household_membership.Person with membership covering';

View File

@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Validator\Constraints\Household;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_CLASS)]
* @Annotation
*/
class MaxHolder extends Constraint class MaxHolder extends Constraint
{ {
public $message = 'household.max_holder_overflowed'; public $message = 'household.max_holder_overflowed';

View File

@ -20,9 +20,8 @@ use Symfony\Component\Validator\Constraint;
* interval_spec : http://php.net/manual/en/dateinterval.construct.php * interval_spec : http://php.net/manual/en/dateinterval.construct.php
* (this interval_spec itself is based on ISO8601 : * (this interval_spec itself is based on ISO8601 :
* https://en.wikipedia.org/wiki/ISO_8601#Durations) * https://en.wikipedia.org/wiki/ISO_8601#Durations)
*
* @Annotation
*/ */
#[\Attribute(\Attribute::TARGET_PROPERTY)]
class Birthdate extends Constraint class Birthdate extends Constraint
{ {
final public const BIRTHDATE_INVALID_CODE = '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4'; final public const BIRTHDATE_INVALID_CODE = '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4';

View File

@ -11,9 +11,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Validator\Constraints\Person; namespace Chill\PersonBundle\Validator\Constraints\Person;
/** #[\Attribute(\Attribute::TARGET_CLASS)]
* @Annotation
*/
class PersonHasCenter extends \Symfony\Component\Validator\Constraint class PersonHasCenter extends \Symfony\Component\Validator\Constraint
{ {
public string $message = 'A center is required'; public string $message = 'A center is required';

View File

@ -13,9 +13,7 @@ namespace Chill\PersonBundle\Validator\Constraints\Relationship;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
/** #[\Attribute(\Attribute::TARGET_CLASS)]
* @Annotation
*/
class RelationshipNoDuplicate extends Constraint class RelationshipNoDuplicate extends Constraint
{ {
public $message = 'relationship.duplicate'; public $message = 'relationship.duplicate';

View File

@ -206,11 +206,9 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
#[Context(normalizationContext: ['groups' => 'docgen:read'], groups: ['docgen:read:3party:parent'])] #[Context(normalizationContext: ['groups' => 'docgen:read'], groups: ['docgen:read:3party:parent'])]
private string $profession = ''; private string $profession = '';
/**
* @PhonenumberConstraint(type="any")
*/
#[Groups(['read', 'write', 'docgen:read', 'docgen:read:3party:parent'])] #[Groups(['read', 'write', 'docgen:read', 'docgen:read:3party:parent'])]
#[ORM\Column(name: 'telephone', type: 'phone_number', nullable: true)] #[ORM\Column(name: 'telephone', type: 'phone_number', nullable: true)]
#[PhonenumberConstraint(type: 'any')]
private ?PhoneNumber $telephone = null; private ?PhoneNumber $telephone = null;
#[ORM\Column(name: 'types', type: \Doctrine\DBAL\Types\Types::JSON, nullable: true)] #[ORM\Column(name: 'types', type: \Doctrine\DBAL\Types\Types::JSON, nullable: true)]