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

Author: ondrejmirtes

composer.json

@@ -25,7 +25,7 @@
 		"doctrine/dbal": "^2.13.8 || ^3.3.3",
 		"doctrine/lexer": "^2.0 || ^3.0",
 		"doctrine/mongodb-odm": "^1.3 || ^2.4.3",
-		"doctrine/orm": "^2.14.0",
+		"doctrine/orm": "^2.16.0",
 		"doctrine/persistence": "^2.2.1 || ^3.2",
 		"gedmo/doctrine-extensions": "^3.8",
 		"nesbot/carbon": "^2.49",

phpstan.neon

@@ -37,3 +37,7 @@ parameters:
 		-
 			message: '#^Call to method getProperty\(\) on an unknown class PHPStan\\BetterReflection\\Reflection\\Adapter\\ReflectionEnum\.$#'
 			path: src/Rules/Gedmo/PropertiesExtension.php
+		-
+			message: '#^Call to function method_exists\(\) with ''Doctrine\\\\ORM\\\\EntityManager'' and ''create'' will always evaluate to true\.$#'
+			path: src/Doctrine/Mapping/ClassMetadataFactory.php
+			reportUnmatched: false

src/Doctrine/Mapping/ClassMetadataFactory.php

@@ -12,6 +12,7 @@
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use function class_exists;
 use function count;
+use function method_exists;
 use const PHP_VERSION_ID;
 
 class ClassMetadataFactory extends \Doctrine\ORM\Mapping\ClassMetadataFactory
@@ -47,7 +48,12 @@ protected function initialize(): void
 			'memory' => true,
 		], $config);
 
-		$em = EntityManager::create($connection, $config);
+		if (!method_exists(EntityManager::class, 'create')) {
+			$em = new EntityManager($connection, $config);
+		} else {
+			$em = EntityManager::create($connection, $config);
+		}
+
 		$this->setEntityManager($em);
 		parent::initialize();
 
@@ -59,7 +65,7 @@ protected function initialize(): void
 	 * @param class-string<T> $className
 	 * @return ClassMetadata<T>
 	 */
-	protected function newClassMetadataInstance($className)
+	protected function newClassMetadataInstance($className): ClassMetadata
 	{
 		return new ClassMetadata($className);
 	}