Fixes for Psalm

amphp · Nov 2, 2020 · 8caee75 · 8caee75
1 parent 18f7781
commit 8caee75
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Connection/ConnectionLimitingPool.php b/src/Connection/ConnectionLimitingPool.php
@@ -354,7 +354,10 @@ private function removeWaiting(string $uri, int $deferredId): void
 
     private function dropConnection(string $uri, ?int $connectionId, int $promiseId): void
     {
-        unset($this->connections[$uri][$promiseId], $this->activeRequestCounts[$connectionId], $this->idleConnections[$connectionId]);
+        unset($this->connections[$uri][$promiseId]);
+        if ($connectionId !== null) {
+            unset($this->activeRequestCounts[$connectionId], $this->idleConnections[$connectionId]);
+        }
 
         if ($this->connections[$uri]->count() === 0) {
             unset($this->connections[$uri], $this->waitForPriorConnection[$uri]);

diff --git a/test/Connection/ConnectionLimitingPoolTest.php b/test/Connection/ConnectionLimitingPoolTest.php
@@ -149,8 +149,9 @@ private function createMockClosableConnection(Request $request): Promise
             ->method('close')
             ->willReturnCallback(static function () use (&$content, &$closeHandlers, $connection) {
                 $content = 'closed';
-                foreach ($closeHandlers as $closeHandler)
+                foreach ($closeHandlers as $closeHandler) {
                     asyncCall($closeHandler, $connection);
+                }
                 return new Success;
             });
         $connection->method('onClose')