Started to move doctrine annotations to attributes (rector automated)

src/Entity/UserSystem/Group.php

@@ -35,65 +35,63 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * This entity represents a user group.
- *
- * @ORM\Entity()
- * @ORM\Table("`groups`", indexes={
- *     @ORM\Index(name="group_idx_name", columns={"name"}),
- *     @ORM\Index(name="group_idx_parent_name", columns={"parent_id", "name"}),
- * })
  */
+#[ORM\Entity]
+#[ORM\Table('`groups`')]
+#[ORM\Index(name: 'group_idx_name', columns: ['name'])]
+#[ORM\Index(name: 'group_idx_parent_name', columns: ['parent_id', 'name'])]
 class Group extends AbstractStructuralDBElement implements HasPermissionsInterface
 {
     /**
-     * @ORM\OneToMany(targetEntity="Group", mappedBy="parent")
-     * @ORM\OrderBy({"name" = "ASC"})
      * @var Collection<int, self>
      */
+    #[ORM\OneToMany(targetEntity: 'Group', mappedBy: 'parent')]
+    #[ORM\OrderBy(['name' => 'ASC'])]
     protected Collection $children;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Group", inversedBy="children")
-     * @ORM\JoinColumn(name="parent_id", referencedColumnName="id")
-     */
+    #[ORM\ManyToOne(targetEntity: 'Group', inversedBy: 'children')]
+    #[ORM\JoinColumn(name: 'parent_id')]
     protected ?AbstractStructuralDBElement $parent;
 
     /**
-     * @ORM\OneToMany(targetEntity="User", mappedBy="group")
      * @var Collection<int, User>
      */
+    #[ORM\OneToMany(targetEntity: 'User', mappedBy: 'group')]
     protected Collection $users;
 
     /**
      * @var bool If true all users associated with this group must have enabled some kind of two-factor authentication
-     * @ORM\Column(type="boolean", name="enforce_2fa")
      */
     #[Groups(['extended', 'full', 'import'])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, name: 'enforce_2fa')]
     protected bool $enforce2FA = false;
     /**
      * @var Collection<int, GroupAttachment>
-     * @ORM\OneToMany(targetEntity="App\Entity\Attachments\GroupAttachment", mappedBy="element", cascade={"persist", "remove"}, orphanRemoval=true)
-     * @ORM\OrderBy({"name" = "ASC"})
      */
     #[Assert\Valid]
+    #[ORM\OneToMany(targetEntity: 'App\Entity\Attachments\GroupAttachment', mappedBy: 'element', cascade: ['persist', 'remove'], orphanRemoval: true)]
+    #[ORM\OrderBy(['name' => 'ASC'])]
     protected Collection $attachments;
 
     /**
      * @var PermissionData|null
      * @ValidPermission()
-     * @ORM\Embedded(class="PermissionData", columnPrefix="permissions_")
      */
     #[Groups(['full'])]
+    #[ORM\Embedded(class: 'PermissionData', columnPrefix: 'permissions_')]
     protected ?PermissionData $permissions = null;
 
     /** @var Collection<int, GroupParameter>
-     * @ORM\OneToMany(targetEntity="App\Entity\Parameters\GroupParameter", mappedBy="element", cascade={"persist", "remove"}, orphanRemoval=true)
-     * @ORM\OrderBy({"group" = "ASC" ,"name" = "ASC"})
      */
     #[Assert\Valid]
+    #[ORM\OneToMany(targetEntity: 'App\Entity\Parameters\GroupParameter', mappedBy: 'element', cascade: ['persist', 'remove'], orphanRemoval: true)]
+    #[ORM\OrderBy(['group' => 'ASC', 'name' => 'ASC'])]
     protected Collection $parameters;
 
     public function __construct()
     {
+        $this->attachments = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->parameters = new \Doctrine\Common\Collections\ArrayCollection();
         parent::__construct();
         $this->permissions = new PermissionData();
         $this->users = new ArrayCollection();

src/Entity/UserSystem/PermissionData.php

@@ -25,9 +25,8 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * This class is used to store the permissions of a user.
  * This has to be an embeddable or otherwise doctrine could not track the changes of the underlying data array (which is serialized to JSON in the database)
- *
- * @ORM\Embeddable()
  */
+#[ORM\Embeddable]
 final class PermissionData implements \JsonSerializable
 {
     /**
@@ -48,8 +47,8 @@ final class PermissionData implements \JsonSerializable
      * permission => [
      *     operation => value,
      * ]
-     * @ORM\Column(type="json", name="data")
      */
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, name: 'data')]
     protected ?array $data = [
         //$ prefixed entries are used for metadata
         '$ver' => self::CURRENT_SCHEMA_VERSION, //The schema version of the permission data

src/Entity/UserSystem/U2FKey.php

@@ -26,15 +26,10 @@ use App\Entity\Base\TimestampTrait;
 use Doctrine\ORM\Mapping as ORM;
 use Jbtronics\TFAWebauthn\Model\LegacyU2FKeyInterface;
 
-/**
- * @ORM\Entity
- * @ORM\Table(name="u2f_keys",
- * uniqueConstraints={
- * @ORM\UniqueConstraint(name="user_unique",columns={"user_id",
- * "key_handle"})
- * })
- * @ORM\HasLifecycleCallbacks()
- */
+#[ORM\Entity]
+#[ORM\HasLifecycleCallbacks]
+#[ORM\Table(name: 'u2f_keys')]
+#[ORM\UniqueConstraint(name: 'user_unique', columns: ['user_id', 'key_handle'])]
 class U2FKey implements LegacyU2FKeyInterface
 {
     use TimestampTrait;
@@ -43,50 +38,42 @@ class U2FKey implements LegacyU2FKeyInterface
      * We have to restrict the length here, as InnoDB only supports key index with max. 767 Bytes.
      * Max length of keyhandles should be 128. (According to U2F_MAX_KH_SIZE in FIDO example C code).
      *
-     * @ORM\Column(type="string", length=128)
      *
      * @var string
      **/
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 128)]
     public string $keyHandle;
 
     /**
-     * @ORM\Column(type="string")
-     *
      * @var string
      **/
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING)]
     public string $publicKey;
 
     /**
-     * @ORM\Column(type="text")
-     *
      * @var string
      **/
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT)]
     public string $certificate;
 
     /**
-     * @ORM\Column(type="string")
-     *
      * @var int
      **/
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING)]
     public int $counter;
 
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER)]
+    #[ORM\GeneratedValue]
     protected int $id;
 
     /**
-     * @ORM\Column(type="string")
-     *
      * @var string
      **/
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING)]
     protected string $name;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="App\Entity\UserSystem\User", inversedBy="u2fKeys")
