Merge pull request #1517 from mbabker/orm-3-compat-fixes

Run the ORM tests using an attribute driver when able
schmittjoh · Oct 17, 2023 · 9c2ac39 · 9c2ac39
2 parents 9b8dc5b + e2e11af
commit 9c2ac39
Show file tree

Hide file tree

Showing 18 changed files with 129 additions and 14 deletions.
diff --git a/tests/Fixtures/Doctrine/Embeddable/BlogPostSeo.php b/tests/Fixtures/Doctrine/Embeddable/BlogPostSeo.php
@@ -4,17 +4,20 @@
 
 namespace JMS\Serializer\Tests\Fixtures\Doctrine\Embeddable;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Embeddable()
  */
+#[ORM\Embeddable]
 class BlogPostSeo
 {
     /**
      * @ORM\Column(type="string", name="meta_title")
      *
      * @var string
      */
+    #[ORM\Column(type: Types::STRING, name: 'meta_title')]
     private $metaTitle;
 }
diff --git a/tests/Fixtures/Doctrine/Embeddable/BlogPostWithEmbedded.php b/tests/Fixtures/Doctrine/Embeddable/BlogPostWithEmbedded.php
@@ -4,22 +4,28 @@
 
 namespace JMS\Serializer\Tests\Fixtures\Doctrine\Embeddable;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
+#[ORM\Entity]
 class BlogPostWithEmbedded
 {
     /**
      * @ORM\Id
      * @ORM\Column(type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
+    #[ORM\Id]
+    #[ORM\Column(type: Types::INTEGER)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
     protected $id;
 
     /**
      * @ORM\Embedded(class="BlogPostSeo", columnPrefix="seo_")
      */
+    #[ORM\Embedded(class: BlogPostSeo::class, columnPrefix: 'seo_')]
     private $seo;
 }
diff --git a/tests/Fixtures/Doctrine/Entity/Author.php b/tests/Fixtures/Doctrine/Entity/Author.php
@@ -4,11 +4,13 @@
 
 namespace JMS\Serializer\Tests\Fixtures\Doctrine\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\SerializedName;
 
 /** @ORM\Entity */
