Merge 3.4.x up into 4.0.x

src/Persistence/AbstractManagerRegistry.php

@@ -7,6 +7,7 @@
 use InvalidArgumentException;
 use ReflectionClass;
 
+use function assert;
 use function sprintf;
 
 /**
@@ -36,9 +37,9 @@
     private $proxyInterfaceName;
 
     /**
      * @param array<string, string> $connections
      * @param array<string, string> $managers
      * @psalm-param class-string $proxyInterfaceName
      */
     public function __construct(
         string $name,
@@ -55,7 +56,7 @@
         $this->defaultManager     = $defaultManager;
         $this->proxyInterfaceName = $proxyInterfaceName;
     }
 
     /**
      * Fetches/creates the given services.
      *
@@ -63,11 +64,11 @@
      *
      * @param string $name The name of the service.
      *
-     * @return ObjectManager The instance of the given service.
+     * @return object The instance of the given service.
      */
     abstract protected function getService(string $name);
 
     /**
      * Resets the given services.
      *
      * A service in this context is connection or a manager instance.
@@ -119,7 +120,7 @@
      */
     public function getConnections()
     {
         $connections = [];
         foreach ($this->connections as $name => $id) {
             $connections[$name] = $this->getService($id);
         }
@@ -143,7 +144,7 @@
         return $this->defaultManager;
     }
 
     /**
      * {@inheritDoc}
      *
      * @throws InvalidArgumentException
@@ -160,14 +161,17 @@
             );
         }
 
-        return $this->getService($this->managers[$name]);
+        $service = $this->getService($this->managers[$name]);
+        assert($service instanceof ObjectManager);
+
+        return $service;
     }
 
     /**
      * {@inheritDoc}
      */
     public function getManagerForClass(string $class)
     {
         $proxyClass = new ReflectionClass($class);
         if ($proxyClass->isAnonymous()) {
             return null;
@@ -185,6 +189,7 @@
 
         foreach ($this->managers as $id) {
             $manager = $this->getService($id);
+            assert($manager instanceof ObjectManager);
 
             if (! $manager->getMetadataFactory()->isTransient($class)) {
                 return $manager;
@@ -210,7 +215,8 @@
         $managers = [];
 
         foreach ($this->managers as $name => $id) {
-            $manager         = $this->getService($id);
+            $manager = $this->getService($id);
+            assert($manager instanceof ObjectManager);
             $managers[$name] = $manager;
         }
 

src/Persistence/Mapping/Driver/FileDriver.php

@@ -21,15 +21,17 @@
  * classes on demand. This requires the user to adhere to the convention of 1 mapping
  * file per class and the file names of the mapping files must correspond to the full
  * class name, including namespace, with the namespace delimiters '\', replaced by dots '.'.
+ *
+ * @template T
  */
 abstract class FileDriver implements MappingDriver
 {
     /** @var FileLocator */
     protected $locator;
 
     /**
-     * @var ClassMetadata[]|null
-     * @psalm-var array<class-string, ClassMetadata<object>>|null
+     * @var mixed[]|null
+     * @psalm-var array<class-string, T>|null
      */
     protected $classCache;
 
@@ -70,7 +72,7 @@
     public function getGlobalBasename()
     {
         return $this->globalBasename;
     }
 
     /**
      * Gets the element of schema meta data for the class from the mapping file.
@@ -78,8 +80,7 @@
      *
      * @psalm-param class-string $className
      *
-     * @return ClassMetadata The element of schema meta data.
-     * @psalm-return ClassMetadata<object>
+     * @return T The element of schema meta data.
      *
      * @throws MappingException
      */
@@ -154,8 +155,8 @@
      *
      * @param string $file The mapping file to load.
      *
-     * @return ClassMetadata[]
-     * @psalm-return array<class-string, ClassMetadata<object>>
+     * @return mixed[]
+     * @psalm-return array<class-string, T>
      */
     abstract protected function loadMappingFile(string $file);
 
@@ -173,7 +174,7 @@
     protected function initialize()
     {
         $this->classCache = [];
-        if ($this->globalBasename === null) {
+        if ($this->globalBasename === '') {
             return;
         }
 

src/Persistence/Mapping/Driver/PHPDriver.php

@@ -9,6 +9,8 @@
 /**
  * The PHPDriver includes php files which just populate ClassMetadataInfo
  * instances with plain PHP code.
+ *
+ * @template-extends FileDriver<ClassMetadata<object>>
  */
 class PHPDriver extends FileDriver
 {

tests/Persistence/Mapping/ColocatedMappingDriverTest.php

@@ -65,7 +65,7 @@ public function testGetAllClassNames(string $path): void
     }
 
     /** @return Generator<string, array{string}> */
-    public function pathProvider(): Generator
+    public static function pathProvider(): Generator
     {
         yield 'straigthforward path' => [__DIR__ . '/_files/colocated'];
         yield 'winding path' => [__DIR__ . '/../Mapping/_files/colocated'];

tests/Persistence/Mapping/FileDriverTest.php

@@ -197,6 +197,7 @@ private function createTestFileDriver($locator, ?string $fileExtension = null):
     }
 }
 
+/** @template-extends FileDriver<TestClassMetadata<object>> */
 class TestFileDriver extends FileDriver
 {
     /** @var ClassMetadata<object> */

tests/Persistence/Mapping/Fixtures/TestClassMetadata.php

@@ -9,7 +9,7 @@
 use ReflectionClass;
 
 /**
- * @template T of object
+ * @template-covariant T of object
  * @template-implements ClassMetadata<T>
  */
 final class TestClassMetadata implements ClassMetadata

tests/Persistence/Mapping/SymfonyFileLocatorTest.php

@@ -93,7 +93,7 @@ public function testInvalidCustomNamespaceSeparator(): void
     }
 
     /** @return array<string, array{string, string}> */
-    public function customNamespaceSeparatorProvider(): array
+    public static function customNamespaceSeparatorProvider(): array
     {
         return [
             'directory separator' => [DIRECTORY_SEPARATOR, '/_custom_ns/dir'],
@@ -122,7 +122,7 @@ public function testGetClassNamesWithCustomNsSeparator(string $separator, string
     }
 
     /** @return array<array{string, string, array<string, string>}> */
-    public function customNamespaceLookupQueryProvider(): array
+    public static function customNamespaceLookupQueryProvider(): array
     {
         return [
             'directory separator'  => [