Merge pull request #1297 from greg0ire/address-deprecations-from-orm

Address deprecations from doctrine/orm
doctrine · Jan 11, 2023 · 2c6ee5f · 2c6ee5f
2 parents 995158d + 315f255
commit 2c6ee5f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
     "require-dev": {
         "ext-pdo_sqlite": "*",
         "doctrine/coding-standard": "^9",
-        "doctrine/orm": "^2.12",
+        "doctrine/orm": "^2.13",
         "doctrine/persistence": "^2 || ^3",
         "doctrine/sql-formatter": "^1.0",
         "phpstan/phpstan": "^1.5",

diff --git a/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/em-loader.php b/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/em-loader.php
@@ -19,6 +19,6 @@ public function getEntityManager(?string $name = null): EntityManagerInterface
         $conf->setProxyNamespace('Foo');
         $conf->setMetadataDriverImpl(new PHPDriver(''));
 
-        return EntityManager::create($conn, $conf);
+        return new EntityManager($conn, $conf);
     }
 };
diff --git a/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/migrations-em.php b/tests/Doctrine/Migrations/Tests/Configuration/EntityManager/_files/migrations-em.php
@@ -14,4 +14,4 @@
 $conf->setProxyNamespace('Foo');
 $conf->setMetadataDriverImpl(new PHPDriver(''));
 
-return EntityManager::create($conn, $conf);
+return new EntityManager($conn, $conf);
diff --git a/tests/Doctrine/Migrations/Tests/Provider/OrmSchemaProviderTest.php b/tests/Doctrine/Migrations/Tests/Provider/OrmSchemaProviderTest.php
@@ -55,7 +55,7 @@ protected function setUp(): void
         $this->config->setClassMetadataFactoryName(ClassMetadataFactory::class);
 
         $this->conn          = $this->getSqliteConnection();
-        $this->entityManager = EntityManager::create($this->conn, $this->config);
+        $this->entityManager = new EntityManager($this->conn, $this->config);
         $this->ormProvider   = new OrmSchemaProvider($this->entityManager);
     }
 }
diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/config/cli-config.php b/tests/Doctrine/Migrations/Tests/Tools/Console/config/cli-config.php
@@ -17,7 +17,7 @@
 
 $conn = DriverManager::getConnection(['driver' => 'pdo_sqlite', 'memory' => true]);
 
-$em = EntityManager::create($conn, $conf);
+$em = new EntityManager($conn, $conf);
 
 $config = new ConfigurationArray([
     'custom_template' => 'foo',

diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-orm/cli-config.php b/tests/Doctrine/Migrations/Tests/Tools/Console/legacy-config-orm/cli-config.php
@@ -16,7 +16,7 @@
 
 $conn = DriverManager::getConnection(['driver' => 'pdo_sqlite', 'memory' => true]);
 
-$em = EntityManager::create($conn, $conf);
+$em = new EntityManager($conn, $conf);
 
 return new HelperSet([
     'em' => new EntityManagerHelper($em),