Merge pull request #2 from danog/1.9.x

Fix e2e tests
psalm · Nov 10, 2022 · 0194ec3 · 0194ec3
2 parents b17b0f5 + 3dd0596
commit 0194ec3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/Psl/Env/current_exec.php b/src/Psl/Env/current_exec.php
@@ -11,7 +11,7 @@
  */
 function current_exec(): string
 {
-    $executable = (string) Filesystem\canonicalize((string) $_SERVER['SCRIPT_NAME']);
+    $executable = (string) Filesystem\canonicalize($_SERVER['SCRIPT_NAME'] ?? '');
     // @codeCoverageIgnoreStart
     if (Filesystem\is_symbolic_link($executable)) {
         /** @psalm-suppress MissingThrowsDocblock */

diff --git a/src/Psl/Hash/Context.php b/src/Psl/Hash/Context.php
@@ -92,6 +92,7 @@ public function update(string $data): Context
         $internal_context = hash_copy($this->internalContext);
 
         // @codeCoverageIgnoreStart
+        /** @psalm-suppress ImpureFunctionCall */
         if (!hash_update($internal_context, $data)) {
             throw new Exception\RuntimeException('Unable to pump data into the active hashing context.');
         }

diff --git a/src/Psl/Iter/enumerate.php b/src/Psl/Iter/enumerate.php
@@ -15,7 +15,7 @@
  *
  * @param iterable<Tk, Tv> $iterable
  *
- * @return Iterator<int, array{0: Tk, 1: Tv}>
+ * @return Iterator<int, strict-array{0: Tk, 1: Tv}>
  *
  * @deprecated use `Vec\enumerate` instead.
  * @see Vec\enumerate()

diff --git a/src/Psl/Password/get_information.php b/src/Psl/Password/get_information.php
@@ -14,9 +14,9 @@
  * When passed in a valid hash created by an algorithm supported by `Psl\Password\hash()`,
  * this function will return an array of information about that hash.
  *
- * @return array{
+ * @return strict-array{
  *                algorithm: string,
- *                options: array{cost: int}|array{memory_cost: int, time_cost: int, threads: int}
+ *                options: strict-array{cost: int}|strict-array{memory_cost: int, time_cost: int, threads: int}
  *                }
  *
  * @pure