[DoctrineBridge] Cleanup tests

Author: fancyweb

Tests/DoctrineTestHelper.php

@@ -11,13 +11,11 @@
 
 namespace Symfony\Bridge\Doctrine\Tests;
 
-use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Doctrine\ORM\ORMSetup;
@@ -64,11 +62,7 @@ public static function createTestConfiguration(): Configuration
         $config->setAutoGenerateProxyClasses(true);
         $config->setProxyDir(sys_get_temp_dir());
         $config->setProxyNamespace('SymfonyTests\Doctrine');
-        if (class_exists(AttributeDriver::class)) {
-            $config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
-        } else {
-            $config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader(), null, true));
-        }
+        $config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }

Tests/Fixtures/AssociationEntity.php

@@ -13,35 +13,22 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity
- */
 #[ORM\Entity]
 class AssociationEntity
 {
     /**
      * @var int
-     * @ORM\Id @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
      */
     #[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
     private $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="SingleIntIdEntity")
-     *
      * @var \Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity
      */
     #[ORM\ManyToOne(targetEntity: SingleIntIdEntity::class)]
     public $single;
 
     /**
-     * @ORM\ManyToOne(targetEntity="CompositeIntIdEntity")
-     * @ORM\JoinColumns({
-     *  @ORM\JoinColumn(name="composite_id1", referencedColumnName="id1"),
-     *  @ORM\JoinColumn(name="composite_id2", referencedColumnName="id2")
-     * })
-     *
      * @var \Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity
      */
     #[ORM\ManyToOne(targetEntity: CompositeIntIdEntity::class)]

Tests/Fixtures/AssociationEntity2.php

@@ -13,35 +13,22 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity
- */
 #[ORM\Entity]
 class AssociationEntity2
 {
     /**
      * @var int
-     * @ORM\Id @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
      */
     #[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
     private $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="SingleIntIdNoToStringEntity")
-     *
      * @var \Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity
      */
     #[ORM\ManyToOne(targetEntity: SingleIntIdNoToStringEntity::class)]
     public $single;
 
     /**
-     * @ORM\ManyToOne(targetEntity="CompositeIntIdEntity")
-     * @ORM\JoinColumns({
-     *  @ORM\JoinColumn(name="composite_id1", referencedColumnName="id1"),
-     *  @ORM\JoinColumn(name="composite_id2", referencedColumnName="id2")
-     * })
-     *
      * @var \Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity
      */
     #[ORM\ManyToOne(targetEntity: CompositeIntIdEntity::class)]

Tests/Fixtures/Bundles/AnnotationsBundle/Entity/Person.php

@@ -15,17 +15,12 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
 
-/**
- * @Entity
- */
 #[Entity]
 class Person
 {
-    /** @Id @Column(type="integer") */
     #[Id, Column(type: 'integer')]
     protected $id;
 
-    /** @Column(type="string") */
     #[Column(type: 'string')]
     public $name;
 

Tests/Fixtures/Bundles/AnnotationsOneLineBundle/Entity/Person.php

@@ -15,15 +15,12 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
 
-/** @Entity */
 #[Entity]
 class Person
 {
-    /** @Id @Column(type="integer") */
     #[Id, Column(type: 'integer')]
     protected $id;
 
-    /** @Column(type="string") */
     #[Column(type: 'string')]
     public $name;
 

Tests/Fixtures/Bundles/AttributesBundle/AnnotatedEntity/Person.php

@@ -15,17 +15,12 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
 
-/**
- * @Entity
- */
 #[Entity]
 class Person
 {
-    /** @Id @Column(type="integer") */
     #[Id, Column(type: 'integer')]
     protected $id;
 
-    /** @Column(type="string") */
     #[Column(type: 'string')]
     public $name;
 

Tests/Fixtures/Bundles/FullEmbeddableAnnotationsBundle/Entity/Address.php

@@ -14,22 +14,15 @@
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Embeddable;
 
-/**
- * @Embeddable
- */
 #[Embeddable]
 class Address
 {
-
-    /** @Column(type="string") */
     #[Column(type: 'string')]
     public $street;
 
-    /** @Column(type="string") */
     #[Column(type: 'string')]
     public $zipCode;
 
-    /** @Column(type="string") */
     #[Column(type: 'string')]
     public $city;
 

Tests/Fixtures/Bundles/NewAnnotationsBundle/src/Entity/Person.php

@@ -15,17 +15,12 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
 
-/**
- * @Entity
- */
 #[Entity]
 class Person
 {
-    /** @Id @Column(type="integer") */
     #[Id, Column(type: 'integer')]
     protected $id;
 
-    /** @Column(type="string") */
     #[Column(type: 'string')]
     public $name;
 

Tests/Fixtures/CompositeIntIdEntity.php

@@ -15,19 +15,15 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
 
-/** @Entity */
 #[Entity]
 class CompositeIntIdEntity
 {
-    /** @Id @Column(type="integer") */
     #[Id, Column(type: 'integer')]
     protected $id1;
 
-    /** @Id @Column(type="integer") */
     #[Id, Column(type: 'integer')]
     protected $id2;
 
-    /** @Column(type="string") */
     #[Column(type: 'string')]
     public $name;
 

Tests/Fixtures/CompositeObjectNoToStringIdEntity.php

@@ -15,18 +15,12 @@
 
 /**
  * an entity that has two objects (class without toString methods) as primary key.
- *
- * @ORM\Entity
  */
 #[ORM\Entity]
 class CompositeObjectNoToStringIdEntity
 {
     /**
      * @var SingleIntIdNoToStringEntity
-     *
-     * @ORM\Id
-     * @ORM\ManyToOne(targetEntity="SingleIntIdNoToStringEntity", cascade={"persist"})
-     * @ORM\JoinColumn(name="object_one_id")
      */
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: SingleIntIdNoToStringEntity::class, cascade: ['persist'])]
@@ -35,10 +29,6 @@ class CompositeObjectNoToStringIdEntity
 
     /**
      * @var SingleIntIdNoToStringEntity
-     *
-     * @ORM\Id
-     * @ORM\ManyToOne(targetEntity="SingleIntIdNoToStringEntity", cascade={"persist"})
-     * @ORM\JoinColumn(name="object_two_id")
      */
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: SingleIntIdNoToStringEntity::class, cascade: ['persist'])]