Compatibility with fp4php/functional v5

fp4php · Nov 19, 2022 · b8bb91d · b8bb91d
1 parent 59c3d50
commit b8bb91d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Toolkit/Assertion/Assertions.php b/src/Toolkit/Assertion/Assertions.php
@@ -5,7 +5,9 @@
 namespace Fp\PsalmToolkit\Toolkit\Assertion;
 
 use Fp\Functional\Option\Option;
+
 use function Fp\Collection\at;
+use function Fp\Evidence\of;
 
 final class Assertions
 {
@@ -24,7 +26,7 @@ public function __construct(private array $data = [])
      */
     public function __invoke(string $name): Option
     {
-        return at($this->data, $name)->filterOf($name);
+        return at($this->data, $name)->flatMap(of($name));
     }
 
     /**

diff --git a/src/Toolkit/Assertion/Reconciler/SeePsalmIssuesAssertionReconciler.php b/src/Toolkit/Assertion/Reconciler/SeePsalmIssuesAssertionReconciler.php
@@ -13,6 +13,7 @@
 use Fp\PsalmToolkit\Toolkit\Assertion\Issue\SeePsalmIssueAssertionFailed;
 use Psalm\Internal\Analyzer\IssueData;
 use Psalm\IssueBuffer;
+use function Fp\Cast\asList;
 use function Fp\Collection\filter;
 use function Fp\Collection\reindex;
 
@@ -45,14 +46,14 @@ private static function handle(SeePsalmIssuesData $seePsalmIssues, HaveCodeAsser
 
         $expectedIssues = reindex($seePsalmIssues->issues, self::toKeyFn());
         $actualIssues = reindex($issuesData[$seePsalmIssues->code_location->file_path], self::toKeyFn());
-        $handledIssues = filter($actualIssues, self::isHandled($haveCodeAssertion, $expectedIssues), preserveKeys: true);
+        $handledIssues = filter($actualIssues, self::isHandled($haveCodeAssertion, $expectedIssues));
 
         /** @psalm-suppress InternalProperty */
         foreach ($handledIssues as $i) {
             IssueBuffer::remove($i->file_path, $i->type, $i->from);
         }
 
-        return filter($expectedIssues, fn(SeePsalmIssue $i) => !array_key_exists(self::toKey($i), $handledIssues));
+        return filter(asList($expectedIssues), fn(SeePsalmIssue $i) => !array_key_exists(self::toKey($i), $handledIssues));
     }
 
     /**