Change factory inheritance to composition

viktorprogger · web-flow · commit 4e4c4049ee7e · 2021-02-02T01:08:32.000+03:00
diff --git a/src/ActiveRecordFactory.php b/src/ActiveRecordFactory.php
@@ -9,8 +9,18 @@
 use Yiisoft\Factory\Exceptions\InvalidConfigException;
 use Yiisoft\Factory\Factory;
 
-final class ActiveRecordFactory extends Factory
+final class ActiveRecordFactory
 {
+    /**
+     * @var Factory
+     */
+    private Factory $factory;
+
+    public function __construct(Factory $factory)
+    {
+        $this->factory = $factory;
+    }
+
     /**
      * Allows you to create an active record instance through the factory.
      *
@@ -22,7 +32,7 @@ final class ActiveRecordFactory extends Factory
      */
     public function createAR(string $arClass): ActiveRecordInterface
     {
-        return $this->create(
+        return $this->factory->create(
             [
                 '__class' => $arClass,
             ]
@@ -41,7 +51,7 @@ public function createAR(string $arClass): ActiveRecordInterface
      */
     public function createQueryTo(string $arClass, string $queryClass = null): ActiveQueryInterface
     {
-        return $this->create(
+        return $this->factory->create(
             [
                 '__class' => $queryClass ?? ActiveQuery::class,
                 '__construct()' => [
@@ -63,7 +73,7 @@ public function createQueryTo(string $arClass, string $queryClass = null): Activ
      */
     public function createRedisQueryTo(string $arClass, string $queryClass = null): ActiveQueryInterface
     {
-        return $this->create(
+        return $this->factory->create(
             [
                 '__class' => $queryClass ?? RedisActiveQuery::class,
                 '__construct()' => [
@@ -83,7 +93,7 @@ public function createRedisQueryTo(string $arClass, string $queryClass = null):
      */
     public function withConnection(ConnectionInterface $connection): void
     {
-        $this->set(ConnectionInterface::class, $connection);
+        $this->factory->set(ConnectionInterface::class, $connection);
     }
 
     /**
@@ -95,6 +105,6 @@ public function withConnection(ConnectionInterface $connection): void
      */
     public function getConnection(): ConnectionInterface
     {
-        return $this->create(ConnectionInterface::class);
+        return $this->factory->create(ConnectionInterface::class);
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -29,6 +29,7 @@
 use Yiisoft\EventDispatcher\Dispatcher\Dispatcher;
 use Yiisoft\EventDispatcher\Provider\Provider;
 use Yiisoft\Factory\Definitions\Reference;
+use Yiisoft\Factory\Factory;
 use Yiisoft\Log\Logger;
 use Yiisoft\Profiler\Profiler;
 use Yiisoft\Profiler\ProfilerInterface;
@@ -288,8 +289,8 @@ private function config(): array
                 ],
             ],
 
-            ActiveRecordFactory::class => [
-                '__class' => ActiveRecordFactory::class,
+            Factory::class => [
+                '__class' => Factory::class,
                 '__construct()' => [
                     null,
                     [ConnectionInterface::class => Reference::to(SqliteConnection::class)],

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,18 @@`
`9`	`9`	`use Yiisoft\Factory\Exceptions\InvalidConfigException;`
`10`	`10`	`use Yiisoft\Factory\Factory;`
`11`	`11`
`12`		`-final class ActiveRecordFactory extends Factory`
	`12`	`+final class ActiveRecordFactory`
`13`	`13`	`{`
	`14`	`+ /**`
	`15`	`+ * @var Factory`
	`16`	`+ */`
	`17`	`+ private Factory $factory;`
	`18`	`+`
	`19`	`+ public function __construct(Factory $factory)`
	`20`	`+ {`
	`21`	`+ $this->factory = $factory;`
	`22`	`+ }`
	`23`	`+`
`14`	`24`	`/**`
`15`	`25`	`* Allows you to create an active record instance through the factory.`
`16`	`26`	`*`
`@@ -22,7 +32,7 @@ final class ActiveRecordFactory extends Factory`
`22`	`32`	`*/`
`23`	`33`	`public function createAR(string $arClass): ActiveRecordInterface`
`24`	`34`	`{`
`25`		`- return $this->create(`
	`35`	`+ return $this->factory->create(`
`26`	`36`	`[`
`27`	`37`	`'__class' => $arClass,`
`28`	`38`	`]`
`@@ -41,7 +51,7 @@ public function createAR(string $arClass): ActiveRecordInterface`
`41`	`51`	`*/`
`42`	`52`	`public function createQueryTo(string $arClass, string $queryClass = null): ActiveQueryInterface`
`43`	`53`	`{`
`44`		`- return $this->create(`
	`54`	`+ return $this->factory->create(`
`45`	`55`	`[`
`46`	`56`	`'__class' => $queryClass ?? ActiveQuery::class,`
`47`	`57`	`'__construct()' => [`
`@@ -63,7 +73,7 @@ public function createQueryTo(string $arClass, string $queryClass = null): Activ`
`63`	`73`	`*/`
`64`	`74`	`public function createRedisQueryTo(string $arClass, string $queryClass = null): ActiveQueryInterface`
`65`	`75`	`{`
`66`		`- return $this->create(`
	`76`	`+ return $this->factory->create(`
`67`	`77`	`[`
`68`	`78`	`'__class' => $queryClass ?? RedisActiveQuery::class,`
`69`	`79`	`'__construct()' => [`
`@@ -83,7 +93,7 @@ public function createRedisQueryTo(string $arClass, string $queryClass = null):`
`83`	`93`	`*/`
`84`	`94`	`public function withConnection(ConnectionInterface $connection): void`
`85`	`95`	`{`
`86`		`- $this->set(ConnectionInterface::class, $connection);`
	`96`	`+ $this->factory->set(ConnectionInterface::class, $connection);`
`87`	`97`	`}`
`88`	`98`
`89`	`99`	`/**`
`@@ -95,6 +105,6 @@ public function withConnection(ConnectionInterface $connection): void`
`95`	`105`	`*/`
`96`	`106`	`public function getConnection(): ConnectionInterface`
`97`	`107`	`{`
`98`		`- return $this->create(ConnectionInterface::class);`
	`108`	`+ return $this->factory->create(ConnectionInterface::class);`
`99`	`109`	`}`
`100`	`110`	`}`