[Rector] Applied all Symfony 5.x rectors to the production codebase (#85

) Applied rules: * AddReturnTypeDeclarationRector * AnnotationToAttributeRector * CommandConstantReturnCodeRector
ibexa · Aug 9, 2024 · b41ec1e · b41ec1e
1 parent 536f68b
commit b41ec1e
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 25 deletions.
diff --git a/src/bundle/Command/AuditUserDatabaseCommand.php b/src/bundle/Command/AuditUserDatabaseCommand.php
@@ -109,7 +109,7 @@ public function execute(
         $output->writeln('');
         $output->writeln('Done.');
 
-        return 0;
+        return Command::SUCCESS;
     }
 
     /**

diff --git a/src/lib/Form/Data/UserInvitationData.php b/src/lib/Form/Data/UserInvitationData.php
@@ -16,18 +16,13 @@
 
 final class UserInvitationData
 {
-    /**
-     * @Assert\NotBlank()
-     *
-     * @Assert\Email()
-     */
+    #[Assert\NotBlank]
+    #[Assert\Email]
     private string $email;
 
     private ?Role $role;
 
-    /**
-     * @Assert\NotBlank()
-     */
+    #[Assert\NotBlank]
     private ?SiteAccess $siteaccess;
 
     private ?UserGroup $userGroup;

diff --git a/src/lib/Form/Data/UserPasswordChangeData.php b/src/lib/Form/Data/UserPasswordChangeData.php
@@ -16,17 +16,15 @@ class UserPasswordChangeData
     /**
      * @UserAssert\UserPassword()
      *
-     * @Assert\NotBlank()
-     *
      * @var string
      */
+    #[Assert\NotBlank]
     private $oldPassword;
 
     /**
-     * @Assert\NotBlank()
-     *
      * @var string
      */
+    #[Assert\NotBlank]
     private $newPassword;
 
     /**

diff --git a/src/lib/Form/Data/UserPasswordForgotData.php b/src/lib/Form/Data/UserPasswordForgotData.php
@@ -13,10 +13,9 @@
 class UserPasswordForgotData
 {
     /**
-     * @Assert\NotBlank()
-     *
      * @var string
      */
+    #[Assert\NotBlank]
     private $email;
 
     /**

diff --git a/src/lib/Form/Data/UserPasswordForgotWithLoginData.php b/src/lib/Form/Data/UserPasswordForgotWithLoginData.php
@@ -13,10 +13,9 @@
 class UserPasswordForgotWithLoginData
 {
     /**
-     * @Assert\NotBlank()
-     *
      * @var string
      */
+    #[Assert\NotBlank]
     private $login;
 
     /**

diff --git a/src/lib/Form/Data/UserPasswordResetData.php b/src/lib/Form/Data/UserPasswordResetData.php
@@ -14,10 +14,9 @@
 class UserPasswordResetData
 {
     /**
-     * @Assert\NotBlank()
-     *
      * @var string
      */
+    #[Assert\NotBlank]
     private $newPassword;
 
     /**

diff --git a/src/lib/Form/Data/UserSettingUpdateData.php b/src/lib/Form/Data/UserSettingUpdateData.php
@@ -12,9 +12,7 @@
 
 class UserSettingUpdateData
 {
-    /**
-     * @Assert\NotBlank()
-     */
+    #[Assert\NotBlank]
     private string $identifier;
 
     /**

diff --git a/src/lib/Form/Processor/UserRegisterFormProcessor.php b/src/lib/Form/Processor/UserRegisterFormProcessor.php
@@ -53,7 +53,7 @@ public function __construct(
         $this->notificationService = $notificationService;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             UserFormEvents::USER_REGISTER => ['processRegister', 20],

diff --git a/src/lib/Form/Type/UserRegisterType.php b/src/lib/Form/Type/UserRegisterType.php
@@ -38,12 +38,12 @@ public function getName()
         return $this->getBlockPrefix();
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'ezplatform_content_forms_user_register';
     }
 
-    public function getParent()
+    public function getParent(): ?string
     {
         return BaseContentType::class;
     }