simple signature

Author: rustamwin

src/Factory/DbalFactory.php

@@ -15,11 +15,11 @@ public function __construct(
     ) {
     }
 
-    public function create(array|DatabaseConfig $dbalConfig): DatabaseManager
+    public function create(array $dbalConfig): DatabaseManager
     {
         $loggingEnabled = $dbalConfig['query-logging'] ?? false;
         $dbal = new DatabaseManager(
-            $this->prepareConfig($dbalConfig)
+            new DatabaseConfig($dbalConfig)
         );
 
         if ($this->logger !== null && $loggingEnabled === true) {
@@ -30,17 +30,4 @@ public function create(array|DatabaseConfig $dbalConfig): DatabaseManager
         return $dbal;
     }
 
-    /**
-     * @param array|DatabaseConfig $config
-     *
-     * @return DatabaseConfig
-     */
-    private function prepareConfig(array|DatabaseConfig $config): DatabaseConfig
-    {
-        if ($config instanceof DatabaseConfig) {
-            return $config;
-        }
-
-        return new DatabaseConfig($config);
-    }
 }

tests/Unit/Factory/DbalFactory/DbalFactoryTest.php

@@ -5,14 +5,16 @@
 namespace Yiisoft\Yii\Cycle\Tests\Unit\Factory\DbalFactory;
 
 use Cycle\Database\Config\DatabaseConfig;
+use Cycle\Database\Database;
+use Cycle\Database\DatabaseManager;
 use Yiisoft\Yii\Cycle\Factory\DbalFactory;
 use Yiisoft\Yii\Cycle\Tests\Unit\Stub\FakeConnectionConfig;
 use Yiisoft\Yii\Cycle\Tests\Unit\Stub\FakeDriver;
 use Yiisoft\Yii\Cycle\Tests\Unit\Stub\FakeDriverConfig;
 
 final class DbalFactoryTest extends BaseDbalFactory
 {
-    public function testPrepareConfig(): void
+    public function testCreate(): void
     {
         $config = [
             'query-logging' => true,
@@ -30,12 +32,9 @@ public function testPrepareConfig(): void
         ];
 
         $factory = new DbalFactory();
-        $ref = new \ReflectionMethod($factory, 'prepareConfig');
-        $ref->setAccessible(true);
+        $dbal = $factory->create($config);
+        $dbalConfig = new DatabaseConfig($config);
 
-        $this->assertEquals(new DatabaseConfig($config), $ref->invoke($factory, $config));
-
-        $obj = new DatabaseConfig($config);
-        $this->assertSame($obj, $ref->invoke($factory, $obj));
+        $this->assertSame($dbal->database()->getName(), $dbalConfig->getDefaultDatabase());
     }
 }