-     **/
+    #[ORM\ManyToOne(targetEntity: 'App\Entity\UserSystem\User', inversedBy: 'u2fKeys')]
     protected ?User $user = null;
 
     public function getKeyHandle(): string

src/Entity/UserSystem/WebauthnKey.php

@@ -24,30 +24,22 @@ use App\Entity\Base\TimestampTrait;
 use Doctrine\ORM\Mapping as ORM;
 use Webauthn\PublicKeyCredentialSource as BasePublicKeyCredentialSource;
 
-/**
- * @ORM\Table(name="webauthn_keys")
- * @ORM\Entity()
- * @ORM\HasLifecycleCallbacks()
- */
+#[ORM\Entity]
+#[ORM\HasLifecycleCallbacks]
+#[ORM\Table(name: 'webauthn_keys')]
 class WebauthnKey extends BasePublicKeyCredentialSource
 {
     use TimestampTrait;
 
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER)]
+    #[ORM\GeneratedValue]
     protected int $id;
 
-    /**
-     * @ORM\Column(type="string")
-     */
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING)]
     protected string $name;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="App\Entity\UserSystem\User", inversedBy="webauthn_keys")
-     **/
+    #[ORM\ManyToOne(targetEntity: 'App\Entity\UserSystem\User', inversedBy: 'webauthn_keys')]
     protected ?User $user = null;
 
     /**