Support dbal 3

oroinc · Jul 5, 2024 · 5599f67 · 5599f67
1 parent aab5af2
commit 5599f67
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ phpunit.xml
 vendor/
 composer.lock
 .idea/
+.phpunit.cache/
diff --git a/composer.json b/composer.json
@@ -13,8 +13,8 @@
     ],
     "require": {
         "php": ">=8.0",
-        "doctrine/orm": ">=2.6, <3.0",
-        "doctrine/dbal": ">=2.6, <3.0",
+        "doctrine/orm": "^2.6",
+        "doctrine/dbal": "^2.6|^3",
         "doctrine/lexer": "^2|^3"
     },
     "require-dev": {

diff --git a/tests/Oro/Entities/Foo.php b/tests/Oro/Entities/Foo.php
@@ -3,46 +3,48 @@
 
 namespace Oro\Entities;
 
+use Doctrine\ORM\Mapping as ORM;
+
 /**
- * @Entity
- * @Table(name="test_foo")
+ * @ORM\Entity
+ * @ORM\Table(name="test_foo")
  */
 class Foo
 {
     /**
      * @var int
      *
-     * @Id
-     * @Column(type="integer", name="id")
-     * @GeneratedValue(strategy="AUTO")
+     * @ORM\Id
+     * @ORM\Column(type="integer", name="id")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     protected $id;
 
     /**
      * @var string
      *
-     * @Column(name="name", type="string", length=255)
+     * @ORM\Column(name="name", type="string", length=255)
      */
     protected $name;
 
     /**
      * @var \DateTime $createdAt
      *
-     * @Column(name="created_at", type="datetime", nullable=true)
+     * @ORM\Column(name="created_at", type="datetime", nullable=true)
      */
     protected $createdAt;
 
     /**
      * @var float
      *
-     * @Column(name="budget", type="float", nullable=true)
+     * @ORM\Column(name="budget", type="float", nullable=true)
      */
     protected $budget;
 
     /**
      * @var string
      *
-     * @Column(name="code", type="string", length=255)
+     * @ORM\Column(name="code", type="string", length=255)
      */
     protected $code;
 

diff --git a/tests/Oro/Tests/Connection/TestUtil.php b/tests/Oro/Tests/Connection/TestUtil.php
@@ -21,7 +21,7 @@ public static function getEntityManager(): EntityManager
             $dbParams = self::getConnectionParams();
             $entitiesPath = \realpath(__DIR__ . '/../../Entities');
 
-            $config = Setup::createAnnotationMetadataConfiguration([$entitiesPath], true);
+            $config = Setup::createAnnotationMetadataConfiguration([$entitiesPath], true, null, null, false);
             self::$entityManager = EntityManager::create($dbParams, $config);
         }