Merge pull request #189 from laminas/renovate/azjezz-psl-2.x

chore(deps): update dependency azjezz/psl to v2

Author: Ocramius

composer.json

@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": "~8.1.0",
-        "azjezz/psl": "^1.9.3",
+        "azjezz/psl": "^2.0.3",
         "jwage/changelog-generator": "^1.3.1",
         "laminas/laminas-diactoros": "^2.13.0",
         "lcobucci/clock": "^2.2.0",
@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "doctrine/coding-standard": "^9.0.0",
-        "php-standard-library/psalm-plugin": "^1.1.1",
+        "php-standard-library/psalm-plugin": "^2.0.2",
         "phpunit/phpunit": "^9.5.0",
         "psalm/plugin-phpunit": "^0.17.0",
         "roave/infection-static-analysis-plugin": "^1.7",

composer.lock

@@ -109,6 +109,7 @@ private static function getenv(string $key): string
     }
 
     /**
+     * @psalm-param  non-empty-string $key
      * @psalm-param  non-empty-string $default
      *
      * @psalm-return non-empty-string

src/Environment/EnvironmentVariables.php

@@ -9,6 +9,7 @@
 
 interface CreateTag
 {
+    /** @param non-empty-string $repositoryDirectory */
     public function __invoke(
         string $repositoryDirectory,
         BranchName $sourceBranch,

src/Git/CreateTag.php

@@ -7,6 +7,7 @@
 use Laminas\AutomaticReleases\Git\Value\BranchName;
 use Laminas\AutomaticReleases\Gpg\SecretKeyId;
 use Psl\Env;
+use Psl\File;
 use Psl\Filesystem;
 use Psl\Shell;
 
@@ -21,7 +22,7 @@ public function __invoke(
     ): void {
         $tagFileName = Filesystem\create_temporary_file(Env\temp_dir(), 'created_tag');
 
-        Filesystem\write_file($tagFileName, $changelog);
+        File\write($tagFileName, $changelog);
 
         Shell\execute('git', ['checkout', $sourceBranch->name()], $repositoryDirectory);
         Shell\execute('git', ['tag', $tagName, '-F', $tagFileName, '--cleanup=whitespace', '--local-user=' . $keyId->id()], $repositoryDirectory);

src/Git/CreateTagViaConsole.php

@@ -64,7 +64,7 @@ public function branchToMergeUp(SemVerVersion $version): ?BranchName
             return null;
         }
 
-        $lastBranch      = Type\object(BranchName::class)->assert(Iter\last($this->sortedBranches));
+        $lastBranch      = Type\instance_of(BranchName::class)->assert(Iter\last($this->sortedBranches));
         $targetBranchKey = array_search($targetBranch, $this->sortedBranches, true);
 
         $branch = Type\int()->matches($targetBranchKey)

src/Git/Value/MergeTargetCandidateBranches.php

@@ -70,7 +70,7 @@ public static function fromPayload(array $payload): self
             $payload['number'],
             $payload['title'],
             Author::fromPayload($payload['author']),
-            Vec\map($payload['labels']['nodes'], [Label::class, 'fromPayload']),
+            Vec\map($payload['labels']['nodes'], Label::fromPayload(...)),
             isset($payload['merged']) ? $payload['merged'] || $payload['closed'] : $payload['closed'],
             new Uri($payload['url'])
         );

src/Github/Api/GraphQL/Query/GetMilestoneChangelog/Response/IssueOrPullRequest.php

@@ -77,8 +77,8 @@ public static function fromPayload(array $payload): self
             $payload['title'],
             $payload['description'],
             Vec\concat(
-                Vec\map($payload['issues']['nodes'], [IssueOrPullRequest::class, 'fromPayload']),
-                Vec\map($payload['pullRequests']['nodes'], [IssueOrPullRequest::class, 'fromPayload'])
+                Vec\map($payload['issues']['nodes'], IssueOrPullRequest::fromPayload(...)),
+                Vec\map($payload['pullRequests']['nodes'], IssueOrPullRequest::fromPayload(...))
             ),
             new Uri($payload['url'])
         );

src/Github/Api/GraphQL/Query/GetMilestoneChangelog/Response/Milestone.php

@@ -6,7 +6,8 @@
 
 use Laminas\AutomaticReleases\Environment\EnvironmentVariables;
 use Laminas\AutomaticReleases\Github\Event\MilestoneClosedEvent;
-use Psl\Filesystem;
+
+use function Psl\File\read;
 
 final class LoadCurrentGithubEventFromGithubActionPath implements LoadCurrentGithubEvent
 {
@@ -21,6 +22,6 @@ public function __invoke(): MilestoneClosedEvent
     {
         $path = $this->variables->githubEventPath();
 
-        return MilestoneClosedEvent::fromEventJson(Filesystem\read_file($path));
+        return MilestoneClosedEvent::fromEventJson(read($path));
     }
 }

src/Github/Event/Factory/LoadCurrentGithubEventFromGithubActionPath.php

@@ -45,7 +45,7 @@ public function __invoke(
             null
         );
 
-        return Type\object(ChangelogReleaseNotes::class)->assert($releaseNotes);
+        return Type\instance_of(ChangelogReleaseNotes::class)->assert($releaseNotes);
     }
 
     public function canCreateReleaseText(