Skip to content

Commit

Permalink
Merge pull request doctrine#1297 from greg0ire/address-deprecations-f…
Browse files Browse the repository at this point in the history
…rom-orm

Address deprecations from doctrine/orm
  • Loading branch information
greg0ire authored Jan 11, 2023
2 parents 995158d + 315f255 commit 2c6ee5f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
$conf->setProxyNamespace('Foo');
$conf->setMetadataDriverImpl(new PHPDriver(''));

return EntityManager::create($conn, $conf);
return new EntityManager($conn, $conf);
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

0 comments on commit 2c6ee5f

Please sign in to comment.