Skip to content

Commit 512695c

Browse files
henderkesfranmomu
authored andcommitted
fix EntityManager::create deprecations
1 parent 4010c0c commit 512695c

13 files changed

+38
-15
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"doctrine/dbal": "^2.13.1 || ^3.2",
5757
"doctrine/doctrine-bundle": "^2.3",
5858
"doctrine/mongodb-odm": "^2.3",
59-
"doctrine/orm": "^2.10.2",
59+
"doctrine/orm": "^2.14.0",
6060
"friendsofphp/php-cs-fixer": "^3.4.0 <3.10",
6161
"nesbot/carbon": "^2.55",
6262
"phpstan/phpstan": "^1.10.2",

doc/annotations.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,16 @@ $evm->addEventSubscriber($sortableListener);
149149
// mysql set names UTF-8 if required
150150
$evm->addEventSubscriber(new Doctrine\DBAL\Event\Listeners\MysqlSessionInit());
151151
// DBAL connection
152-
$connection = array(
152+
$driverParams = array(
153153
'driver' => 'pdo_mysql',
154154
'host' => '127.0.0.1',
155155
'dbname' => 'test',
156156
'user' => 'root',
157157
'password' => ''
158158
);
159159
// Finally, create entity manager
160-
$em = Doctrine\ORM\EntityManager::create($connection, $config, $evm);
160+
$connection = DriverManager::getConnection($driverParams, $config);
161+
$em = new EntityManager($connection, $config, $evm);
161162
```
162163

163164
**Note:** that Symfony StofDoctrineExtensionsBundle does it automatically this

example/em.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Doctrine\Common\Annotations\AnnotationReader;
1414
use Doctrine\Common\Annotations\PsrCachedReader;
1515
use Doctrine\Common\EventManager;
16+
use Doctrine\DBAL\DriverManager;
1617
use Doctrine\ORM\Configuration;
1718
use Doctrine\ORM\EntityManager;
1819
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
@@ -154,4 +155,5 @@
154155
$config->setResultCache($cache);
155156

156157
// Finally, we create the entity manager
157-
return EntityManager::create($connection, $config, $eventManager);
158+
$connection = DriverManager::getConnection($connection, $config);
159+
$em = new EntityManager($connection, $config, $eventManager);

tests/Gedmo/Mapping/LoggableORMMappingTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
1515
use Doctrine\Common\EventManager;
16+
use Doctrine\DBAL\DriverManager;
1617
use Doctrine\ORM\EntityManager;
1718
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
1819
use Doctrine\ORM\Mapping\Driver\YamlDriver;
@@ -66,7 +67,8 @@ protected function setUp(): void
6667
$loggableListener = new LoggableListener();
6768
$loggableListener->setCacheItemPool($this->cache);
6869
$evm->addEventSubscriber($loggableListener);
69-
$this->em = EntityManager::create($conn, $config, $evm);
70+
$connection = DriverManager::getConnection($conn, $config);
71+
$this->em = new EntityManager($connection, $config, $evm);
7072
}
7173

7274
public function testLoggableMapping(): void

tests/Gedmo/Mapping/MappingEventSubscriberTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
1515
use Doctrine\Common\EventManager;
16+
use Doctrine\DBAL\DriverManager;
1617
use Doctrine\ORM\EntityManager;
1718
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
1819
use Doctrine\Persistence\Mapping\AbstractClassMetadataFactory;
@@ -44,7 +45,8 @@ protected function setUp(): void
4445
'memory' => true,
4546
];
4647

47-
$this->em = EntityManager::create($conn, $config, new EventManager());
48+
$connection = DriverManager::getConnection($conn, $config);
49+
$this->em = new EntityManager($connection, $config, new EventManager());
4850
}
4951

5052
public function testGetMetadataFactoryCacheFromDoctrineForSluggable(): void

tests/Gedmo/Mapping/MetadataFactory/CustomDriverTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Gedmo\Tests\Mapping\MetadataFactory;
1313

1414
use Doctrine\Common\EventManager;
15+
use Doctrine\DBAL\DriverManager;
1516
use Doctrine\ORM\Configuration;
1617
use Doctrine\ORM\EntityManager;
1718
use Doctrine\ORM\EntityManagerInterface;
@@ -55,7 +56,8 @@ protected function setUp(): void
5556
$this->timestampable = new TimestampableListener();
5657
$this->timestampable->setAnnotationReader($_ENV['annotation_reader']);
5758
$evm->addEventSubscriber($this->timestampable);
58-
$this->em = EntityManager::create($conn, $config, $evm);
59+
$connection = DriverManager::getConnection($conn, $config);
60+
$this->em = new EntityManager($connection, $config, $evm);
5961

6062
$schemaTool = new SchemaTool($this->em);
6163
$schemaTool->dropSchema([]);

tests/Gedmo/Mapping/MetadataFactory/ForcedMetadataTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Gedmo\Tests\Mapping\MetadataFactory;
1313

1414
use Doctrine\Common\EventManager;
15+
use Doctrine\DBAL\DriverManager;
1516
use Doctrine\ORM\Configuration;
1617
use Doctrine\ORM\EntityManager;
1718
use Doctrine\ORM\EntityManagerInterface;
@@ -60,7 +61,8 @@ protected function setUp(): void
6061
$this->timestampable = new TimestampableListener();
6162
$this->timestampable->setAnnotationReader($_ENV['annotation_reader']);
6263
$evm->addEventSubscriber($this->timestampable);
63-
$this->em = EntityManager::create($conn, $config, $evm);
64+
$connection = DriverManager::getConnection($conn, $config);
65+
$this->em = new EntityManager($connection, $config, $evm);
6466
}
6567

6668
public function testShouldWork(): void

tests/Gedmo/Mapping/SluggableMappingTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
1515
use Doctrine\Common\EventManager;
16+
use Doctrine\DBAL\DriverManager;
1617
use Doctrine\ORM\EntityManager;
1718
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
1819
use Doctrine\ORM\Mapping\Driver\YamlDriver;
@@ -65,7 +66,8 @@ protected function setUp(): void
6566
$listener = new SluggableListener();
6667
$listener->setCacheItemPool($this->cache);
6768
$evm->addEventSubscriber($listener);
68-
$this->em = EntityManager::create($conn, $config, $evm);
69+
$connection = DriverManager::getConnection($conn, $config);
70+
$this->em = new EntityManager($connection, $config, $evm);
6971
}
7072

7173
public function testShouldBeAbleToMapSluggableUsingYamlDriver(): void

tests/Gedmo/Mapping/TimestampableMappingTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Gedmo\Tests\Mapping;
1313

1414
use Doctrine\Common\EventManager;
15+
use Doctrine\DBAL\DriverManager;
1516
use Doctrine\ORM\EntityManager;
1617
use Doctrine\ORM\Mapping\Driver\YamlDriver;
1718
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
@@ -54,7 +55,8 @@ protected function setUp(): void
5455
$listener = new TimestampableListener();
5556
$listener->setCacheItemPool($this->cache);
5657
$evm->addEventSubscriber($listener);
57-
$this->em = EntityManager::create($conn, $config, $evm);
58+
$connection = DriverManager::getConnection($conn, $config);
59+
$this->em = new EntityManager($connection, $config, $evm);
5860
}
5961

6062
public function testYamlMapping(): void

tests/Gedmo/Mapping/TranslatableMappingTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Gedmo\Tests\Mapping;
1313

1414
use Doctrine\Common\EventManager;
15+
use Doctrine\DBAL\DriverManager;
1516
use Doctrine\ORM\EntityManager;
1617
use Doctrine\ORM\EntityManagerInterface;
1718
use Doctrine\ORM\Mapping\Driver\YamlDriver;
@@ -62,7 +63,8 @@ protected function setUp(): void
6263
$this->translatableListener->setCacheItemPool($this->cache);
6364
$this->translatableListener->setTranslatableLocale('en_us');
6465
$evm->addEventSubscriber($this->translatableListener);
65-
$this->em = EntityManager::create($conn, $config, $evm);
66+
$connection = DriverManager::getConnection($conn, $config);
67+
$this->em = new EntityManager($connection, $config, $evm);
6668
}
6769

6870
public function testYamlMapping(): void

0 commit comments

Comments
 (0)