stargazer-team · stargazer-team · May 7, 2024 · May 7, 2024
diff --git a/config/di.php b/config/di.php
@@ -13,6 +13,7 @@
             DoctrineManagerFactory $doctrineManagerFactory
         ): DoctrineManager => $doctrineManagerFactory->create($params['yiisoft/yii-doctrine'] ?? []),
         'reset' => function (): void {
+            /** @var DoctrineManager $this */
             $this->resetAllManager();
         },
     ],

diff --git a/config/example.php b/config/example.php
@@ -4,6 +4,8 @@
 
 use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\ORM\Events;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\Repository\DefaultRepositoryFactory;
 use Yiisoft\Yii\Doctrine\DoctrineManager;
 use Yiisoft\Yii\Doctrine\Orm\Enum\DriverMappingEnum;
 
@@ -61,6 +63,11 @@
 //                  'schema_ignore_classes' => [],
 //                  'entity_listener_resolver' => DefaultEntityListenerResolver::class,
 //                  'typed_field_mapper' => DefaultTypedFieldMapper::class,
+//                  'fetch_mode_sub_select_batch_size' => 100,
+//                  'repository_factory' => DefaultRepositoryFactory::class,
+//                  'default_query_hints' => [
+//                      Query::HINT_CUSTOM_OUTPUT_WALKER => Query\SqlWalker::class,
+//                   ],
                     'mappings' => [
                         'User' => [
                             'dir' => '@src/User/Entity',

diff --git a/src/Cache/CacheFactory.php b/src/Cache/CacheFactory.php
@@ -24,7 +24,12 @@ final class CacheFactory
     private const CACHE_NAMESPACE = 'doctrine_';
 
     /**
-     * @psalm-param array{namespace: string|null, driver: string|null, path: string, server: array{host: string, port: int}|null} $cacheConfig
+     * @psalm-param array{
+     *     namespace: string|null,
+     *     driver: string|null,
+     *     path: string,
+     *     server: array{host: string, port: int}|null
+     * } $cacheConfig
      *
      * @throws CacheException
      */

diff --git a/src/Dbal/Factory/ConfigurationFactory.php b/src/Dbal/Factory/ConfigurationFactory.php
@@ -49,15 +49,19 @@ function (string $classMiddleware): Middleware {
 
     private function configureAutoCommit(Configuration $configuration, ?bool $autoCommit): void
     {
-        if (null !== $autoCommit) {
-            $configuration->setAutoCommit($autoCommit);
+        if (null === $autoCommit) {
+            return;
         }
+
+        $configuration->setAutoCommit($autoCommit);
     }
 
     private function configureSchemaAssetsFilter(Configuration $configuration, ?callable $schemaAssetsFilter): void
     {
-        if (null !== $schemaAssetsFilter) {
-            $configuration->setSchemaAssetsFilter($schemaAssetsFilter);
+        if (null === $schemaAssetsFilter) {
+            return;
         }
+
+        $configuration->setSchemaAssetsFilter($schemaAssetsFilter);
     }
 }
diff --git a/src/Dbal/Factory/ConnectionFactory.php b/src/Dbal/Factory/ConnectionFactory.php
@@ -5,18 +5,16 @@
 namespace Yiisoft\Yii\Doctrine\Dbal\Factory;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Driver\Middleware;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Types\Type;
 use InvalidArgumentException;
-use Yiisoft\Yii\Doctrine\Dbal\Model\ConnectionModel;
-use Yiisoft\Yii\Doctrine\EventManager\EventManagerFactory;
 
 final class ConnectionFactory
 {
     public function __construct(
         private readonly ConfigurationFactory $configurationFactory,
-        private readonly EventManagerFactory $eventManagerFactory,
     ) {
     }
 
@@ -25,32 +23,30 @@ public function __construct(
      *     auto_commit: bool|empty,
      *     custom_types: array<string, class-string<Type>>|empty,
      *     events: array|empty,
-     *     middlewares: array<array-key, class-string<\Doctrine\DBAL\Driver\Middleware>>|empty,
+     *     middlewares: array<array-key, class-string<Middleware>>|empty,
      *     params: array<string, mixed>,
      *     schema_assets_filter: callable|empty
      * } $dbalConfig
      *
      * @throws Exception
      */
-    public function create(array $dbalConfig): ConnectionModel
+    public function create(array $dbalConfig): Connection
     {
         if (!isset($dbalConfig['params'])) {
             throw new InvalidArgumentException('Not found "params" connection');
         }
 
         $configuration = $this->configurationFactory->create($dbalConfig);
 
-        $eventManager = $this->eventManagerFactory->createForDbal($dbalConfig['events'] ?? []);
-
-        $connection = DriverManager::getConnection($dbalConfig['params'], $configuration, $eventManager);
+        $connection = DriverManager::getConnection($dbalConfig['params'], $configuration);
 
         $this->configureCustomTypes($connection, $dbalConfig['custom_types'] ?? []);
 
-        return new ConnectionModel($connection, $eventManager);
+        return $connection;
     }
 
     /**
-     * @psalm-param array<string, class-string<\Doctrine\DBAL\Types\Type>>|empty $customTypes
+     * @psalm-param array<string, class-string<Type>>|empty $customTypes
      *
      * @throws Exception
      */

diff --git a/src/Dbal/Factory/DynamicConnectionFactory.php b/src/Dbal/Factory/DynamicConnectionFactory.php
@@ -4,8 +4,9 @@
 
 namespace Yiisoft\Yii\Doctrine\Dbal\Factory;
 
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception;
 use RuntimeException;
-use Yiisoft\Yii\Doctrine\Dbal\Model\ConnectionModel;
 use Yiisoft\Yii\Doctrine\DoctrineManager;
 
 use function sprintf;
@@ -27,20 +28,18 @@ public function __construct(
      *     params: array<string, mixed>,
      *     schema_assets_filter: callable
      * } $dbalConfig
+     * @throws Exception
      */
-    public function createConnection(array $dbalConfig, string $connectionName): ConnectionModel
+    public function createConnection(array $dbalConfig, string $connectionName): Connection
     {
         if ($this->doctrineManager->hasConnection($connectionName)) {
             throw new RuntimeException(sprintf('Connection "%s" already exist', $connectionName));
         }
 
-        $connectionModel = $this->connectionFactory->create($dbalConfig);
+        $connection = $this->connectionFactory->create($dbalConfig);
 
-        $this->doctrineManager->addConnection(
-            $connectionName,
-            $connectionModel
-        );
+        $this->doctrineManager->addConnection($connectionName, $connection);
 
-        return $connectionModel;
+        return $connection;
     }
 }
diff --git a/src/Dbal/Model/ConnectionModel.php b/src/Dbal/Model/ConnectionModel.php
diff --git a/src/DoctrineManager.php b/src/DoctrineManager.php
@@ -13,7 +13,6 @@
 use Doctrine\Persistence\Proxy;
 use ReflectionClass;
 use RuntimeException;
-use Yiisoft\Yii\Doctrine\Dbal\Model\ConnectionModel;
 
 use function array_keys;
 use function sprintf;
@@ -27,8 +26,8 @@ final class DoctrineManager implements ManagerRegistry
     private string $proxyInterfaceName = Proxy::class;
 
     /**
-     * @param ConnectionModel[] $connections
-     * @param EntityManagerInterface[] $managers
+     * @psalm-param array<string, object<Connection>> $connections
+     * @psalm-param array<string, object<EntityManagerInterface>> $managers
      */
     public function __construct(
         private array $connections,
@@ -38,24 +37,24 @@ public function __construct(
     ) {
     }
 
-    public function addConnection(string $name, ConnectionModel $connectionModel): void
+    public function addConnection(string $name, Connection $connection): void
     {
         if (isset($this->connections[$name])) {
             throw new RuntimeException(sprintf('Connection by name "%s" already exists', $name));
         }
 
-        $this->connections[$name] = $connectionModel;
+        $this->connections[$name] = $connection;
     }
 
     public function closeConnection(string $name): void
     {
-        $connectionModel = $this->connections[$name] ?? null;
+        $connection = $this->connections[$name] ?? null;
 
-        if (null === $connectionModel) {
+        if (null === $connection) {
             throw new RuntimeException(sprintf('Connection by name "%s" already is not exists', $name));
         }
 
-        $connectionModel->getConnection()->close();
+        $connection->close();
 
         unset($this->connections[$name]);
     }
@@ -66,13 +65,13 @@ public function getConnection($name = null): Connection
             $name = $this->getDefaultConnectionName();
         }
 
-        $connectionModel = $this->connections[$name] ?? null;
+        $connection = $this->connections[$name] ?? null;
 
-        if (null === $connectionModel) {
+        if (null === $connection) {
             throw new RuntimeException(sprintf('Not found connection by name "%s"', $name));
         }
 
-        return $connectionModel->getConnection();
+        return $connection;
     }
 
     public function getDefaultConnectionName(): string
@@ -99,41 +98,20 @@ public function hasManager(string $name): bool
         return isset($this->managers[$name]);
     }
 
-    public function getConnectionModel(string $name = null): ConnectionModel
-    {
-        if (null === $name) {
-            $name = $this->getDefaultConnectionName();
-        }
-
-        $connectionModel = $this->connections[$name] ?? null;
-
-        if (null === $connectionModel) {
-            throw new RuntimeException(sprintf('Not found connection by name "%s"', $name));
-        }
-
-        return $connectionModel;
-    }
-
     public function getConnections(): array
     {
-        $result = [];
-
-        foreach ($this->connections as $name => $connectionModel) {
-            $result[$name] = $connectionModel->getConnection();
-        }
-
-        return $result;
+        return $this->connections;
     }
 
     /**
      * @psalm-return list<array-key>
      */
-    public function getConnectionNames()
+    public function getConnectionNames(): array
     {
         return array_keys($this->connections);
     }
 
-    public function resetManager(?string $name = null)
+    public function resetManager(?string $name = null): ObjectManager
     {
         if (null === $name) {
             $name = $this->getDefaultManagerName();
@@ -200,7 +178,7 @@ public function flushAllManager(): void
     /**
      * @psalm-return list<array-key>
      */
-    public function getManagerNames()
+    public function getManagerNames(): array
     {
         return array_keys($this->managers);
     }
@@ -272,7 +250,7 @@ public function getManagerForClass($class): ?EntityManagerInterface
     }
 
     /**
-     * @psalm-return array<string, \Doctrine\Persistence\ObjectManager>
+     * @psalm-return array<string, ObjectManager>
      */
     public function getManagers(): array
     {

diff --git a/src/EventManager/EventManagerFactory.php b/src/EventManager/EventManagerFactory.php
@@ -18,14 +18,12 @@ public function __construct(
     ) {
     }
 
-    public function createForDbal(array $eventConfig): EventManager
+    public function create(array $eventConfig): EventManager
     {
         $eventManager = new EventManager();
 
-        // listener
         $this->configureListener($eventManager, $eventConfig['listeners'] ?? []);
 
-        // subscribers
         $this->configureSubscribers($eventManager, $eventConfig['subscribers'] ?? []);
 
         return $eventManager;
@@ -52,11 +50,4 @@ private function configureSubscribers(EventManager $eventManager, array $subscri
             $eventManager->addEventSubscriber($subscriber);
         }
     }
-
-    public function createForOrm(EventManager $eventManager, array $eventConfig): void
-    {
-        $this->configureListener($eventManager, $eventConfig['listeners'] ?? []);
-
-        $this->configureSubscribers($eventManager, $eventConfig['subscribers'] ?? []);
-    }
 }
diff --git a/src/Factory/DoctrineManagerFactory.php b/src/Factory/DoctrineManagerFactory.php
@@ -4,11 +4,12 @@
 
 namespace Yiisoft\Yii\Doctrine\Factory;
 
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception;
 use Psr\Cache\CacheItemPoolInterface;
 use RuntimeException;
 use Symfony\Component\Cache\Adapter\NullAdapter;
 use Yiisoft\Yii\Doctrine\Dbal\Factory\ConnectionFactory;
-use Yiisoft\Yii\Doctrine\Dbal\Model\ConnectionModel;
 use Yiisoft\Yii\Doctrine\DoctrineManager;
 use Yiisoft\Yii\Doctrine\Orm\Factory\EntityManagerFactory;
 
@@ -23,6 +24,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @throws Exception
+     */
     public function create(array $doctrineConfig): DoctrineManager
     {
         // init connections
@@ -47,17 +51,17 @@ public function create(array $doctrineConfig): DoctrineManager
                     );
                 }
 
-                /** @var ConnectionModel|null $connectionModel */
-                $connectionModel = $connections[$connectionName] ?? null;
+                /** @var Connection|null $connection */
+                $connection = $connections[$connectionName] ?? null;
 
-                if (null === $connectionModel) {
+                if (null === $connection) {
                     throw new RuntimeException(
                         sprintf('Not found connection "%s"', $connectionName)
                     );
                 }
 
                 $entityManagers[$name] = $this->entityManagerFactory->create(
-                    $connectionModel,
+                    $connection,
                     $this->cacheDriver,
                     $entityManagerConfig,
                     $doctrineConfig['orm']['proxies'] ?? []