+#[ORM\Entity]
 class Author
 {
     /**
@@ -17,13 +19,18 @@ class Author
      *
      * @Groups({"id_group"})
      */
+    #[ORM\Id]
+    #[ORM\Column(type: Types::INTEGER)]
+    #[Groups(groups: ['id_group'])]
     protected $id;
 
     /**
      * @ORM\Column(type="string")
      *
      * @SerializedName("full_name")
      */
+    #[ORM\Column(type: Types::STRING)]
+    #[SerializedName(name: 'full_name')]
     private $name;
 
     public function __construct($name, $id = null)

diff --git a/tests/Fixtures/Doctrine/Entity/AuthorExcludedId.php b/tests/Fixtures/Doctrine/Entity/AuthorExcludedId.php
@@ -4,11 +4,13 @@
 
 namespace JMS\Serializer\Tests\Fixtures\Doctrine\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Exclude;
 use JMS\Serializer\Annotation\SerializedName;
 
 /** @ORM\Entity */
+#[ORM\Entity]
 class AuthorExcludedId
 {
     /**
@@ -17,6 +19,8 @@ class AuthorExcludedId
      *
      * @Exclude
      */
+    #[ORM\Id]
+    #[ORM\Column(type: Types::INTEGER)]
     #[Exclude]
     protected $id;
 
@@ -25,6 +29,7 @@ class AuthorExcludedId
      *
      * @SerializedName("full_name")
      */
+    #[ORM\Column(type: Types::STRING)]
     #[SerializedName(name: 'full_name')]
     private $name;
 

diff --git a/tests/Fixtures/Doctrine/Entity/BlogPost.php b/tests/Fixtures/Doctrine/Entity/BlogPost.php
@@ -5,6 +5,7 @@
 namespace JMS\Serializer\Tests\Fixtures\Doctrine\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation as Serializer;
 use JMS\Serializer\Annotation\Groups;
@@ -19,6 +20,7 @@
  *
  * @XmlRoot("blog-post")
  */
+#[ORM\Entity]
 #[XmlRoot(name: 'blog-post')]
 class BlogPost
 {
@@ -27,31 +29,38 @@ class BlogPost
      * @ORM\Column(type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
+    #[ORM\Id]
+    #[ORM\Column(type: Types::INTEGER)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
     protected $id;
 
     /**
      * @ORM\Column(type="guid")
      */
+    #[ORM\Column(type: Types::GUID)]
     private $guid;
 
     /**
      * @ORM\Column(type="string")
      *
      * @Groups({"comments","post"})
      */
+    #[ORM\Column(type: Types::STRING)]
     #[Groups(groups: ['comments', 'post'])]
     private $title;
 
     /**
      * @ORM\Column(type="some_custom_type")
      */
+    #[ORM\Column(type: 'some_custom_type')]
     protected $slug;
 
     /**
      * @ORM\Column(type="datetime")
      *
      * @XmlAttribute
      */
+    #[ORM\Column(type: Types::DATETIME_MUTABLE)]
     #[XmlAttribute]
     private $createdAt;
 
@@ -66,6 +75,7 @@ class BlogPost
      * @Groups({"post"})
      * @XmlAttribute
      */
+    #[ORM\Column(type: Types::BOOLEAN)]
     #[Type(name: 'integer')]
     #[SerializedName(name: 'is_published')]
     #[Groups(groups: ['post'])]
@@ -78,6 +88,7 @@ class BlogPost
      * @XmlList(inline=true, entry="comment")
      * @Groups({"comments"})
      */
+    #[ORM\OneToMany(targetEntity: Comment::class, mappedBy: 'blogPost')]
     #[XmlList(entry: 'comment', inline: true)]
     #[Groups(groups: ['comments'])]
     private $comments;
@@ -87,13 +98,15 @@ class BlogPost
      *
      * @Groups({"post"})
      */
+    #[ORM\OneToOne(targetEntity: Author::class)]
     #[Groups(groups: ['post'])]
     private $author;
 
     /**
-     * @Serializer\Exclude()
      * @ORM\Column(type="integer")
+     * @Serializer\Exclude()
      */
+    #[ORM\Column(type: Types::INTEGER)]
     #[Serializer\Exclude]
     private $ref;
 

diff --git a/tests/Fixtures/Doctrine/Entity/Comment.php b/tests/Fixtures/Doctrine/Entity/Comment.php
@@ -5,28 +5,35 @@
 namespace JMS\Serializer\Tests\Fixtures\Doctrine\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 /** @ORM\Entity */
+#[ORM\Entity]
 class Comment
 {
     /**
      * @ORM\Id
      * @ORM\Column(type="integer")
      */
+    #[ORM\Id]
+    #[ORM\Column(type: Types::INTEGER)]
     protected $id;
 
     /**
-     * @ORM\Column(type="Author")
+     * @ORM\OneToOne(targetEntity="Author")
      */
+    #[ORM\OneToOne(targetEntity: Author::class)]
     private $author;
 
     /** @ORM\ManyToOne(targetEntity="BlogPost") */
+    #[ORM\ManyToOne(targetEntity: BlogPost::class)]
     private $blogPost;
 
     /**
      * @ORM\Column(type="string")
      */
+    #[ORM\Column(type: Types::STRING)]
     private $text;
 
     public function __construct(Author $author, $text)

diff --git a/tests/Fixtures/Doctrine/IdentityFields/Server.php b/tests/Fixtures/Doctrine/IdentityFields/Server.php
@@ -4,10 +4,12 @@
 
 namespace JMS\Serializer\Tests\Fixtures\Doctrine\IdentityFields;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation as Serializer;
 
 /** @ORM\Entity */
+#[ORM\Entity]
 class Server
 {
     /**
@@ -18,6 +20,8 @@ class Server
      * @var string
      */
     #[Serializer\Type(name: 'string')]
+    #[ORM\Id]
+    #[ORM\Column(type: Types::STRING, name: 'ip_address')]
     protected $ipAddress;
 
     /**
@@ -30,6 +34,8 @@ class Server
      */
     #[Serializer\SerializedName(name: 'server_id_extracted')]
     #[Serializer\Type(name: 'string')]
+    #[ORM\Id]
+    #[ORM\Column(type: Types::STRING, name: 'server_id')]
     protected $serverId;
 
     /**
@@ -39,6 +45,7 @@ class Server
      * @var string
      */
     #[Serializer\Type(name: 'string')]
+    #[ORM\Column(type: Types::STRING)]
     private $name;
 
     /**

diff --git a/tests/Fixtures/Doctrine/PersistendCollection/App.php b/tests/Fixtures/Doctrine/PersistendCollection/App.php
@@ -4,10 +4,12 @@
 
 namespace JMS\Serializer\Tests\Fixtures\Doctrine\PersistendCollection;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation as Serializer;
 
 /** @ORM\Entity */
+#[ORM\Entity]
 class App
 {
     /**
@@ -18,7 +20,10 @@ class App
      *
      * @var string
      */
+    #[Serializer\SerializedName(name: 'id')]
     #[Serializer\Type(name: 'string')]
+    #[ORM\Id]
+    #[ORM\Column(type: Types::STRING, name: 'id')]
     protected $id;
 
     /**
@@ -28,13 +33,16 @@ class App
      * @var string
      */
     #[Serializer\Type(name: 'string')]
+    #[ORM\Column(type: Types::STRING)]
     private $name;
 
     /**
      * @ORM\ManyToOne(targetEntity="SmartPhone")
+     * @Serializer\Type("JMS\Serializer\Tests\Fixtures\Doctrine\PersistendCollection\SmartPhone")
      *
      * @var SmartPhone
      */
+    #[ORM\ManyToOne(targetEntity: SmartPhone::class)]
     #[Serializer\Type(name: SmartPhone::class)]
     private $smartPhone;
 

diff --git a/tests/Fixtures/Doctrine/PersistendCollection/SmartPhone.php b/tests/Fixtures/Doctrine/PersistendCollection/SmartPhone.php
@@ -7,10 +7,12 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation as Serializer;
 
 /** @ORM\Entity */
+#[ORM\Entity]
 class SmartPhone
 {
     /**
@@ -23,6 +25,8 @@ class SmartPhone
      */
     #[Serializer\SerializedName(name: 'id')]
     #[Serializer\Type(name: 'string')]
+    #[ORM\Id]
+    #[ORM\Column(type: Types::STRING, name: 'id')]
     protected $id;
 
     /**
@@ -32,6 +36,7 @@ class SmartPhone
      * @var string
      */
     #[Serializer\Type(name: 'string')]
+    #[ORM\Column(type: Types::STRING)]
     private $name;
 
     /**
@@ -43,6 +48,7 @@ class SmartPhone
      */
     #[Serializer\SerializedName(name: 'applications')]
     #[Serializer\Type(name: 'ArrayCollection<JMS\Serializer\Tests\Fixtures\Doctrine\PersistendCollection\App>')]
+    #[ORM\OneToMany(targetEntity: App::class, mappedBy: 'smartPhone', cascade: ['persist'], orphanRemoval: true)]
     private $apps;
 
     /**

diff --git a/tests/Fixtures/Doctrine/SingleTableInheritance/Clazz.php b/tests/Fixtures/Doctrine/SingleTableInheritance/Clazz.php
@@ -5,24 +5,31 @@
 namespace JMS\Serializer\Tests\Fixtures\Doctrine\SingleTableInheritance;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  */
+#[ORM\Entity]
 class Clazz extends AbstractModel
 {
     /**
      * @ORM\Id
      * @ORM\Column(type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
+    #[ORM\Id]
+    #[ORM\Column(type: Types::INTEGER)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
     private $id;
 
     /** @ORM\ManyToOne(targetEntity = "JMS\Serializer\Tests\Fixtures\Doctrine\SingleTableInheritance\Teacher") */
+    #[ORM\ManyToOne(targetEntity: Teacher::class)]
     private $teacher;
 
     /** @ORM\ManyToMany(targetEntity = "JMS\Serializer\Tests\Fixtures\Doctrine\SingleTableInheritance\Student") */
+    #[ORM\ManyToMany(targetEntity: Student::class)]
     private $students;
 
     public function __construct(Teacher $teacher, array $students)