Skip to content

Commit a6e41a9

Browse files
authored
Merge pull request #259 from laminas/renovate/azjezz-psl-3.x
Update dependency azjezz/psl to v3
2 parents eed9bb9 + 97ffb62 commit a6e41a9

15 files changed

+37
-39
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM composer:2 AS composer
22

3-
FROM php:8.2-alpine
3+
FROM php:8.3-alpine
44

55
COPY --from=composer /usr/bin/composer /usr/bin/composer
66

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"description": "Application that eases release management in the Laminas organisation through GitHub actions",
55
"license": "BSD-3-Clause",
66
"require": {
7-
"php": "~8.2.0",
8-
"azjezz/psl": "^2.9.1",
7+
"php": "~8.3.0",
8+
"azjezz/psl": "^3.0.0",
99
"jwage/changelog-generator": "^1.4.0",
1010
"laminas/laminas-diactoros": "^2.26.0",
1111
"lcobucci/clock": "^3.2.0",

composer.lock

Lines changed: 19 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Changelog/BumpAndCommitChangelogVersion.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
interface BumpAndCommitChangelogVersion
1212
{
13-
public const BUMP_MINOR = 'bumpMinorVersion';
14-
public const BUMP_PATCH = 'bumpPatchVersion';
13+
public const string BUMP_MINOR = 'bumpMinorVersion';
14+
public const string BUMP_PATCH = 'bumpPatchVersion';
1515

1616
/**
1717
* @psalm-param self::BUMP_* $bumpType

src/Changelog/BumpAndCommitChangelogVersionViaKeepAChangelog.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
class BumpAndCommitChangelogVersionViaKeepAChangelog implements BumpAndCommitChangelogVersion
1919
{
20-
private const CHANGELOG_FILE = 'CHANGELOG.md';
20+
private const string CHANGELOG_FILE = 'CHANGELOG.md';
2121

22-
private const COMMIT_TEMPLATE = <<< 'COMMIT'
22+
private const string COMMIT_TEMPLATE = <<< 'COMMIT'
2323
Bumps changelog version to %s
2424
2525
Updates the %s file to add a changelog entry for a new %s version.

src/Changelog/ChangelogReleaseNotes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/** @psalm-immutable */
1414
class ChangelogReleaseNotes
1515
{
16-
private const CONCATENATION_STRING = "\n\n-----\n\n";
16+
private const string CONCATENATION_STRING = "\n\n-----\n\n";
1717

1818
/** @psalm-param non-empty-string $changelogFile */
1919
public static function writeChangelogFile(string $changelogFile, self $releaseNotes): void

src/Environment/EnvironmentVariables.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/** @psalm-immutable */
1616
class EnvironmentVariables implements Variables
1717
{
18-
private const LOG_LEVELS = [
18+
private const array LOG_LEVELS = [
1919
'100',
2020
'200',
2121
'250',

src/Git/Value/BranchName.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ private function __construct(
1919

2020
/**
2121
* @pure
22-
* @psalm-suppress ImpureFunctionCall the {@see \Psl\Type\non_empty_string()} API is pure by design
2322
* @psalm-suppress ImpureMethodCall the {@see \Psl\Type\TypeInterface::assert()} API is conditionally pure
2423
*/
2524
public static function fromName(string $name): self

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ private function __construct(
3030
* @psalm-pure
3131
*
3232
* @psalm-suppress ImpureMethodCall {@see https://github.com/azjezz/psl/issues/130}
33-
* @psalm-suppress ImpureFunctionCall {@see https://github.com/azjezz/psl/issues/130}
3433
*/
3534
public static function fromPayload(array $payload): self
3635
{

src/Github/CreateReleaseTextViaKeepAChangelog.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
class CreateReleaseTextViaKeepAChangelog implements CreateReleaseText
2727
{
2828
/** @psalm-var non-empty-list<string> */
29-
private const DEFAULT_SECTIONS = [
29+
private const array DEFAULT_SECTIONS = [
3030
'Added',
3131
'Changed',
3232
'Deprecated',

src/Github/Value/RepositoryName.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ private function __construct(
2828

2929
/**
3030
* @psalm-pure
31-
* @psalm-suppress ImpureFunctionCall the {@see \Psl\Type\non_empty_string()} API is pure by design
3231
* @psalm-suppress ImpureMethodCall the {@see \Psl\Type\TypeInterface::assert()} API is conditionally pure
3332
*/
3433
public static function fromFullName(string $fullName): self

test/unit/Changelog/BumpAndCommitChangelogVersionViaKeepAChangelogTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private function createMockChangelog(): string
209209
return $changelogFile;
210210
}
211211

212-
private const CHANGELOG_STUB = <<< 'CHANGELOG'
212+
private const string CHANGELOG_STUB = <<< 'CHANGELOG'
213213
# Changelog
214214
215215
All notable changes to this project will be documented in this file, in reverse chronological order by release.

test/unit/Changelog/ChangelogReleaseNotesTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public function testMergedInstanceContainsChangelogEntryFromTheInstanceThatHadOn
161161
$this->assertEquals($expectedEntry, $reflectionProperty->getValue($merged));
162162
}
163163

164-
private const CHANGELOG_ENTRY = <<< 'ENTRY'
164+
private const string CHANGELOG_ENTRY = <<< 'ENTRY'
165165
## 1.0.1 - %s
166166
167167
### Added
@@ -186,7 +186,7 @@ public function testMergedInstanceContainsChangelogEntryFromTheInstanceThatHadOn
186186

187187
ENTRY;
188188

189-
private const CHANGELOG_STUB = <<< 'CHANGELOG'
189+
private const string CHANGELOG_STUB = <<< 'CHANGELOG'
190190
# Changelog
191191
192192
All notable changes to this project will be documented in this file, in reverse chronological order by release.

test/unit/Changelog/ReleaseChangelogViaKeepAChangelogTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private function checkoutMockRepositoryWithChangelog(string $origin): string
271271
return $repo;
272272
}
273273

274-
private const INVALID_CHANGELOG = <<< 'END'
274+
private const string INVALID_CHANGELOG = <<< 'END'
275275
# NOT A CHANGELOG
276276
277277
This file is not a changelog.
@@ -282,7 +282,7 @@ private function checkoutMockRepositoryWithChangelog(string $origin): string
282282

283283
END;
284284

285-
private const READY_CHANGELOG = <<< 'END'
285+
private const string READY_CHANGELOG = <<< 'END'
286286
# Changelog
287287
288288
All notable changes to this project will be documented in this file, in reverse chronological order by release.

test/unit/Github/CreateReleaseTextViaKeepAChangelogTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private function checkoutMockRepositoryWithChangelog(string $origin): string
209209
return $repo;
210210
}
211211

212-
private const INVALID_CHANGELOG = <<< 'END'
212+
private const string INVALID_CHANGELOG = <<< 'END'
213213
# NOT A CHANGELOG
214214
215215
This file is not a changelog.
@@ -220,7 +220,7 @@ private function checkoutMockRepositoryWithChangelog(string $origin): string
220220

221221
END;
222222

223-
private const READY_CHANGELOG = <<< 'END'
223+
private const string READY_CHANGELOG = <<< 'END'
224224
# Changelog
225225
226226
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
271271

272272
END;
273273

274-
private const CHANGELOG_MULTI_SECTION = <<< 'END'
274+
private const string CHANGELOG_MULTI_SECTION = <<< 'END'
275275
# Changelog
276276
277277
All notable changes to this project will be documented in this file, in reverse chronological order by release.

0 commit comments

Comments
 (0)