Migrate to PHP attributes #9606

Ecodev · Apr 25, 2023 · 9d1be2e · 9d1be2e
1 parent 0dcf099
commit 9d1be2e
Show file tree

Hide file tree

Showing 17 changed files with 120 additions and 206 deletions.
diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
         "cakephp/chronos": "^2.3",
         "doctrine/dbal": "^3.5",
         "doctrine/migrations": "^3.5",
-        "ecodev/graphql-doctrine": "^7.3",
+        "ecodev/graphql-doctrine": "^8.0",
         "imagine/imagine": "^1.3",
         "laminas/laminas-diactoros": "^2.21",
         "laminas/laminas-log": "^2.15",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Model/Message.php b/src/Model/Message.php
@@ -5,6 +5,7 @@
 namespace Ecodev\Felix\Model;
 
 use Cake\Chronos\Chronos;
+use GraphQL\Doctrine\Attribute as API;
 
 interface Message extends Model
 {
@@ -20,9 +21,8 @@ public function getDateSent(): ?Chronos;
 
     /**
      * Set sent time.
-     *
-     * @API\Exclude
      */
+    #[Api\Exclude]
     public function setDateSent(?Chronos $dateSent): void;
 
     /**

diff --git a/src/Model/Traits/AbstractFile.php b/src/Model/Traits/AbstractFile.php
@@ -6,7 +6,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Exception;
-use GraphQL\Doctrine\Annotation as API;
+use GraphQL\Doctrine\Attribute as API;
 use Psr\Http\Message\UploadedFileInterface;
 
 /**
@@ -26,15 +26,11 @@ abstract protected function getBasePath(): string;
      */
     abstract protected function getAcceptedMimeTypes(): array;
 
-    /**
-     * @API\Exclude
-     * @ORM\Column(type="string", length=190, options={"default" = ""})
-     */
+    #[ORM\Column(type: 'string', length: 190, options: ['default' => ''])]
+    #[API\Exclude]
     private string $filename = '';
 
-    /**
-     * @ORM\Column(type="string", length=255, options={"default" = ""})
-     */
+    #[ORM\Column(type: 'string', length: 255, options: ['default' => ''])]
     private string $mime = '';
 
     /**
@@ -55,19 +51,17 @@ public function setFile(UploadedFileInterface $file): void
 
     /**
      * Set filename (without path).
-     *
-     * @API\Exclude
      */
+    #[API\Exclude]
     public function setFilename(string $filename): void
     {
         $this->filename = $filename;
     }
 
     /**
      * Get filename (without path).
-     *
-     * @API\Exclude
      */
+    #[API\Exclude]
     public function getFilename(): string
     {
         return $this->filename;
@@ -83,9 +77,8 @@ public function getMime(): string
 
     /**
      * Get absolute path to file on disk.
-     *
-     * @API\Exclude
      */
+    #[API\Exclude]
     public function getPath(): string
     {
         return realpath('.') . '/' . $this->getBasePath() . $this->getFilename();
@@ -95,9 +88,8 @@ public function getPath(): string
      * Automatically called by Doctrine when the object is deleted
      * Is called after database update because we can have issues on remove operation (like integrity test)
      * and it's preferable to keep a related file on drive before removing it definitely.
-     *
-     * @ORM\PostRemove
      */
+    #[ORM\PostRemove]
     public function deleteFile(): void
     {
         $path = $this->getPath();

diff --git a/src/Model/Traits/HasDescription.php b/src/Model/Traits/HasDescription.php
@@ -8,9 +8,7 @@
 
 trait HasDescription
 {
-    /**
-     * @ORM\Column(type="text", length=65535)
-     */
+    #[ORM\Column(type: 'text', length: 65535)]
     private string $description = '';
 
     /**

diff --git a/src/Model/Traits/HasInternalRemarks.php b/src/Model/Traits/HasInternalRemarks.php
@@ -8,9 +8,7 @@
 
 trait HasInternalRemarks
 {
-    /**
-     * @ORM\Column(type="text", length=65535)
-     */
+    #[ORM\Column(type: 'text', length: 65535)]
     private string $internalRemarks = '';
 
     /**

diff --git a/src/Model/Traits/HasName.php b/src/Model/Traits/HasName.php
@@ -11,9 +11,7 @@
  */
 trait HasName
 {
-    /**
-     * @ORM\Column(type="string", length=191)
-     */
+    #[ORM\Column(type: 'string', length: 191)]
     private string $name = '';
 
     /**