Skip to content

Commit

Permalink
Merge pull request #207 from gsteel/doctrine-coding-standard-10
Browse files Browse the repository at this point in the history
Doctrine coding standard 10
  • Loading branch information
Ocramius authored Aug 29, 2022
2 parents c3b4926 + 3144dfa commit 3e2b402
Show file tree
Hide file tree
Showing 89 changed files with 658 additions and 968 deletions.
28 changes: 14 additions & 14 deletions bin/console.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
static function (int $errorCode, string $message = '', string $file = '', int $line = 0): bool {
throw new ErrorException($message, 0, $errorCode, $file, $line);
},
E_STRICT | E_NOTICE | E_WARNING
E_STRICT | E_NOTICE | E_WARNING,
);

$variables = EnvironmentVariables::fromEnvironment(new ImportGpgKeyFromStringViaTemporaryFile());
Expand All @@ -72,7 +72,7 @@ static function (int $errorCode, string $message = '', string $file = '', int $l
$getMilestone = new GetMilestoneFirst100IssuesAndPullRequests(new RunGraphQLQuery(
$makeRequests,
$httpClient,
$githubToken
$githubToken,
));
$changelogExists = new ChangelogExistsViaConsole();
$checkoutBranch = new CheckoutBranchViaConsole();
Expand All @@ -83,12 +83,12 @@ static function (int $errorCode, string $message = '', string $file = '', int $l
$checkoutBranch,
$commit,
$push,
$logger
$logger,
);
$createCommitText = new CreateReleaseTextThroughChangelog(JwageGenerateChangelog::create(
$makeRequests,
$httpClient,
new GitHubOAuthToken($githubToken)
new GitHubOAuthToken($githubToken),
));
$createReleaseText = new MergeMultipleReleaseNotes([
new CreateReleaseTextViaKeepAChangelog($changelogExists, new SystemClock(new DateTimeZone('UTC'))),
Expand All @@ -97,14 +97,14 @@ static function (int $errorCode, string $message = '', string $file = '', int $l
$createRelease = new CreateReleaseThroughApiCall(
$makeRequests,
$httpClient,
$githubToken
$githubToken,
);
$bumpChangelogVersion = new BumpAndCommitChangelogVersionViaKeepAChangelog(
$changelogExists,
$checkoutBranch,
$commit,
$push,
$logger
$logger,
);

$application = new Application(Versions::rootPackageName(), Versions::getVersion('laminas/automatic-releases'));
Expand All @@ -120,7 +120,7 @@ static function (int $errorCode, string $message = '', string $file = '', int $l
$createReleaseText,
new CreateTagViaConsole(),
$push,
$createRelease
$createRelease,
),
new CreateMergeUpPullRequest(
$variables,
Expand All @@ -133,8 +133,8 @@ static function (int $errorCode, string $message = '', string $file = '', int $l
new CreatePullRequestThroughApiCall(
$makeRequests,
$httpClient,
$githubToken
)
$githubToken,
),
),
new SwitchDefaultBranchToNextMinor(
$variables,
Expand All @@ -145,25 +145,25 @@ static function (int $errorCode, string $message = '', string $file = '', int $l
new SetDefaultBranchThroughApiCall(
$makeRequests,
$httpClient,
$githubToken
$githubToken,
),
$bumpChangelogVersion
$bumpChangelogVersion,
),
new BumpChangelogForReleaseBranch(
$variables,
$loadEvent,
$fetch,
$getCandidateBranches,
$bumpChangelogVersion
$bumpChangelogVersion,
),
new CreateMilestones(
$loadEvent,
new CreateMilestoneThroughApiCall(
$makeRequests,
$httpClient,
$githubToken,
$logger
)
$logger,
),
),
]);

Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
"symfony/console": "^5.4.12"
},
"require-dev": {
"doctrine/coding-standard": "^9.0.0",
"doctrine/coding-standard": "^10.0.0",
"php-standard-library/psalm-plugin": "^2.0.2",
"phpunit/phpunit": "^9.5.0",
"phpunit/phpunit": "^9.5.23",
"psalm/plugin-phpunit": "^0.17.0",
"roave/infection-static-analysis-plugin": "^1.7",
"squizlabs/php_codesniffer": "^3.5.8",
"vimeo/psalm": "^4.7.2"
"roave/infection-static-analysis-plugin": "^1.22.0",
"squizlabs/php_codesniffer": "^3.7.1",
"vimeo/psalm": "^4.26.0"
},
"config": {
"sort-packages": true,
Expand Down
Loading

0 comments on commit 3e2b402

Please sign in to comment.