Skip to content

Commit 44ba36a

Browse files
samdarksamdark
authored
Adopt factory (#149)
1 parent 7a4707d commit 44ba36a

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ use Yiisoft\Db\Sqlite\Connection as SqliteConnection;
6363
*/
6464
return [
6565
ConnectionInterface::class => [
66-
'__class' => SqliteConnection::class,
66+
'class' => SqliteConnection::class,
6767
'__construct()' => [
6868
'dsn' => $params['yiisoft/db-sqlite']['dsn'],
6969
]
@@ -146,21 +146,21 @@ declare(strict_types=1);
146146
use Yiisoft\ActiveRecord\ActiveRecordFactory;
147147
use Yiisoft\Db\Connection\ConnectionInterface;
148148
use Yiisoft\Db\Sqlite\Connection as SqliteConnection;
149-
use Yiisoft\Factory\Definitions\Reference;
149+
use Yiisoft\Factory\Definition\Reference;
150150

151151
/**
152152
* config SqliteConnection::class
153153
*/
154154
return [
155155
SqliteConnection::class => [
156-
'__class' => SqliteConnection::class,
156+
'class' => SqliteConnection::class,
157157
'__construct()' => [
158158
'dsn' => $params['yiisoft/db-sqlite']['dsn'],
159159
]
160160
],
161161

162162
ActiveRecordFactory::class => [
163-
'__class' => ActiveRecordFactory::class,
163+
'class' => ActiveRecordFactory::class,
164164
'__construct()' => [
165165
null,
166166
[ConnectionInterface::class => Reference::to(SqliteConnection::class)],

‎src/ActiveRecordFactory.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Yiisoft\ActiveRecord\Redis\ActiveQuery as RedisActiveQuery;
88
use Yiisoft\Db\Connection\ConnectionInterface;
9-
use Yiisoft\Factory\Exceptions\InvalidConfigException;
9+
use Yiisoft\Factory\Exception\InvalidConfigException;
1010
use Yiisoft\Factory\Factory;
1111

1212
final class ActiveRecordFactory
@@ -34,7 +34,7 @@ public function createAR(string $arClass): ActiveRecordInterface
3434
{
3535
return $this->factory->create(
3636
[
37-
'__class' => $arClass,
37+
'class' => $arClass,
3838
]
3939
);
4040
}
@@ -53,7 +53,7 @@ public function createQueryTo(string $arClass, string $queryClass = null): Activ
5353
{
5454
return $this->factory->create(
5555
[
56-
'__class' => $queryClass ?? ActiveQuery::class,
56+
'class' => $queryClass ?? ActiveQuery::class,
5757
'__construct()' => [
5858
$arClass,
5959
],
@@ -75,7 +75,7 @@ public function createRedisQueryTo(string $arClass, string $queryClass = null):
7575
{
7676
return $this->factory->create(
7777
[
78-
'__class' => $queryClass ?? RedisActiveQuery::class,
78+
'class' => $queryClass ?? RedisActiveQuery::class,
7979
'__construct()' => [
8080
$arClass,
8181
],

‎tests/TestCase.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
use Yiisoft\Di\Container;
2929
use Yiisoft\EventDispatcher\Dispatcher\Dispatcher;
3030
use Yiisoft\EventDispatcher\Provider\Provider;
31-
use Yiisoft\Factory\Definitions\Reference;
31+
use Yiisoft\Factory\Definition\Reference;
3232
use Yiisoft\Factory\Factory;
3333
use Yiisoft\Log\Logger;
3434
use Yiisoft\Profiler\Profiler;
@@ -227,7 +227,7 @@ private function config(): array
227227

228228
return [
229229
CacheInterface::class => [
230-
'__class' => Cache::class,
230+
'class' => Cache::class,
231231
'__construct()' => [
232232
Reference::to(ArrayCache::class),
233233
],
@@ -242,7 +242,7 @@ private function config(): array
242242
EventDispatcherInterface::class => Dispatcher::class,
243243

244244
MssqlConnection::class => [
245-
'__class' => MssqlConnection::class,
245+
'class' => MssqlConnection::class,
246246
'__construct()' => [
247247
'dsn' => $params['yiisoft/db-mssql']['dsn'],
248248
],
@@ -251,7 +251,7 @@ private function config(): array
251251
],
252252

253253
MysqlConnection::class => [
254-
'__class' => MysqlConnection::class,
254+
'class' => MysqlConnection::class,
255255
'__construct()' => [
256256
'dsn' => $params['yiisoft/db-mysql']['dsn'],
257257
],
@@ -260,7 +260,7 @@ private function config(): array
260260
],
261261

262262
OciConnection::class => [
263-
'__class' => OciConnection::class,
263+
'class' => OciConnection::class,
264264
'__construct()' => [
265265
'dsn' => $params['yiisoft/db-oracle']['dsn'],
266266
],
@@ -269,7 +269,7 @@ private function config(): array
269269
],
270270

271271
PgsqlConnection::class => [
272-
'__class' => PgsqlConnection::class,
272+
'class' => PgsqlConnection::class,
273273
'__construct()' => [
274274
'dsn' => $params['yiisoft/db-pgsql']['dsn'],
275275
],
@@ -278,19 +278,19 @@ private function config(): array
278278
],
279279

280280
RedisConnection::class => [
281-
'__class' => RedisConnection::class,
281+
'class' => RedisConnection::class,
282282
'database()' => [$params['yiisoft/db-redis']['database']],
283283
],
284284

285285
SqliteConnection::class => [
286-
'__class' => SqliteConnection::class,
286+
'class' => SqliteConnection::class,
287287
'__construct()' => [
288288
'dsn' => $params['yiisoft/db-sqlite']['dsn'],
289289
],
290290
],
291291

292292
Factory::class => [
293-
'__class' => Factory::class,
293+
'class' => Factory::class,
294294
'__construct()' => [
295295
null,
296296
[ConnectionInterface::class => Reference::to(SqliteConnection::class)],

0 commit comments

Comments
 (0)