improved typing

Author: transistive

psalm.xml

@@ -39,6 +39,5 @@
     </stubs>
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
-        <pluginClass class="Lctrs\PsalmPsrContainerPlugin\Plugin"/>
     </plugins>
 </psalm>

src/Common/Cache.php

@@ -20,9 +20,7 @@
 use Generator;
 
 use function is_int;
-use function is_iterable;
 use function is_object;
-use function is_string;
 
 use Laudis\Neo4j\Exception\InvalidCacheArgumentException;
 
@@ -53,9 +51,7 @@ class Cache implements CacheInterface
     private array $items = [];
     private static ?self $instance = null;
 
-    private function __construct()
-    {
-    }
+    private function __construct() {}
 
     public static function getInstance(): self
     {
@@ -69,7 +65,6 @@ public static function getInstance(): self
     /**
      * @template U
      *
-     * @param string $key
      * @param U $default
      *
      * @return T|U
@@ -102,8 +97,6 @@ public function clear(): bool
      */
     public function deleteMultiple(iterable $keys): bool
     {
-        $this->assertIterable($keys);
-
         foreach ($keys as $key) {
             $this->delete($key);
         }
@@ -122,10 +115,8 @@ public function set(string $key, mixed $value, int|DateInterval|null $ttl = null
             $ttl = (new DateTimeImmutable())->add($ttl)->getTimestamp();
         } elseif ($ttl === null) {
             $ttl = PHP_INT_MAX;
-        } elseif (is_int($ttl)) {
-            $ttl += time();
         } else {
-            throw new InvalidCacheArgumentException();
+            $ttl += time();
         }
 
         if (is_object($value)) {
@@ -150,14 +141,12 @@ public function delete($key): bool
      * @template U
      *
      * @param iterable<string> $keys
-     * @param U $default
+     * @param U                $default
      *
      * @return Generator<string, T|U>
      */
     public function getMultiple($keys, $default = null): Generator
     {
-        $this->assertIterable($keys);
-
         /** @var list<string> $cachedKeys */
         $cachedKeys = [];
         foreach ($keys as $key) {
@@ -173,18 +162,16 @@ public function getMultiple($keys, $default = null): Generator
     }
 
     /**
-     * @param iterable<string, T> $values
+     * @param iterable<string, T>   $values
      * @param int|DateInterval|null $ttl
      *
      * @throws InvalidCacheArgumentException
      */
     public function setMultiple(iterable $values, null|int|DateInterval $ttl = null): bool
     {
-        $this->assertIterable($values);
-
         foreach ($values as $key => $value) {
             if (is_int($key)) {
-                $key = (string)$key;
+                $key = (string) $key;
             }
             $this->set($key, $value, $ttl);
         }

src/Common/TransactionHelper.php

@@ -54,11 +54,6 @@ public static function retry(callable $tsxFactory, callable $tsxHandler)
         }
     }
 
-    /**
-     * @param mixed $tbr
-     *
-     * @psalm-param U $tbr
-     */
     private static function triggerLazyResult(mixed $tbr): void
     {
         if ($tbr instanceof AbstractCypherSequence) {

src/ParameterHelper.php

@@ -77,11 +77,11 @@ public static function asMap(iterable $iterable): CypherMap
 
     /**
      * @return iterable|scalar|stdClass|IStructure|null
-     *
-     * @param \DateTime|array|object|stdClass $value
      */
-    public static function asParameter(array|object|stdClass|\DateTimed $value, bool $boltDriver = false)
-    {
+    public static function asParameter(
+        mixed $value,
+        bool $boltDriver = false
+    ): iterable|int|float|bool|string|stdClass|IStructure|null {
         return self::cypherMapToStdClass($value) ??
             self::emptySequenceToArray($value) ??
             self::convertBoltConvertibles($value, $boltDriver) ??
@@ -108,7 +108,7 @@ private static function stringAbleToString(mixed $value): ?string
      *
      * @pure
      */
-    private static function filterInvalidType(mixed $value)
+    private static function filterInvalidType(mixed $value): mixed
     {
         if ($value !== null && !is_scalar($value)) {
             /** @psalm-suppress ImpureFunctionCall */

src/TypeCaster.php

@@ -28,10 +28,6 @@ final class TypeCaster
 {
     /**
      * @pure
-     *
-     * @param mixed $value
-     *
-     * @psalm-param TValue $value
      */
     public static function toString(mixed $value): ?string
     {
@@ -44,10 +40,6 @@ public static function toString(mixed $value): ?string
 
     /**
      * @pure
-     *
-     * @param mixed $value
-     *
-     * @psalm-param TValue $value
      */
     public static function toFloat(mixed $value): ?float
     {
@@ -61,10 +53,6 @@ public static function toFloat(mixed $value): ?float
 
     /**
      * @pure
-     *
-     * @param mixed $value
-     *
-     * @psalm-param TValue $value
      */
     public static function toInt(mixed $value): ?int
     {
@@ -88,10 +76,6 @@ public static function toNull()
 
     /**
      * @pure
-     *
-     * @param mixed $value
-     *
-     * @psalm-param TValue $value
      */
     public static function toBool(mixed $value): ?bool
     {
@@ -107,13 +91,10 @@ public static function toBool(mixed $value): ?bool
      * @template T
      *
      * @param class-string<T> $class
-     * @param mixed $value
      *
      * @return T|null
      *
      * @pure
-     *
-     * @psalm-param TValue $value
      */
     public static function toClass(mixed $value, string $class): ?object
     {
@@ -150,10 +131,6 @@ public static function toArray(mixed $value): ?array
      * @return CypherList<mixed>|null
      *
      * @pure
-     *
-     * @param mixed $value
-     *
-     * @psalm-param TValue $value
      */
     public static function toCypherList(mixed $value): ?CypherList
     {
@@ -166,10 +143,6 @@ public static function toCypherList(mixed $value): ?CypherList
 
     /**
      * @return CypherMap<mixed>|null
-     *
-     * @param mixed $value
-     *
-     * @psalm-param TValue $value
      */
     public static function toCypherMap(mixed $value): ?CypherMap
     {

src/Types/AbstractCypherSequence.php

@@ -542,10 +542,6 @@ public function preload(): void
 
     /**
      * @psalm-mutation-free
-     *
-     * @param (int|string) $key
-     *
-     * @psalm-param array-key $key
      */
     protected function isStringable(mixed $key): bool
     {