Update close handler to avoid unhandled promise rejections

clue · Jan 1, 2025 · 6070b21 · 6070b21
1 parent 42b3c0a
commit 6070b21
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/Io/LazyDatabase.php b/src/Io/LazyDatabase.php
@@ -145,6 +145,8 @@ public function close()
         if ($this->promise !== null) {
             $this->promise->then(function (DatabaseInterface $db) {
                 $db->close();
+            }, function () {
+                // ignore to avoid reporting unhandled rejection
             });
             if ($this->promise !== null) {
                 $this->promise->cancel();

diff --git a/src/Io/ProcessIoDatabase.php b/src/Io/ProcessIoDatabase.php
@@ -115,7 +115,11 @@ public function quit()
         $promise = $this->send('close', array());
 
         if ($this->process->stdin === $this->process->stdout) {
-            $promise->then(function () { $this->process->stdin->close(); });
+            $promise->then(function () {
+                $this->process->stdin->close();
+            }, function () {
+                // ignore to avoid reporting unhandled rejection
+            });
         } else {
             $this->process->stdin->end();
         }

diff --git a/tests/Io/LazyDatabaseTest.php b/tests/Io/LazyDatabaseTest.php
@@ -167,7 +167,9 @@ public function testExecAfterPreviousFactoryRejectsUnderlyingDatabaseWillCreateN
             new Promise(function () { })
         );
 
-        $this->db->exec('CREATE');
+        $promise = $this->db->exec('CREATE');
+        $promise->then(null, $this->expectCallableOnce()); // avoid reporting unhandled rejection
+
         $deferred->reject($error);
 
         $this->db->exec('CREATE');
@@ -392,9 +394,11 @@ public function testQueryAfterPreviousFactoryRejectsUnderlyingDatabaseWillCreate
         $this->factory->expects($this->exactly(2))->method('open')->willReturnOnConsecutiveCalls(
             $deferred->promise(),
             new Promise(function () { })
-            );
+        );
+
+        $promise = $this->db->query('CREATE');
+        $promise->then(null, $this->expectCallableOnce()); // avoid reporting unhandled rejection
 
-        $this->db->query('CREATE');
         $deferred->reject($error);
 
         $this->db->query('CREATE');
@@ -408,7 +412,7 @@ public function testQueryAfterPreviousUnderlyingDatabaseAlreadyClosedWillCreateN
         $this->factory->expects($this->exactly(2))->method('open')->willReturnOnConsecutiveCalls(
             \React\Promise\resolve($client),
             new Promise(function () { })
-            );
+        );
 
         $this->db->query('CREATE');
         $client->emit('close');
@@ -433,7 +437,7 @@ public function testQueryAfterQueryWillNotStartIdleTimerWhenFirstQueryResolves()
         $client->expects($this->exactly(2))->method('query')->willReturnOnConsecutiveCalls(
             $deferred->promise(),
             new Promise(function () { })
-            );
+        );
 
         $this->factory->expects($this->once())->method('open')->willReturn(\React\Promise\resolve($client));
 
@@ -451,7 +455,7 @@ public function testQueryAfterQueryWillStartAndCancelIdleTimerWhenSecondQuerySta
         $client->expects($this->exactly(2))->method('query')->willReturnOnConsecutiveCalls(
             $deferred->promise(),
             new Promise(function () { })
-            );
+        );
 
         $this->factory->expects($this->once())->method('open')->willReturn(\React\Promise\resolve($client));
 
@@ -524,7 +528,9 @@ public function testCloseAfterExecWillEmitCloseWithoutErrorWhenUnderlyingDatabas
         $this->db->on('error', $this->expectCallableNever());
         $this->db->on('close', $this->expectCallableOnce());
 
-        $this->db->exec('CREATE');
+        $promise = $this->db->exec('CREATE');
+        $promise->then(null, $this->expectCallableOnce()); // avoid reporting unhandled rejection
+
         $this->db->close();
     }