removes doctrine annotations

andanteproject · Jun 14, 2024 · 3d76eb4 · 3d76eb4
1 parent dab2499
commit 3d76eb4
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 82 deletions.
diff --git a/composer.json b/composer.json
@@ -29,11 +29,10 @@
         "doctrine/doctrine-bundle": "^2.2",
         "roave/security-advisories": "dev-master",
         "phpunit/phpunit": "^9.5",
-        "symfony/framework-bundle": "^4.4 | ^5.0",
+        "symfony/framework-bundle": "^4.4 | ^5.0 | ^6.0 | ^7.0",
         "symfony/yaml": "^5.2",
         "ext-json": "*",
-        "friendsofphp/php-cs-fixer": "^3.35",
-        "doctrine/annotations": "^2.0",
+        "friendsofphp/php-cs-fixer": "^3.58",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/extension-installer": "^1.3",

diff --git a/tests/HttpKernel/config/config_test.yaml b/tests/HttpKernel/config/config_test.yaml
@@ -22,7 +22,7 @@ doctrine:
     auto_mapping: true
     mappings:
       fixtures:
-        type: annotation
+        type: attribute
         prefix: 'Andante\Doctrine\ORM\Tests\Model'
         dir: '%kernel.project_dir%/tests/Model/'
         is_bundle: false
diff --git a/tests/Model/Address.php b/tests/Model/Address.php
@@ -4,23 +4,17 @@
 
 namespace Andante\Doctrine\ORM\Tests\Model;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- */
+#[ORM\Entity]
 class Address
 {
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(Types::INTEGER)]
     private ?int $id = null;
-
-    /**
-     * @ORM\Column(type="string", nullable=true)
-     */
+    #[ORM\Column(Types::STRING, null, null, null, null, false, true)]
     private ?string $name = null;
 
     public function getId(): ?int

diff --git a/tests/Model/Document.php b/tests/Model/Document.php
@@ -4,23 +4,18 @@
 
 namespace Andante\Doctrine\ORM\Tests\Model;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- */
+#[ORM\Entity]
 class Document
 {
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(Types::INTEGER)]
     private ?int $id = null;
 
-    /**
-     * @ORM\Column(type="string", nullable=true)
-     */
+    #[ORM\Column(Types::STRING, null, null, null, null, false, true)]
     private ?string $name = null;
 
     public function getId(): ?int

diff --git a/tests/Model/Employee.php b/tests/Model/Employee.php
@@ -8,15 +8,11 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- */
+#[ORM\Entity]
 class Employee extends Person
 {
-    /**
-     * @var Collection<int, Paper>
-     * @ORM\OneToMany(targetEntity="Paper", mappedBy="employee")
-     */
+    /** @var Collection<int, Paper> */
+    #[ORM\OneToMany('employee', Paper::class)]
     private Collection $papers;
 
     public function __construct()

diff --git a/tests/Model/Organization.php b/tests/Model/Organization.php
@@ -6,34 +6,25 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- */
+#[ORM\Entity]
 class Organization
 {
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(Types::INTEGER)]
     private ?int $id = null;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Address")
-     */
+    #[ORM\ManyToOne(Address::class)]
     private ?Address $address = null;
 
-    /**
-     * @var Collection<int, Person>
-     * @ORM\ManyToMany(targetEntity="Person")
-     */
+    /** @var Collection<int, Person> */
+    #[ORM\ManyToMany(Person::class)]
     private Collection $persons;
 
-    /**
-     * @ORM\Column(type="string", nullable=true)
-     */
+    #[ORM\Column(Types::STRING, null, null, null, null, false, true)]
     private ?string $name = null;
 
     public function __construct()

diff --git a/tests/Model/Paper.php b/tests/Model/Paper.php
@@ -6,34 +6,25 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity()
- */
+#[ORM\Entity]
 class Paper
 {
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(Types::INTEGER)]
     private ?int $id = null;
 
-    /**
-     * @ORM\Column(type="string", nullable=true)
-     */
+    #[ORM\Column(Types::STRING, null, null, null, null, false, true)]
     private ?string $name = null;
 
-    /**
-     * @var Collection<int, Employee>
-     * @ORM\OneToMany(targetEntity="Employee", mappedBy="papers")
-     */
+    /** @var Collection<int, Employee> */
+    #[ORM\OneToMany('papers', Employee::class)]
     private Collection $employees;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Document")
-     */
+    #[ORM\ManyToOne(Document::class)]
     private ?Document $document = null;
 
     public function __construct()

diff --git a/tests/Model/Person.php b/tests/Model/Person.php
@@ -4,24 +4,19 @@
 
 namespace Andante\Doctrine\ORM\Tests\Model;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity
- * @ORM\InheritanceType("JOINED")
- */
+#[ORM\Entity]
+#[ORM\InheritanceType('JOINED')]
 class Person
 {
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(Types::INTEGER)]
     private ?int $id = null;
 
-    /**
-     * @ORM\Column(type="string", nullable=true)
-     */
+    #[ORM\Column(Types::STRING, null, null, null, null, false, true)]
     private ?string $name = null;
 
     public function getId(): ?int