Skip to content

Commit

Permalink
Merge pull request #132 from laminas/dependabot/composer/doctrine/cod…
Browse files Browse the repository at this point in the history
…ing-standard-9.0.0

build(deps-dev): Bump doctrine/coding-standard from 8.2.0 to 9.0.0
  • Loading branch information
Ocramius authored May 21, 2021
2 parents 04ee317 + 9970c12 commit d163143
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 60 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}
},
"require-dev": {
"doctrine/coding-standard": "^8.2.0",
"doctrine/coding-standard": "^9.0.0",
"php-standard-library/psalm-plugin": "^1.1.1",
"phpunit/phpunit": "^9.5.0",
"psalm/plugin-phpunit": "^0.15.1",
Expand Down
87 changes: 42 additions & 45 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/Environment/EnvironmentVariables.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public static function fromEnvironment(ImportGpgKeyFromString $importKey): self

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

/**
* @psalm-param non-empty-string $default
*
* @psalm-return non-empty-string
*/
private static function getenvWithFallback(string $key, string $default): string
Expand Down
1 change: 0 additions & 1 deletion src/Git/Value/BranchName.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ public function isReleaseBranch(): bool

/**
* @return array<int, int>
*
* @psalm-return array{0: int, 1: int}
*
* @psalm-suppress ImpureFunctionCall the {@see \Psl\Type\int()} and {@see \Psl\Type\shape()} APIs are pure by design
Expand Down
1 change: 0 additions & 1 deletion src/Git/Value/MergeTargetCandidateBranches.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ final class MergeTargetCandidateBranches

/**
* @param BranchName[] $sortedBranches
*
* @psalm-param list<BranchName> $sortedBranches
*/
private function __construct(array $sortedBranches)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ final class IssueOrPullRequest
/**
* @psalm-param non-empty-string $title
* @psalm-param list<Label> $labels
*
* @psalm-suppress ImpurePropertyAssignment {@see UriInterface} is pure
*/
private function __construct(
Expand Down Expand Up @@ -95,7 +96,6 @@ public function author(): Author

/**
* @return array<int, Label>
*
* @psalm-return list<Label>
*/
public function labels(): array
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ final class Label
/**
* @psalm-param non-empty-string $colour
* @psalm-param non-empty-string $name
*
* @psalm-suppress ImpurePropertyAssignment {@see UriInterface} is pure
*/
private function __construct(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ final class Milestone

/**
* @param array<int, IssueOrPullRequest> $entries
*
* @psalm-param non-empty-string $title
* @psalm-param list<IssueOrPullRequest> $entries
*
* @psalm-suppress ImpurePropertyAssignment {@see UriInterface} is pure
*/
private function __construct(
Expand Down
3 changes: 3 additions & 0 deletions src/Github/CreateReleaseTextViaKeepAChangelog.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public function canCreateReleaseText(

/**
* @psalm-param non-empty-string $repositoryDirectory
*
* @psalm-return non-empty-string
*/
private function fetchChangelogContentsFromBranch(
Expand All @@ -108,6 +109,7 @@ private function fetchChangelogContentsFromBranch(
/**
* @psalm-param non-empty-string $changelog
* @psalm-param non-empty-string $version
*
* @psalm-return non-empty-string
*/
private function updateReleaseDate(string $changelog, string $version): string
Expand All @@ -126,6 +128,7 @@ private function updateReleaseDate(string $changelog, string $version): string

/**
* @psalm-param non-empty-string $changelog
*
* @psalm-return non-empty-string
*/
private function removeDefaultContents(string $changelog): string
Expand Down
1 change: 1 addition & 0 deletions test/unit/Changelog/ChangelogExistsViaConsoleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ private function createMockRepositoryWithChangelog(): string

/**
* @psalm-param non-empty-string $origin
*
* @psalm-return non-empty-string
*/
private function checkoutMockRepositoryWithChangelog(string $origin): string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ private function createMockRepositoryWithChangelog(

/**
* @psalm-param non-empty-string $origin
*
* @psalm-return non-empty-string
*/
private function checkoutMockRepositoryWithChangelog(string $origin): string
Expand Down
4 changes: 0 additions & 4 deletions test/unit/Git/Value/BranchNameTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ public function testDetectsReleaseBranchVersions(string $inputName, int $major,

/**
* @return array<int, array<int, int|string>>
*
* @psalm-return array<int, array{0: string, 1: int, 2: int}>
*/
public function releaseBranches(): array
Expand Down Expand Up @@ -90,7 +89,6 @@ public function testIsForVersion(string $milestoneName, string $branchName, bool

/**
* @return array<int, array<int, bool|string>>
*
* @psalm-return array<int, array{0: string, 1: string, 2: bool}>
*/
public function versionEqualityProvider(): array
Expand Down Expand Up @@ -120,7 +118,6 @@ public function testIsForNewerVersionThan(string $milestoneName, string $branchN

/**
* @return array<int, array<int, bool|string>>
*
* @psalm-return array<int, array{0: string, 1: string, 2: bool}>
*/
public function newerVersionComparisonProvider(): array
Expand Down Expand Up @@ -151,7 +148,6 @@ public function testTargetMinorReleaseVersion(string $branchName, string $expect

/**
* @return string[][]
*
* @psalm-return list<array{0: string, 1: string}>
*/
public function targetVersionProvider(): array
Expand Down
Loading

0 comments on commit d163143

Please sign in to comment.