symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/CHANGELOG.md
+5 b/‎src/Symfony/Bridge/Doctrine/CHANGELOG.md
+5
diff --git a/‎src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
-102 b/‎src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
-102
diff --git a/‎src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php
-73 b/‎src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php
-73
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
+63-2 b/‎src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
+63-2
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/TestRepositoryFactory.php
+38-2 b/‎src/Symfony/Bridge/Doctrine/Tests/TestRepositoryFactory.php
+38-2
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.0
+---
+
+ * Remove `DoctrineTestHelper` and `TestRepositoryFactory`
+
 5.3
 ---
 
 
@@ -11,13 +11,74 @@
 
 namespace Symfony\Bridge\Doctrine\Tests;
 
-use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper as TestDoctrineTestHelper;
+use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\ORM\Configuration;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
+use Doctrine\ORM\Mapping\Driver\XmlDriver;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
+use Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Provides utility functions needed in tests.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-final class DoctrineTestHelper extends TestDoctrineTestHelper
+final class DoctrineTestHelper
 {
+    /**
+     * Returns an entity manager for testing.
+     */
+    public static function createTestEntityManager(Configuration $config = null): EntityManager
+    {
+        if (!\extension_loaded('pdo_sqlite')) {
+            TestCase::markTestSkipped('Extension pdo_sqlite is required.');
+        }
+
+        $params = [
+            'driver' => 'pdo_sqlite',
+            'memory' => true,
+        ];
+
+        return EntityManager::create($params, $config ?? self::createTestConfiguration());
+    }
+
+    public static function createTestConfiguration(): Configuration
+    {
+        $config = new Configuration();
+        $config->setEntityNamespaces(['SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures']);
+        $config->setAutoGenerateProxyClasses(true);
+        $config->setProxyDir(sys_get_temp_dir());
+        $config->setProxyNamespace('SymfonyTests\Doctrine');
+        $config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader()));
+
+        return $config;
+    }
+
+    public static function createTestConfigurationWithXmlLoader(): Configuration
+    {
+        $config = self::createTestConfiguration();
+
+        $driverChain = new MappingDriverChain();
+        $driverChain->addDriver(
+            new XmlDriver(
+                new SymfonyFileLocator(
+                    [__DIR__.'/../Tests/Resources/orm' => 'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'], '.orm.xml'
+                )
+            ),
+            'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'
+        );
+
+        $config->setMetadataDriverImpl($driverChain);
+
+        return $config;
+    }
+
+    /**
+     * This class cannot be instantiated.
+     */
+    private function __construct()
+    {
+    }
 }
@@ -11,11 +11,47 @@
 
 namespace Symfony\Bridge\Doctrine\Tests;
 
-use Symfony\Bridge\Doctrine\Test\TestRepositoryFactory as TestTestRepositoryFactory;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Repository\RepositoryFactory;
+use Doctrine\Persistence\ObjectRepository;
 
 /**
  * @author Andreas Braun <alcaeus@alcaeus.org>
  */
-final class TestRepositoryFactory extends TestTestRepositoryFactory
+final class TestRepositoryFactory implements RepositoryFactory
 {
+    /**
+     * @var array<string, ObjectRepository>
+     */
+    private array $repositoryList = [];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRepository(EntityManagerInterface $entityManager, $entityName): ObjectRepository
+    {
+        $repositoryHash = $this->getRepositoryHash($entityManager, $entityName);
+
+        return $this->repositoryList[$repositoryHash] ??= $this->createRepository($entityManager, $entityName);
+    }
+
+    public function setRepository(EntityManagerInterface $entityManager, string $entityName, ObjectRepository $repository): void
+    {
+        $repositoryHash = $this->getRepositoryHash($entityManager, $entityName);
+
+        $this->repositoryList[$repositoryHash] = $repository;
+    }
+
+    private function createRepository(EntityManagerInterface $entityManager, string $entityName): ObjectRepository
+    {
+        $metadata = $entityManager->getClassMetadata($entityName);
+        $repositoryClassName = $metadata->customRepositoryClassName ?: $entityManager->getConfiguration()->getDefaultRepositoryClassName();
+
+        return new $repositoryClassName($entityManager, $metadata);
+    }
+
+    private function getRepositoryHash(EntityManagerInterface $entityManager, string $entityName): string
+    {
+        return $entityManager->getClassMetadata($entityName)->getName().spl_object_hash($entityManager);
+    }
 }