CS: Add doctrine annotations rules

.php_cs.dist

@@ -11,6 +11,7 @@ $finder = PhpCsFixer\Finder::create()
 return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony' => true,
+        '@DoctrineAnnotation' => true,
         'phpdoc_to_comment' => false,
         'phpdoc_summary' => false,
         'no_unneeded_final_method' => false,

features/bootstrap/FeatureContext.php

@@ -7,7 +7,7 @@
 class FeatureContext extends RawMinkContext
 {
     /**
-     * @Given (I )freeze the clock to :dateTime
+     * @Given I freeze the clock to :dateTime
      */
     public function freezeClock(string $dateTime): void
     {

src/CitizenProject/CitizenProjectCommand.php

@@ -96,11 +96,11 @@ class CitizenProjectCommand
      * @var UploadedFile|null
      *
      * @Assert\Image(
-     *     maxSize = "5M",
-     *     mimeTypes = {"image/jpeg", "image/png"},
-     *     minWidth = "1200",
-     *     minHeight = "675",
-     *     minRatio = 1.77,
+     *     maxSize="5M",
+     *     mimeTypes={"image/jpeg", "image/png"},
+     *     minWidth="1200",
+     *     minHeight="675",
+     *     minRatio=1.77,
      * )
      */
     private $image;

src/Committee/CommitteeCommand.php

@@ -68,8 +68,8 @@ class CommitteeCommand
      * @var UploadedFile|null
      *
      * @Assert\Image(
-     *     maxSize = "5M",
-     *     mimeTypes = {"image/jpeg", "image/png"},
+     *     maxSize="5M",
+     *     mimeTypes={"image/jpeg", "image/png"},
      * )
      */
     private $photo;

src/Controller/AssetsController.php

@@ -25,7 +25,7 @@ class AssetsController extends Controller
     private const HEIGHT = 170;
 
     /**
-     * @Route("/assets/{path}", requirements={"path"=".+"}, name="asset_url")
+     * @Route("/assets/{path}", requirements={"path": ".+"}, name="asset_url")
      * @Method("GET")
      * @Cache(maxage=900, smaxage=900)
      */
@@ -70,7 +70,7 @@ public function assetAction(string $path, Request $request)
     /**
      * @Route(
      *     "/maps/{latitude},{longitude}",
-     *     requirements={"latitude"="^%pattern_coordinate%$", "longitude"="^%pattern_coordinate%$"},
+     *     requirements={"latitude": "^%pattern_coordinate%$", "longitude": "^%pattern_coordinate%$"},
      *     name="map_url"
      * )
      * @Method("GET")
@@ -89,7 +89,7 @@ public function mapAction(Request $request, string $latitude, string $longitude)
     }
 
     /**
-     * @Route("/video/homepage.{format}", requirements={"format"="mov|mp4"}, name="homepage_video_url")
+     * @Route("/video/homepage.{format}", requirements={"format": "mov|mp4"}, name="homepage_video_url")
      * @Method("GET")
      * @Cache(maxage=60, smaxage=60)
      */
@@ -103,7 +103,7 @@ public function videoAction(string $format)
     }
 
     /**
-     * @Route("/algolia/{type}/{slug}", requirements={"type"="proposal|custom|article|clarification"})
+     * @Route("/algolia/{type}/{slug}", requirements={"type": "proposal|custom|article|clarification"})
      * @Method("GET")
      * @Cache(maxage=900, smaxage=900)
      */

src/Controller/EnMarche/ArticleController.php

@@ -19,8 +19,8 @@ class ArticleController extends Controller
     /**
      * @Route(
      *     "/articles/{category}/{page}",
-     *     requirements={"category"="\w+", "page"="\d+"},
-     *     defaults={"category"="tout", "page"=1},
+     *     requirements={"category": "\w+", "page": "\d+"},
+     *     defaults={"category": "tout", "page": 1},
      *     name="articles_list"
      * )
      * @Method("GET")

src/Controller/EnMarche/CitizenActionController.php

@@ -97,9 +97,9 @@ public function unregistrationAction(Request $request, CitizenAction $citizenAct
 
     /**
      * @Route(
-     *   path="/{slug}/confirmation",
-     *   name="app_citizen_action_attend_confirmation",
-     *   condition="request.query.has('registration')"
+     *     path="/{slug}/confirmation",
+     *     name="app_citizen_action_attend_confirmation",
+     *     condition="request.query.has('registration')"
      * )
      * @Method("GET")
      */

src/Controller/EnMarche/CommitteeController.php

@@ -69,8 +69,8 @@ public function showAction(Request $request, Committee $committee): Response
 
     /**
      * @Route("/timeline/{id}/modifier", name="app_committee_timeline_edit")
-     * @ParamConverter("committee", options={"mapping":{"slug": "slug"}})
-     * @ParamConverter("committeeFeedItem", options={"mapping":{"id": "id"}})
+     * @ParamConverter("committee", options={"mapping": {"slug": "slug"}})
+     * @ParamConverter("committeeFeedItem", options={"mapping": {"id": "id"}})
      * @Method("GET|POST")
      * @Security("is_granted('ADMIN_FEED_COMMITTEE', committeeFeedItem)")
      */
@@ -103,8 +103,8 @@ public function timelineEditAction(Request $request, Committee $committee, Commi
 
     /**
      * @Route("/timeline/{id}/supprimer", name="app_committee_timeline_delete")
-     * @ParamConverter("committee", options={"mapping":{"slug": "slug"}})
-     * @ParamConverter("committeeFeedItem", options={"mapping":{"id": "id"}})
+     * @ParamConverter("committee", options={"mapping": {"slug": "slug"}})
+     * @ParamConverter("committeeFeedItem", options={"mapping": {"id": "id"}})
      * @Method("DELETE")
      * @Security("is_granted('ADMIN_FEED_COMMITTEE', committeeFeedItem)")
      */

src/Controller/EnMarche/DocumentsController.php

@@ -29,7 +29,7 @@ public function indexAction()
     /**
      * @Route(
      *     "/dossier/{type}/{path}",
-     *     requirements={"type"="adherents|animateurs|referents|animateurs-etrangers|candidats-legislatives", "path"=".+"},
+     *     requirements={"type": "adherents|animateurs|referents|animateurs-etrangers|candidats-legislatives", "path": ".+"},
      *     name="app_documents_directory"
      * )
      * @Method("GET")
@@ -52,7 +52,7 @@ public function directoryAction($type, $path)
     /**
      * @Route(
      *     "/telecharger/{type}/{path}",
-     *     requirements={"type"="adherents|animateurs|referents|animateurs-etrangers|candidats-legislatives", "path"=".+"},
+     *     requirements={"type": "adherents|animateurs|referents|animateurs-etrangers|candidats-legislatives", "path": ".+"},
      *     name="app_documents_file"
      * )
      * @Method("GET")

src/Controller/EnMarche/DonationController.php

@@ -91,7 +91,7 @@ public function informationsAction(Request $request, DonationRequestUtils $donat
     }
 
     /**
-     * @Route("/{uuid}/paiement", requirements={"uuid"="%pattern_uuid%"}, name="donation_pay")
+     * @Route("/{uuid}/paiement", requirements={"uuid": "%pattern_uuid%"}, name="donation_pay")
      * @Method("GET")
      */
     public function payboxAction(PayboxFormFactory $payboxFormFactory, Donation $donation)
@@ -122,7 +122,7 @@ public function callbackAction(Request $request, TransactionCallbackHandler $tra
     /**
      * @Route(
      *     "/{uuid}/{status}",
-     *     requirements={"status"="effectue|erreur", "uuid"="%pattern_uuid%"},
+     *     requirements={"status": "effectue|erreur", "uuid": "%pattern_uuid%"},
      *     name="donation_result"
      * )
      * @ParamConverter("donation", options={"mapping": {"uuid": "uuid"}})

src/Controller/EnMarche/EventController.php

@@ -86,9 +86,9 @@ public function attendAction(Request $request, Event $event): Response
 
     /**
      * @Route(
-     *   path="/confirmation",
-     *   name="app_event_attend_confirmation",
-     *   condition="request.query.has('registration')"
+     *     path="/confirmation",
+     *     name="app_event_attend_confirmation",
+     *     condition="request.query.has('registration')"
      * )
      * @Method("GET")
      */

src/Controller/EnMarche/HomeController.php

@@ -37,8 +37,8 @@ public function sitemapIndexAction(): Response
     /**
      * @Route(
      *     "/sitemap_{type}_{page}.xml",
-     *     requirements={"type"=AppBundle\Sitemap\SitemapFactory::ALL_TYPES, "page"="\d+"},
-     *     defaults={"page"="1"},
+     *     requirements={"type": AppBundle\Sitemap\SitemapFactory::ALL_TYPES, "page": "\d+"},
+     *     defaults={"page": "1"},
      *     name="app_sitemap"
      * )
      * @Method("GET")

src/Controller/EnMarche/LegacyController.php

@@ -13,7 +13,7 @@
 class LegacyController extends Controller
 {
     /**
-     * @Route("/espaceperso/evenement/{id}-{slug}", requirements={"id"="\d+"})
+     * @Route("/espaceperso/evenement/{id}-{slug}", requirements={"id": "\d+"})
      * @Method("GET")
      * @Entity("event", expr="repository.find(id)")
      */
@@ -25,7 +25,7 @@ public function redirectEventAction(Event $event): Response
     }
 
     /**
-     * @Route("/espaceperso/comite/{id}-{slug}", requirements={"id"="\d+"})
+     * @Route("/espaceperso/comite/{id}-{slug}", requirements={"id": "\d+"})
      * @Method("GET")
      * @Entity("committee", expr="repository.find(id)")
      */

src/Controller/EnMarche/MembershipController.php

@@ -171,12 +171,12 @@ public function completeAction(MembershipRegistrationProcess $membershipRegistra
      * membership account.
      *
      * @Route(
-     *   path="/inscription/finaliser/{adherent_uuid}/{activation_token}",
-     *   name="app_membership_activate",
-     *   requirements={
-     *     "adherent_uuid": "%pattern_uuid%",
-     *     "activation_token": "%pattern_sha1%"
-     *   }
+     *     path="/inscription/finaliser/{adherent_uuid}/{activation_token}",
+     *     name="app_membership_activate",
+     *     requirements={
+     *         "adherent_uuid": "%pattern_uuid%",
+     *         "activation_token": "%pattern_sha1%"
+     *     }
      * )
      * @Method("GET")
      * @Entity("adherent", expr="repository.findOneByUuid(adherent_uuid)")

src/Controller/EnMarche/ProcurationController.php

@@ -24,7 +24,7 @@
 class ProcurationController extends Controller
 {
     /**
-     * @Route( name="app_procuration_landing")
+     * @Route(name="app_procuration_landing")
      * @Method("GET")
      */
     public function landingAction(ProcurationSession $procurationSession): Response
@@ -39,7 +39,7 @@ public function landingAction(ProcurationSession $procurationSession): Response
     /**
      * @Route(
      *     "/choisir/{action}",
-     *     requirements={"action"=AppBundle\Procuration\ElectionContext::CONTROLLER_ACTION_REQUIREMENT},
+     *     requirements={"action": AppBundle\Procuration\ElectionContext::CONTROLLER_ACTION_REQUIREMENT},
      *     name="app_procuration_choose_election"
      * )
      * @Method("GET|POST")
@@ -70,7 +70,7 @@ public function chooseElectionAction(Request $request, string $action, Procurati
      * @Route("/je-demande", name="app_procuration_index_legacy")
      * @Route(
      *     "/je-demande/{step}",
-     *     requirements={"step"="mon-lieu-de-vote|mes-coordonnees|ma-procuration"},
+     *     requirements={"step": "mon-lieu-de-vote|mes-coordonnees|ma-procuration"},
      *     name="app_procuration_request"
      * )
      * @Method("GET|POST")

src/Controller/EnMarche/ProcurationManagerController.php

@@ -117,7 +117,7 @@ public function proposalsMoreAction(Request $request, ProcurationManager $manage
     /**
      * @Route(
      *     "/mandataires/{id}/{action}",
-     *     requirements={ "id"="\d+", "action"=AppBundle\Entity\ProcurationProxy::ACTIONS_URI_REGEX },
+     *     requirements={ "id": "\d+", "action": AppBundle\Entity\ProcurationProxy::ACTIONS_URI_REGEX },
      *     name="app_procuration_manager_proposal_transform"
      * )
      * @Method("GET")
@@ -142,7 +142,7 @@ public function proposalTransformAction(int $id, string $action, ProcurationMana
     /**
      * @Route(
      *     "/demande/{id}",
-     *     requirements={"id"="\d+"},
+     *     requirements={"id": "\d+"},
      *     name="app_procuration_manager_request"
      * )
      * @Method("GET")
@@ -162,7 +162,7 @@ public function requestAction(int $id, ProcurationManager $manager): Response
     /**
      * @Route(
      *     "/demande/{id}/{action}/{token}",
-     *     requirements={"id"="\d+", "action"=AppBundle\Entity\ProcurationRequest::ACTIONS_URI_REGEX},
+     *     requirements={"id": "\d+", "action": AppBundle\Entity\ProcurationRequest::ACTIONS_URI_REGEX},
      *     name="app_procuration_manager_request_transform"
      * )
      * @Method("GET")
@@ -191,7 +191,7 @@ public function requestTransformAction(int $id, string $action, string $token, P
     /**
      * @Route(
      *     "/demande/{id}/associer/{proxyId}",
-     *     requirements={"id"="\d+"},
+     *     requirements={"id": "\d+"},
      *     name="app_procuration_manager_request_associate"
      * )
      * @Method("GET|POST")
@@ -235,7 +235,7 @@ public function requestAssociateAction(Request $sfRequest, ProcurationRequest $r
     /**
      * @Route(
      *     "/demande/{id}/desassocier",
-     *     requirements={"id"="\d+"},
+     *     requirements={"id": "\d+"},
      *     name="app_procuration_manager_request_deassociate"
      * )
      * @Method("GET|POST")

src/Controller/EnMarche/ReportController.php

@@ -22,7 +22,7 @@ class ReportController extends AbstractController
      * @Route(
      *     "/report/{type}/{uuid}",
      *     name="app_report",
-     *     requirements={"type"=AppBundle\Report\ReportType::TYPES_URI_PATTERN}
+     *     requirements={"type": AppBundle\Report\ReportType::TYPES_URI_PATTERN}
      * )
      * @Method("GET|POST")
      * @Security("is_granted('REPORT')")

src/Controller/EnMarche/SearchController.php

@@ -134,7 +134,7 @@ public function resultsAction(Request $request)
     }
 
     /**
-     * @Route("/tous-les-evenements/{page}", requirements={"page"="\d+"}, name="app_search_all_events")
+     * @Route("/tous-les-evenements/{page}", requirements={"page": "\d+"}, name="app_search_all_events")
      * @Method("GET")
      */
     public function allEventsAction(int $page = 1)
@@ -158,7 +158,7 @@ public function allEventsAction(int $page = 1)
     }
 
     /**
-     * @Route("/tous-les-comites/{page}", requirements={"page"="\d+"}, name="app_search_all_committees")
+     * @Route("/tous-les-comites/{page}", requirements={"page": "\d+"}, name="app_search_all_committees")
      * @Method("GET")
      */
     public function allCommitteesAction(int $page = 1)

src/Controller/EnMarche/Security/SecurityController.php

@@ -95,12 +95,12 @@ public function retrieveForgotPasswordAction(Request $request)
 
     /**
      * @Route(
-     *   path="/changer-mot-de-passe/{adherent_uuid}/{reset_password_token}",
-     *   name="adherent_reset_password",
-     *   requirements={
-     *     "adherent_uuid": "%pattern_uuid%",
-     *     "reset_password_token": "%pattern_sha1%"
-     *   }
+     *     path="/changer-mot-de-passe/{adherent_uuid}/{reset_password_token}",
+     *     name="adherent_reset_password",
+     *     requirements={
+     *         "adherent_uuid": "%pattern_uuid%",
+     *         "reset_password_token": "%pattern_sha1%"
+     *     }
      * )
      * @Method("GET|POST")
      * @Entity("adherent", expr="repository.findOneByUuid(adherent_uuid)")

src/Controller/RedirectingController.php

@@ -10,7 +10,7 @@
 class RedirectingController extends Controller
 {
     /**
-     * @Route("/{url}", name="remove_trailing_slash", requirements={"url" = ".*\/$"}, methods={"GET"})
+     * @Route("/{url}", name="remove_trailing_slash", requirements={"url": ".*\/$"}, methods={"GET"})
      */
     public function removeTrailingSlashAction(Request $request): Response
     {

src/Donation/DonationRequest.php

@@ -32,31 +32,31 @@ class DonationRequest
     /**
      * @Assert\NotBlank(message="common.gender.invalid_choice")
      * @Assert\Choice(
-     *   callback = {"AppBundle\ValueObject\Genders", "all"},
-     *   message="common.gender.invalid_choice",
-     *   strict=true
+     *     callback={"AppBundle\ValueObject\Genders", "all"},
+     *     message="common.gender.invalid_choice",
+     *     strict=true
      * )
      */
     public $gender;
 
     /**
      * @Assert\NotBlank(message="common.first_name.not_blank")
      * @Assert\Length(
-     *   min=2,
-     *   max=50,
-     *   minMessage="common.first_name.min_length",
-     *   maxMessage="common.first_name.max_length"
+     *     min=2,
+     *     max=50,
+     *     minMessage="common.first_name.min_length",
+     *     maxMessage="common.first_name.max_length"
      * )
      */
     public $firstName;
 
     /**
      * @Assert\NotBlank(message="common.first_name.not_blank")
      * @Assert\Length(
-     *   min=2,
-     *   max=50,
-     *   minMessage="common.last_name.min_length",
-     *   maxMessage="common.last_name.max_length"
+     *     min=2,
+     *     max=50,
+     *     minMessage="common.last_name.min_length",
+     *     maxMessage="common.last_name.max_length"
      * )
      */
     public $lastName;