Update to latest versions

AbstractTestSuite.php

@@ -4,10 +4,9 @@
 
 abstract class AbstractTestSuite
 {
-    /** @var PDO $con */
     protected $con;
 
-    protected $products = array();
+    protected array $products = [];
 
     const NB_TEST = 500;
 

doctrine_m/DoctrineMTestSuite.php

@@ -1,34 +1,32 @@
 <?php
 
+require_once "vendor/autoload.php";
 require_once __DIR__ . '/../AbstractTestSuite.php';
 
 class DoctrineMTestSuite extends AbstractTestSuite
 {
-    /**
-     * @var \Doctrine\ORM\EntityManager
-     */
-    protected $em = null;
+    protected ?\Doctrine\ORM\EntityManager $em = null;
     private static $classes = null;
+	private Product $product;
 
     public function initialize()
     {
-        require_once "vendor/autoload.php";
-
-        $cache  = new \Doctrine\Common\Cache\ArrayCache;
-        $config = new Doctrine\ORM\Configuration;
-        $config->setMetadataCacheImpl($cache);
-        $driverImpl = $config->newDefaultAnnotationDriver(__DIR__ . '/models');
-        $config->setMetadataDriverImpl($driverImpl);
-        $config->setQueryCacheImpl($cache);
-        $config->setProxyDir(__DIR__ . '/proxies');
-        $config->setProxyNamespace('Proxies');
-        $config->setAutoGenerateProxyClasses(true); // no code generation in production
-
-        $dbParams = array('driver' => 'pdo_sqlite', 'memory' => true);
-//      unlink(__DIR__ . '/sqlite');
-//      $dbParams = array('driver' => 'pdo_sqlite', 'path' => __DIR__ . '/sqlite');
-
-        $this->em = Doctrine\ORM\EntityManager::create($dbParams, $config);
+        $queryCache = new \Symfony\Component\Cache\Adapter\ArrayAdapter();
+        $metadataCache = new \Symfony\Component\Cache\Adapter\ArrayAdapter();
+
+        $doctrineConfig = new \Doctrine\ORM\Configuration();
+        $doctrineConfig->setMetadataCache($metadataCache);
+        $entityPath = __DIR__ . '/models';
+        $driverImpl = new \Doctrine\ORM\Mapping\Driver\AttributeDriver([$entityPath], true);
+        $doctrineConfig->setMetadataDriverImpl($driverImpl);
+        $doctrineConfig->setQueryCache($queryCache);
+        $doctrineConfig->setProxyDir(__DIR__ . '/proxies');
+        $doctrineConfig->setProxyNamespace('Proxies');
+        $doctrineConfig->setAutoGenerateProxyClasses(true);
+
+        $dbParams = new \Doctrine\DBAL\Connection(['driver' => 'pdo_sqlite', 'memory' => true], new \Doctrine\DBAL\Driver\SQLite3\Driver());
+
+        $this->em = new \Doctrine\ORM\EntityManager($dbParams, $doctrineConfig);
 
         if ( ! self::$classes) {
             self::$classes = $this->em->getMetadataFactory()->getAllMetadata();

doctrine_m/DoctrineMWithCacheTestSuite.php

@@ -9,10 +9,6 @@ class DoctrineMWithCacheTestSuite extends DoctrineMTestSuite
 	function initialize()
 	{
 		parent::initialize();
-		$this->cache = new Doctrine\Common\Cache\ArrayCache();
-		$this->em->getConfiguration()->setMetadataCacheImpl($this->cache);
-        $this->em->getConfiguration()->setQueryCacheImpl($this->cache);
-        $this->em->getConfiguration()->setResultCacheImpl($this->cache);
 	}
 
 }

doctrine_m/models/Category.php

@@ -1,10 +1,13 @@
 <?php
 
-/** @Entity */
+#[\Doctrine\ORM\Mapping\Entity]
+#[\Doctrine\ORM\Mapping\Table(name: 'category')]
 class Category extends BaseModel
 {
-    /** @Id @Column(type="integer") @GeneratedValue */
+    #[\Doctrine\ORM\Mapping\Id]
+    #[\Doctrine\ORM\Mapping\GeneratedValue(strategy: 'AUTO')]
+    #[\Doctrine\ORM\Mapping\Column(type: 'integer')]
     public $id;
-    /** @Column(length=128) */
+    #[\Doctrine\ORM\Mapping\Column(length: 128)]
     public $name;
 }

doctrine_m/models/Image.php

@@ -1,17 +1,17 @@
 <?php
 
-/**
- * @Entity
- * @InheritanceType("SINGLE_TABLE")
- * @DiscriminatorColumn(name="imageable_type", type="string")
- * @DiscriminatorMap({"image"="Image","product"="ProductImage"})
- */
+#[\Doctrine\ORM\Mapping\Entity]
+#[\Doctrine\ORM\Mapping\Table(name: 'image')]
+#[\Doctrine\ORM\Mapping\InheritanceType("SINGLE_TABLE")]
+#[\Doctrine\ORM\Mapping\DiscriminatorColumn(name: "imageable_type", type: "string")]
 class Image extends BaseModel
 {
-    /** @Id @Column(type="integer") @GeneratedValue */
+    #[\Doctrine\ORM\Mapping\Id]
+    #[\Doctrine\ORM\Mapping\GeneratedValue(strategy: 'AUTO')]
+    #[\Doctrine\ORM\Mapping\Column(type: 'integer')]
     public $id;
-    /** @Column(length=128) */
+    #[\Doctrine\ORM\Mapping\Column(length: 128)]
     public $path;
-    /** @Column(type="integer") */
+    #[\Doctrine\ORM\Mapping\Column(type: 'integer', nullable: true)]
     public $imageable_id;
 }

doctrine_m/models/Product.php

@@ -1,30 +1,28 @@
 <?php
 
-/** @Entity */
+#[\Doctrine\ORM\Mapping\Entity]
+#[\Doctrine\ORM\Mapping\Table(name: 'product')]
 class Product extends BaseModel
 {
-    /** @Id @Column(type="integer") @GeneratedValue */
+    #[\Doctrine\ORM\Mapping\Id]
+    #[\Doctrine\ORM\Mapping\GeneratedValue(strategy: 'AUTO')]
+    #[\Doctrine\ORM\Mapping\Column(type: 'integer')]
     public $id;
-    /** @Column */
+    #[\Doctrine\ORM\Mapping\Column]
     public $name;
-    /** @Column(length=24) */
+    #[\Doctrine\ORM\Mapping\Column(length: 24)]
     public $sku;
-    /** @Column(type="decimal") */
+    #[\Doctrine\ORM\Mapping\Column(type: 'float')]
     public $price;
-    /** @Column(type="integer") */
+    #[\Doctrine\ORM\Mapping\Column(type: 'integer', nullable: true)]
     public $category_id;
-    /** @ManyToOne(targetEntity="Category",cascade={"persist"},fetch="EAGER") */
+    #[\Doctrine\ORM\Mapping\JoinColumn(name: 'category_id', referencedColumnName: 'id')]
+    #[\Doctrine\ORM\Mapping\ManyToOne(targetEntity: Category::class, cascade: ["persist"])]
     public $category;
-    /**
-     * @ManyToMany(targetEntity="Tag",cascade={"persist"},fetch="EAGER")
-     * @JoinTable(name="products_tags")
-     */
+    #[\Doctrine\ORM\Mapping\ManyToMany(targetEntity: Tag::class,cascade: ["persist"])]
+    #[\Doctrine\ORM\Mapping\JoinTable(name: "products_tags")]
     public $tags;
-    /** ONE-TO-MANY BIDIRECTIONAL, INVERSE SIDE
-     * @var Collection
-     * @ORM\OneToMany(targetEntity="ProductImage", mappedBy="product",cascade={"persist"},fetch="EAGER")
-     * @ORM\JoinColumn(name="id", referencedColumnName="imageable_id", nullable=true)
-     */
+    #[\Doctrine\ORM\Mapping\OneToMany(targetEntity: ProductImage::class, mappedBy: "product", cascade: ["persist"])]
+    #[\Doctrine\ORM\Mapping\JoinColum(name: "id", referencedColumnName: "imageable_id", nullable: true)]
     public $images;
-
 }

doctrine_m/models/ProductImage.php

@@ -1,8 +1,7 @@
 <?php
 
-/**
- * @Entity
- */
+#[\Doctrine\ORM\Mapping\Entity]
+#[\Doctrine\ORM\Mapping\Table(name: 'product_image')]
 class ProductImage extends Image
 {
     /** MANY-TO-ONE BIDIRECTIONAL, OWNING SIDE

doctrine_m/models/Tag.php

@@ -1,10 +1,13 @@
 <?php
 
-/** @Entity */
+#[\Doctrine\ORM\Mapping\Entity]
+#[\Doctrine\ORM\Mapping\Table(name: 'tag')]
 class Tag extends BaseModel
 {
-    /** @Id @Column(type="integer") @GeneratedValue */
+    #[\Doctrine\ORM\Mapping\Id]
+    #[\Doctrine\ORM\Mapping\GeneratedValue(strategy: 'AUTO')]
+    #[\Doctrine\ORM\Mapping\Column(type: 'integer')]
     public $id;
-    /** @Column(length=128) */
+    #[\Doctrine\ORM\Mapping\Column(length: 128)]
     public $name;
 }