psalm fixed

Author: transistive

src/Common/DNSAddressResolver.php

@@ -13,6 +13,8 @@
 
 namespace Laudis\Neo4j\Common;
 
+use Generator;
+use Traversable;
 use function array_filter;
 use function array_map;
 use function array_unique;
@@ -29,9 +31,9 @@
 class DNSAddressResolver implements AddressResolverInterface
 {
     /**
-     * @return iterable<string>
+     * @return Generator<string>
      */
-    public function getAddresses(string $host): iterable
+    public function getAddresses(string $host): Generator
     {
         // By using the generator pattern we make sure to call the heavy DNS IO operations
         // as late as possible

src/Contracts/AddressResolverInterface.php

@@ -13,12 +13,14 @@
 
 namespace Laudis\Neo4j\Contracts;
 
+use Generator;
+
 interface AddressResolverInterface
 {
     /**
      * Returns the addresses.
      *
-     * @return iterable<string>
+     * @return Generator<string>
      */
-    public function getAddresses(string $host): iterable;
+    public function getAddresses(string $host): Generator;
 }

tests/Integration/BoltDriverIntegrationTest.php

@@ -24,6 +24,7 @@ final class BoltDriverIntegrationTest extends EnvironmentAwareIntegrationTest
 {
     /**
      * @throws Exception
+     * @psalm-suppress MixedMethodCall
      */
     public function testValidHostname(): void
     {
@@ -36,6 +37,7 @@ public function testValidHostname(): void
 
     /**
      * @throws Exception
+     * @psalm-suppress MixedMethodCall
      */
     public function testValidUrl(): void
     {

tests/Unit/CypherListTest.php

@@ -264,6 +264,11 @@ public function testIteration(): void
         self::assertEquals(3, $counter);
     }
 
+    /**
+     * @psalm-suppress UnevaluatedCode
+     * @psalm-suppress NoValue
+     * @psalm-suppress UnusedVariable
+     */
     public function testIterationEmpty(): void
     {
         $counter = 0;
@@ -443,8 +448,6 @@ public function testSlice(): void
                 return $x;
             });
 
-        /** @var int $sumBefore */
-        /** @var int $sumAfter */
         $start = $range->get(0);
 
         self::assertEquals(5, $start);

tests/Unit/CypherMapTest.php

@@ -266,6 +266,11 @@ public function testIteration(): void
         self::assertEquals(3, $counter);
     }
 
+    /**
+     * @psalm-suppress UnevaluatedCode
+     * @psalm-suppress UnusedVariable
+     * @psalm-suppress NoValue
+     */
     public function testIterationEmpty(): void
     {
         $counter = 0;
@@ -420,6 +425,7 @@ public function testSkipInvalid(): void
 
     public function testInvalidConstruct(): void
     {
+        /** @psalm-suppress MissingTemplateParam */
         $map = new CypherMap(new class() implements IteratorAggregate {
             public function getIterator(): Generator
             {

tests/Unit/DNSAddressResolverTest.php

@@ -28,23 +28,24 @@ protected function setUp(): void
 
     public function testResolverGhlenDotCom(): void
     {
-        $records = [...$this->resolver->getAddresses('test.ghlen.com')];
+        $records = iterator_to_array($this->resolver->getAddresses('test.ghlen.com'));
 
         $this->assertEqualsCanonicalizing(['test.ghlen.com', '123.123.123.123', '123.123.123.124'], $records);
         $this->assertNotEmpty($records);
-        $this->assertEquals('test.ghlen.com', $records[0]);
+        $this->assertEquals('test.ghlen.com', $records[0] ?? '');
     }
 
     public function testResolverGoogleDotComReverse(): void
     {
-        $records = [...$this->resolver->getAddresses('8.8.8.8')];
+        $records = iterator_to_array($this->resolver->getAddresses('8.8.8.8'));
 
         $this->assertNotEmpty($records);
         $this->assertContains('8.8.8.8', $records);
     }
 
     public function testBogus(): void
     {
-        $this->assertEquals(['bogus'], [...$this->resolver->getAddresses('bogus')]);
+        $addresses = iterator_to_array($this->resolver->getAddresses('bogus'));
+        $this->assertEquals('bogus', $addresses);
     }
 }

tests/Unit/ParameterHelperTest.php

@@ -32,7 +32,10 @@ final class ParameterHelperTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
-        /** @psalm-suppress MixedPropertyTypeCoercion */
+        /**
+         * @psalm-suppress MixedPropertyTypeCoercion
+         * @psalm-suppress MissingTemplateParam
+         */
         self::$invalidIterable = new class() implements Iterator {
             private bool $initial = true;