Adopt factory (#66)

samdark · web-flow · commit 7e81d2a2a036 · 2021-04-13T15:30:28.000+03:00
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ use Yiisoft\Db\Sqlite\Connection as SqliteConnection;
 
 return [
     ConnectionInterface::class => [
-        '__class' => SqliteConnection::class,
+        'class' => SqliteConnection::class,
         '__construct()' => [
             'dsn' => $params['yiisoft/db-sqlite']['dsn'],
         ]
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -127,7 +127,7 @@ public function testGetPdoAfterClose(): void
         $db->setSlaves(
             '1',
             [
-                '__class' => Connection::class,
+                'class' => Connection::class,
                 '__construct()' => [
                     'dsn' => 'sqlite:' . __DIR__ . '/Data/yii_test_slave.sq3',
                 ],
@@ -305,7 +305,7 @@ public function testServerStatusCacheWorks(): void
         $db->setMasters(
             '1',
             [
-                '__class' => Connection::class,
+                'class' => Connection::class,
                 '__construct()' => [
                     'dsn' => 'sqlite:' . __DIR__ . '/Data/yii_test_master.sq3',
                 ],
@@ -338,7 +338,7 @@ public function testServerStatusCacheWorks(): void
         $db->setMasters(
             '1',
             [
-                '__class' => Connection::class,
+                'class' => Connection::class,
                 '__construct()' => [
                     'dsn' => 'host:invalid',
                 ],
@@ -371,7 +371,7 @@ public function testServerStatusCacheCanBeDisabled(): void
         $db->setMasters(
             '1',
             [
-                '__class' => Connection::class,
+                'class' => Connection::class,
                 '__construct()' => [
                     'dsn' => 'sqlite:' . __DIR__ . '/Data/yii_test_master.sq3',
                 ],
@@ -401,7 +401,7 @@ public function testServerStatusCacheCanBeDisabled(): void
         $db->setMasters(
             '1',
             [
-                '__class' => Connection::class,
+                'class' => Connection::class,
                 '__construct()' => [
                     'dsn' => 'host:invalid',
                 ],
@@ -444,7 +444,7 @@ protected function prepareMasterSlave($masterCount, $slaveCount): Connection
             $db->setMasters(
                 "$i",
                 [
-                    '__class' => Connection::class,
+                    'class' => Connection::class,
                     '__construct()' => [
                         'dsn' => 'sqlite:' . __DIR__ . "/Data/yii_test_master{$i}.sq3",
                     ],
@@ -458,7 +458,7 @@ protected function prepareMasterSlave($masterCount, $slaveCount): Connection
             $db->setSlaves(
                 "$i",
                 [
-                    '__class' => Connection::class,
+                    'class' => Connection::class,
                     '__construct()' => [
                         'dsn' => 'sqlite:' . __DIR__ . "/Data/yii_test_slave{$i}.sq3",
                     ],
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -22,7 +22,7 @@
 use Yiisoft\Db\Sqlite\Connection;
 use Yiisoft\Db\TestUtility\IsOneOfAssert;
 use Yiisoft\Di\Container;
-use Yiisoft\Factory\Definitions\Reference;
+use Yiisoft\Factory\Definition\Reference;
 use Yiisoft\Log\Logger;
 use Yiisoft\Profiler\Profiler;
 use Yiisoft\Profiler\ProfilerInterface;
@@ -277,7 +277,7 @@ private function config(): array
             ],
 
             CacheInterface::class => [
-                '__class' => Cache::class,
+                'class' => Cache::class,
                 '__construct()' => [
                     Reference::to(ArrayCache::class),
                 ],
@@ -288,7 +288,7 @@ private function config(): array
             ProfilerInterface::class => Profiler::class,
 
             ConnectionInterface::class => [
-                '__class' => Connection::class,
+                'class' => Connection::class,
                 '__construct()' => [
                     'dsn' => $params['yiisoft/db-sqlite']['dsn'],
                 ],
@@ -305,7 +305,7 @@ protected function createConnection(string $dsn = null): ?Connection
 
             $db = DatabaseFactory::createClass(
                 [
-                    '__class' => Connection::class,
+                    'class' => Connection::class,
                     '__construct()' => [
                         'dsn' => $dsn,
                     ],

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ use Yiisoft\Db\Sqlite\Connection as SqliteConnection;`
`49`	`49`
`50`	`50`	`return [`
`51`	`51`	`ConnectionInterface::class => [`
`52`		`- '__class' => SqliteConnection::class,`
	`52`	`+ 'class' => SqliteConnection::class,`
`53`	`53`	`'__construct()' => [`
`54`	`54`	`'dsn' => $params['yiisoft/db-sqlite']['dsn'],`
`55`	`55`	`]`