Merge pull request #259 from laminas/renovate/azjezz-psl-3.x

Update dependency azjezz/psl to v3
laminas · Sep 5, 2024 · a6e41a9 · a6e41a9
2 parents eed9bb9 + 97ffb62
commit a6e41a9
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 39 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM composer:2 AS composer
 
-FROM php:8.2-alpine
+FROM php:8.3-alpine
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 

diff --git a/composer.json b/composer.json
@@ -4,8 +4,8 @@
     "description": "Application that eases release management in the Laminas organisation through GitHub actions",
     "license": "BSD-3-Clause",
     "require": {
-        "php": "~8.2.0",
-        "azjezz/psl": "^2.9.1",
+        "php": "~8.3.0",
+        "azjezz/psl": "^3.0.0",
         "jwage/changelog-generator": "^1.4.0",
         "laminas/laminas-diactoros": "^2.26.0",
         "lcobucci/clock": "^3.2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Changelog/BumpAndCommitChangelogVersion.php b/src/Changelog/BumpAndCommitChangelogVersion.php
@@ -10,8 +10,8 @@
 
 interface BumpAndCommitChangelogVersion
 {
-    public const BUMP_MINOR = 'bumpMinorVersion';
-    public const BUMP_PATCH = 'bumpPatchVersion';
+    public const string BUMP_MINOR = 'bumpMinorVersion';
+    public const string BUMP_PATCH = 'bumpPatchVersion';
 
     /**
      * @psalm-param self::BUMP_*     $bumpType

diff --git a/src/Changelog/BumpAndCommitChangelogVersionViaKeepAChangelog.php b/src/Changelog/BumpAndCommitChangelogVersionViaKeepAChangelog.php
@@ -17,9 +17,9 @@
 
 class BumpAndCommitChangelogVersionViaKeepAChangelog implements BumpAndCommitChangelogVersion
 {
-    private const CHANGELOG_FILE = 'CHANGELOG.md';
+    private const string CHANGELOG_FILE = 'CHANGELOG.md';
 
-    private const COMMIT_TEMPLATE = <<< 'COMMIT'
+    private const string COMMIT_TEMPLATE = <<< 'COMMIT'
         Bumps changelog version to %s
 
         Updates the %s file to add a changelog entry for a new %s version.

diff --git a/src/Changelog/ChangelogReleaseNotes.php b/src/Changelog/ChangelogReleaseNotes.php
@@ -13,7 +13,7 @@
 /** @psalm-immutable */
 class ChangelogReleaseNotes
 {
-    private const CONCATENATION_STRING = "\n\n-----\n\n";
+    private const string CONCATENATION_STRING = "\n\n-----\n\n";
 
     /** @psalm-param non-empty-string $changelogFile */
     public static function writeChangelogFile(string $changelogFile, self $releaseNotes): void

diff --git a/src/Environment/EnvironmentVariables.php b/src/Environment/EnvironmentVariables.php
@@ -15,7 +15,7 @@
 /** @psalm-immutable */
 class EnvironmentVariables implements Variables
 {
-    private const LOG_LEVELS = [
+    private const array LOG_LEVELS = [
         '100',
         '200',
         '250',

diff --git a/src/Git/Value/BranchName.php b/src/Git/Value/BranchName.php
@@ -19,7 +19,6 @@ private function __construct(
 
     /**
      * @pure
-     * @psalm-suppress ImpureFunctionCall the {@see \Psl\Type\non_empty_string()} API is pure by design
      * @psalm-suppress ImpureMethodCall the {@see \Psl\Type\TypeInterface::assert()} API is conditionally pure
      */
     public static function fromName(string $name): self

diff --git a/src/Github/Api/GraphQL/Query/GetMilestoneChangelog/Response/Label.php b/src/Github/Api/GraphQL/Query/GetMilestoneChangelog/Response/Label.php
@@ -30,7 +30,6 @@ private function __construct(
      * @psalm-pure
      *
      * @psalm-suppress ImpureMethodCall     {@see https://github.com/azjezz/psl/issues/130}
-     * @psalm-suppress ImpureFunctionCall   {@see https://github.com/azjezz/psl/issues/130}
      */
     public static function fromPayload(array $payload): self
     {

diff --git a/src/Github/CreateReleaseTextViaKeepAChangelog.php b/src/Github/CreateReleaseTextViaKeepAChangelog.php
@@ -26,7 +26,7 @@
 class CreateReleaseTextViaKeepAChangelog implements CreateReleaseText
 {
     /** @psalm-var non-empty-list<string> */
-    private const DEFAULT_SECTIONS = [
+    private const array DEFAULT_SECTIONS = [
         'Added',
         'Changed',
         'Deprecated',

diff --git a/src/Github/Value/RepositoryName.php b/src/Github/Value/RepositoryName.php
@@ -28,7 +28,6 @@ private function __construct(
 
     /**
      * @psalm-pure
-     * @psalm-suppress ImpureFunctionCall the {@see \Psl\Type\non_empty_string()} API is pure by design
      * @psalm-suppress ImpureMethodCall the {@see \Psl\Type\TypeInterface::assert()} API is conditionally pure
      */
     public static function fromFullName(string $fullName): self

diff --git a/test/unit/Changelog/BumpAndCommitChangelogVersionViaKeepAChangelogTest.php b/test/unit/Changelog/BumpAndCommitChangelogVersionViaKeepAChangelogTest.php
@@ -209,7 +209,7 @@ private function createMockChangelog(): string
         return $changelogFile;
     }
 
-    private const CHANGELOG_STUB = <<< 'CHANGELOG'
+    private const string CHANGELOG_STUB = <<< 'CHANGELOG'
         # Changelog
         
         All notable changes to this project will be documented in this file, in reverse chronological order by release.

diff --git a/test/unit/Changelog/ChangelogReleaseNotesTest.php b/test/unit/Changelog/ChangelogReleaseNotesTest.php
@@ -161,7 +161,7 @@ public function testMergedInstanceContainsChangelogEntryFromTheInstanceThatHadOn
         $this->assertEquals($expectedEntry, $reflectionProperty->getValue($merged));
     }
 
-    private const CHANGELOG_ENTRY = <<< 'ENTRY'
+    private const string CHANGELOG_ENTRY = <<< 'ENTRY'
         ## 1.0.1 - %s
         
         ### Added
@@ -186,7 +186,7 @@ public function testMergedInstanceContainsChangelogEntryFromTheInstanceThatHadOn
 
         ENTRY;
 
-    private const CHANGELOG_STUB = <<< 'CHANGELOG'
+    private const string CHANGELOG_STUB = <<< 'CHANGELOG'
         # Changelog
         
         All notable changes to this project will be documented in this file, in reverse chronological order by release.

diff --git a/test/unit/Changelog/ReleaseChangelogViaKeepAChangelogTest.php b/test/unit/Changelog/ReleaseChangelogViaKeepAChangelogTest.php
@@ -271,7 +271,7 @@ private function checkoutMockRepositoryWithChangelog(string $origin): string
         return $repo;
     }
 
-    private const INVALID_CHANGELOG = <<< 'END'
+    private const string INVALID_CHANGELOG = <<< 'END'
         # NOT A CHANGELOG
 
         This file is not a changelog.
@@ -282,7 +282,7 @@ private function checkoutMockRepositoryWithChangelog(string $origin): string
 
         END;
 
-    private const READY_CHANGELOG = <<< 'END'
+    private const string READY_CHANGELOG = <<< 'END'
         # Changelog
         
         All notable changes to this project will be documented in this file, in reverse chronological order by release.

diff --git a/test/unit/Github/CreateReleaseTextViaKeepAChangelogTest.php b/test/unit/Github/CreateReleaseTextViaKeepAChangelogTest.php
@@ -209,7 +209,7 @@ private function checkoutMockRepositoryWithChangelog(string $origin): string
         return $repo;
     }
 
-    private const INVALID_CHANGELOG = <<< 'END'
+    private const string INVALID_CHANGELOG = <<< 'END'
         # NOT A CHANGELOG
 
         This file is not a changelog.
@@ -220,7 +220,7 @@ private function checkoutMockRepositoryWithChangelog(string $origin): string
 
         END;
 
-    private const READY_CHANGELOG = <<< 'END'
+    private const string READY_CHANGELOG = <<< 'END'
         # Changelog
         
         All notable changes to this project will be documented in this file, in reverse chronological order by release.
@@ -271,7 +271,7 @@ private function checkoutMockRepositoryWithChangelog(string $origin): string
 
         END;
 
-    private const CHANGELOG_MULTI_SECTION = <<< 'END'
+    private const string CHANGELOG_MULTI_SECTION = <<< 'END'
         # Changelog
         
         All notable changes to this project will be documented in this file, in reverse chronological order by release.