Merge remote-tracking branch 'origin/1.3.x' into 1.4.x

Author: ondrejmirtes

tests/DoctrineIntegration/ORM/entity-manager.php

@@ -2,6 +2,7 @@
 
 use Cache\Adapter\PHPArray\ArrayCachePool;
 use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\DBAL\DriverManager;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
@@ -18,10 +19,10 @@
 	)
 );
 
-return EntityManager::create(
-	[
+return new EntityManager(
+	DriverManager::getConnection([
 		'driver' => 'pdo_sqlite',
 		'memory' => true,
-	],
+	]),
 	$config
 );

tests/Rules/DeadCode/entity-manager.php

@@ -2,6 +2,7 @@
 
 use Cache\Adapter\PHPArray\ArrayCachePool;
 use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\DBAL\DriverManager;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
@@ -27,10 +28,10 @@
 
 $config->setMetadataDriverImpl($metadataDriver);
 
-return EntityManager::create(
-	[
+return new EntityManager(
+	DriverManager::getConnection([
 		'driver' => 'pdo_sqlite',
 		'memory' => true,
-	],
+	]),
 	$config
 );

tests/Rules/Doctrine/ORM/entity-manager.php

@@ -2,6 +2,7 @@
 
 use Cache\Adapter\PHPArray\ArrayCachePool;
 use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Types\DateTimeImmutableType;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Configuration;
@@ -35,10 +36,10 @@
 	DateTimeImmutableType::class
 );
 
-return EntityManager::create(
-	[
+return new EntityManager(
+	DriverManager::getConnection([
 		'driver' => 'pdo_sqlite',
 		'memory' => true,
-	],
+	]),
 	$config
 );

tests/Rules/Properties/entity-manager.php

@@ -2,6 +2,7 @@
 
 use Cache\Adapter\PHPArray\ArrayCachePool;
 use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\DBAL\DriverManager;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
@@ -28,10 +29,10 @@
 
 $config->setMetadataDriverImpl($metadataDriver);
 
-return EntityManager::create(
-	[
+return new EntityManager(
+	DriverManager::getConnection([
 		'driver' => 'pdo_sqlite',
 		'memory' => true,
-	],
+	]),
 	$config
 );

tests/Type/Doctrine/data/QueryResult/entity-manager.php

@@ -2,6 +2,7 @@
 
 use Cache\Adapter\PHPArray\ArrayCachePool;
 use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\DBAL\DriverManager;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\Column;
@@ -30,10 +31,10 @@
 
 $config->setMetadataDriverImpl($metadataDriver);
 
-return EntityManager::create(
-	[
+return new EntityManager(
+	DriverManager::getConnection([
 		'driver' => 'pdo_sqlite',
 		'memory' => true,
-	],
+	]),
 	$config
 );