Separate chain calls (#28)

yiisoft · May 31, 2022 · b2dbe25 · b2dbe25
1 parent c27bcae
commit b2dbe25
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 38 deletions.
diff --git a/src/DbTarget.php b/src/DbTarget.php
@@ -70,7 +70,9 @@ protected function export(): void
     {
         $defaultLogTime = microtime(true);
         $formattedMessages = $this->getFormattedMessages();
-        $table = $this->db->getSchema()->quoteTableName($this->table);
+        $table = $this->db
+            ->getSchema()
+            ->quoteTableName($this->table);
 
         $sql = "INSERT INTO {$table} ([[level]], [[category]], [[log_time]], [[message]])"
             . ' VALUES (:level, :category, :log_time, :message)';
@@ -79,12 +81,14 @@ protected function export(): void
             $command = $this->db->createCommand($sql);
 
             foreach ($this->getMessages() as $key => $message) {
-                if ($command->bindValues([
-                    ':level' => $message->level(),
-                    ':category' => $message->context('category', ''),
-                    ':log_time' => $message->context('time', $defaultLogTime),
-                    ':message' => $formattedMessages[$key],
-                ])->execute() > 0) {
+                if ($command
+                        ->bindValues([
+                            ':level' => $message->level(),
+                            ':category' => $message->context('category', ''),
+                            ':log_time' => $message->context('time', $defaultLogTime),
+                            ':message' => $formattedMessages[$key],
+                        ])
+                        ->execute() > 0) {
                     continue;
                 }
                 throw new RuntimeException(sprintf(

diff --git a/src/Migration/M202101052207CreateLog.php b/src/Migration/M202101052207CreateLog.php
@@ -36,7 +36,9 @@ public function __construct(LoggerInterface $logger, MigrationInformerInterface
 
         foreach ($logger->getTargets() as $target) {
             if ($target instanceof DbTarget) {
-                $this->targets[md5($target->getDb()->getDsn() . ':' . $target->getTable())] = $target;
+                $this->targets[md5($target
+                        ->getDb()
+                        ->getDsn() . ':' . $target->getTable())] = $target;
             }
         }
 

diff --git a/tests/DbTargetTest.php b/tests/DbTargetTest.php
@@ -25,33 +25,45 @@ public function setUp(): void
         parent::setUp();
 
         $migration = new M202101052207CreateLog(
-            $this->getContainer()->get(LoggerInterface::class),
-            $this->getContainer()->get(MigrationInformerInterface::class),
+            $this
+                ->getContainer()
+                ->get(LoggerInterface::class),
+            $this
+                ->getContainer()
+                ->get(MigrationInformerInterface::class),
         );
 
-        $migration->up($this->getContainer()->get(MigrationBuilder::class));
+        $migration->up($this
+            ->getContainer()
+            ->get(MigrationBuilder::class));
     }
 
     public function testGetters(): void
     {
         $target = $this->createDbTarget();
 
         $this->assertSame('log', $target->getTable());
-        $this->assertSame($this->getContainer()->get(ConnectionInterface::class), $target->getDb());
+        $this->assertSame($this
+            ->getContainer()
+            ->get(ConnectionInterface::class), $target->getDb());
     }
 
     public function testExport(): void
     {
         $time = microtime(true);
 
-        $this->createDbTarget(null, 'test-table-1')->collect([
-            new Message(LogLevel::INFO, 'Message', ['time' => $time, 'category' => 'application']),
-        ], true);
+        $this
+            ->createDbTarget(null, 'test-table-1')
+            ->collect([
+                new Message(LogLevel::INFO, 'Message', ['time' => $time, 'category' => 'application']),
+            ], true);
 
-        $this->createDbTarget(null, 'test-table-2')->collect([
-            new Message(LogLevel::ALERT, 'Message-1', ['time' => $time, 'category' => 'app']),
-            new Message(LogLevel::ERROR, 'Message-2', ['time' => $time, 'foo' => 'bar']),
-        ], true);
+        $this
+            ->createDbTarget(null, 'test-table-2')
+            ->collect([
+                new Message(LogLevel::ALERT, 'Message-1', ['time' => $time, 'category' => 'app']),
+                new Message(LogLevel::ERROR, 'Message-2', ['time' => $time, 'foo' => 'bar']),
+            ], true);
 
         $this->assertSame(
             [
@@ -89,36 +101,51 @@ public function testExport(): void
 
     public function testExportWithEmptyMessages(): void
     {
-        $this->createDbTarget(null, 'test-table-1')->collect([], true);
+        $this
+            ->createDbTarget(null, 'test-table-1')
+            ->collect([], true);
 
         $this->assertSame([], $this->findData('test-table-1'));
     }
 
     public function testExportWithStoreFailure(): void
     {
-        $command = $this->getMockBuilder(Command::class)
+        $command = $this
+            ->getMockBuilder(Command::class)
             ->onlyMethods(['execute'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass()
         ;
-        $command->method('execute')->willReturn(0);
+        $command
+            ->method('execute')
+            ->willReturn(0);
 
         $db = $this->createMock(ConnectionInterface::class);
-        $db->method('createCommand')->willReturn($command);
+        $db
+            ->method('createCommand')
+            ->willReturn($command);
 
         $this->expectException(RuntimeException::class);
-        $this->createDbTarget($db)->collect([new Message(LogLevel::INFO, 'Message')], true);
+        $this
+            ->createDbTarget($db)
+            ->collect([new Message(LogLevel::INFO, 'Message')], true);
     }
 
     private function createDbTarget(ConnectionInterface $db = null, string $table = 'log'): DbTarget
     {
-        $target = new DbTarget($db ?? $this->getContainer()->get(ConnectionInterface::class), $table);
+        $target = new DbTarget($db ?? $this
+                ->getContainer()
+                ->get(ConnectionInterface::class), $table);
         $target->setFormat(fn (Message $message) => "[{$message->level()}] {$message->message()}");
         return $target;
     }
 
     private function findData(string $table): array
     {
-        return (new Query($this->getContainer()->get(ConnectionInterface::class)))->from($table)->all();
+        return (new Query($this
+            ->getContainer()
+            ->get(ConnectionInterface::class)))
+            ->from($table)
+            ->all();
     }
 }
diff --git a/tests/MigrationTest.php b/tests/MigrationTest.php
@@ -23,23 +23,31 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->migrationInformer = $this->getContainer()->get(MigrationInformerInterface::class);
+        $this->migrationInformer = $this
+            ->getContainer()
+            ->get(MigrationInformerInterface::class);
     }
 
     public function testUpAndDown(): void
     {
         $migration = new M202101052207CreateLog(
-            $this->getContainer()->get(LoggerInterface::class),
+            $this
+                ->getContainer()
+                ->get(LoggerInterface::class),
             $this->migrationInformer,
         );
 
-        $migration->up($this->getContainer()->get(MigrationBuilder::class));
+        $migration->up($this
+            ->getContainer()
+            ->get(MigrationBuilder::class));
 
         $this->assertTrue($this->tableExists('test-table-1'));
         $this->assertTrue($this->tableExists('test-table-2'));
         $this->assertFalse($this->tableExists('table-not-exist'));
 
-        $migration->down($this->getContainer()->get(MigrationBuilder::class));
+        $migration->down($this
+            ->getContainer()
+            ->get(MigrationBuilder::class));
 
         $this->assertFalse($this->tableExists('test-table-1'));
         $this->assertFalse($this->tableExists('test-table-2'));
@@ -49,10 +57,14 @@ public function testUpAndDown(): void
     public function testUpWithCheckingEquivalenceOfConnectionInstance(): void
     {
         /** @var Logger $logger */
-        $logger = $this->getContainer()->get(LoggerInterface::class);
+        $logger = $this
+            ->getContainer()
+            ->get(LoggerInterface::class);
 
         $migration = new M202101052207CreateLog($logger, $this->migrationInformer);
-        $migration->up($this->getContainer()->get(MigrationBuilder::class));
+        $migration->up($this
+            ->getContainer()
+            ->get(MigrationBuilder::class));
 
         /** @var DbTarget[] $targets */
         $targets = $logger->getTargets();
@@ -78,9 +90,11 @@ public function log($level, $message, array $context = []): void
 
     private function tableExists(string $table): bool
     {
-        return (bool) $this->getContainer()->get(ConnectionInterface::class)
+        return (bool) $this
+            ->getContainer()
+            ->get(ConnectionInterface::class)
             ->createCommand("SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='{$table}'")
             ->queryScalar()
-        ;
+            ;
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -37,10 +37,17 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
 
     protected function tearDown(): void
     {
-        $db = $this->getContainer()->get(ConnectionInterface::class);
-
-        foreach ($db->getSchema()->getTableNames() as $tableName) {
-            $db->createCommand()->dropTable($tableName)->execute();
+        $db = $this
+            ->getContainer()
+            ->get(ConnectionInterface::class);
+
+        foreach ($db
+                     ->getSchema()
+                     ->getTableNames() as $tableName) {
+            $db
+                ->createCommand()
+                ->dropTable($tableName)
+                ->execute();
         }
 
         unset($this->container);