Skip to content

Commit e19fba5

Browse files
committed
Replace php-cs-fixer with Laravel Pint
1 parent 13a84c6 commit e19fba5

25 files changed

+195
-664
lines changed

.github/workflows/php-cs-fixer.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
name: Check & fix styling
1+
name: Fix PHP code style issues
22

3-
on: [push]
3+
on:
4+
push:
5+
paths:
6+
- '**.php'
47

58
jobs:
6-
php-cs-fixer:
9+
php-code-styling:
710
runs-on: ubuntu-latest
811

12+
permissions:
13+
contents: write
14+
915
steps:
1016
- name: Checkout code
11-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1218
with:
1319
ref: ${{ github.head_ref }}
1420

15-
- name: Run PHP CS Fixer
16-
uses: docker://oskarstark/php-cs-fixer-ga
17-
with:
18-
args: --config=.php-cs-fixer.php --allow-risky=yes
21+
- name: Fix PHP code style issues
22+
uses: aglipanci/[email protected]
1923

2024
- name: Commit changes
2125
uses: stefanzweifel/git-auto-commit-action@v4

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
/.vscode
44
/.vagrant
55
.phpunit.result.cache
6-
.php-cs-fixer.cache

.php-cs-fixer.php

Lines changed: 0 additions & 41 deletions
This file was deleted.

app/Actions/AddReleaseNotesToChangelogAction.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
class AddReleaseNotesToChangelogAction
1616
{
1717
public function __construct(
18-
private readonly Markdown $markdown,
19-
private readonly FindUnreleasedHeading $findUnreleasedHeading,
20-
private readonly FindSecondLevelHeadingWithText $findSecondLevelHeadingWithText,
18+
private readonly Markdown $markdown,
19+
private readonly FindUnreleasedHeading $findUnreleasedHeading,
20+
private readonly FindSecondLevelHeadingWithText $findSecondLevelHeadingWithText,
2121
private readonly PlaceReleaseNotesBelowUnreleasedHeadingAction $addNewReleaseNotesWithUnreleasedHeadingToChangelog,
22-
private readonly PlaceReleaseNotesAtTheTopAction $addNewReleaseToChangelog
22+
private readonly PlaceReleaseNotesAtTheTopAction $addNewReleaseToChangelog
2323
) {
2424
}
2525

@@ -60,6 +60,7 @@ public function execute(string $originalChangelog, string $latestVersion, string
6060

6161
/**
6262
* Check if a second-level heading for the latestVersion already exists in the document.
63+
*
6364
* @throws ReleaseAlreadyExistsInChangelogException|Throwable
6465
*/
6566
private function checkIfVersionAlreadyExistsInChangelog(Document $changelog, string $latestVersion): void

app/Actions/PlaceReleaseNotesAtTheTopAction.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
class PlaceReleaseNotesAtTheTopAction
1414
{
1515
public function __construct(
16-
private readonly FindFirstSecondLevelHeading $findFirstSecondLevelHeading,
17-
private readonly CreateNewReleaseHeading $createNewReleaseHeading,
16+
private readonly FindFirstSecondLevelHeading $findFirstSecondLevelHeading,
17+
private readonly CreateNewReleaseHeading $createNewReleaseHeading,
1818
private readonly InsertReleaseNotesInChangelogAction $insertReleaseNotesInChangelogAction
1919
) {
2020
}

app/Actions/PlaceReleaseNotesBelowUnreleasedHeadingAction.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
class PlaceReleaseNotesBelowUnreleasedHeadingAction
1919
{
2020
public function __construct(
21-
private readonly GenerateCompareUrl $generateCompareUrl,
22-
private readonly FindSecondLevelHeadingWithText $findPreviousVersionHeading,
21+
private readonly GenerateCompareUrl $generateCompareUrl,
22+
private readonly FindSecondLevelHeadingWithText $findPreviousVersionHeading,
2323
private readonly CreateNewReleaseHeadingWithCompareUrl $createNewReleaseHeading,
24-
private readonly GitHubActionsOutput $gitHubActionsOutput,
24+
private readonly GitHubActionsOutput $gitHubActionsOutput,
2525
private readonly InsertReleaseNotesInChangelogAction $insertReleaseNotesInChangelogAction
2626
) {
2727
}
@@ -94,7 +94,7 @@ private function getLinkNodeFromHeading(Heading $unreleasedHeading): Link
9494
/** @var Link $linkNode */
9595
$linkNode = $unreleasedHeading->firstChild();
9696

97-
throw_if($linkNode === null, new LogicException("Can not find link node in unreleased heading."));
97+
throw_if($linkNode === null, new LogicException('Can not find link node in unreleased heading.'));
9898

9999
return $linkNode;
100100
}

app/Actions/ShiftHeadingLevelInDocumentAction.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public function execute(Document $document, int $baseHeadingLevel): Document
2020

2121
/**
2222
* @var array<Heading> $headings
23+
*
2324
* @psalm-suppress InvalidArgument
2425
*/
2526
$headings = iterator_to_array($headings);
@@ -44,7 +45,7 @@ public function execute(Document $document, int $baseHeadingLevel): Document
4445
}
4546

4647
/**
47-
* @param array<Heading> $headings
48+
* @param array<Heading> $headings
4849
*/
4950
public function findLowestHeadingLevel(array $headings): int|null
5051
{

app/Commands/UpdateCommand.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public function handle(AddReleaseNotesToChangelogAction $addReleaseNotesToChange
6363

6464
$changelog = $this->getChangelogContent($pathToChangelog);
6565

66-
6766
try {
6867
$updatedChangelog = $addReleaseNotesToChangelog->execute(
6968
originalChangelog: $changelog,
@@ -94,7 +93,7 @@ public function handle(AddReleaseNotesToChangelogAction $addReleaseNotesToChange
9493
}
9594
}
9695

97-
protected function getReleaseNotes(): null | string
96+
protected function getReleaseNotes(): null|string
9897
{
9998
if ($this->option('parse-release-notes')) {
10099
return null;
@@ -103,7 +102,7 @@ protected function getReleaseNotes(): null | string
103102
return $this->option('release-notes') ?: $this->ask('What markdown Release Notes should be added to the CHANGELOG?');
104103
}
105104

106-
protected function getChangelogContent(string $pathToChangelog): bool | string
105+
protected function getChangelogContent(string $pathToChangelog): bool|string
107106
{
108107
return file_get_contents($pathToChangelog);
109108
}

app/Exceptions/ReleaseNotesCanNotBeplacedException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ class ReleaseNotesCanNotBeplacedException extends Exception
1010
{
1111
public function __construct()
1212
{
13-
parent::__construct("Release notes could not be placed. Is the CHANGELOG empty? Does it contain at least one heading?");
13+
parent::__construct('Release notes could not be placed. Is the CHANGELOG empty? Does it contain at least one heading?');
1414
}
1515
}

app/Exceptions/ReleaseNotesNotProvidedException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ class ReleaseNotesNotProvidedException extends Exception
1010
{
1111
public function __construct()
1212
{
13-
parent::__construct("Release Notes were not provided. Pass them through the `--release-notes`-option.");
13+
parent::__construct('Release Notes were not provided. Pass them through the `--release-notes`-option.');
1414
}
1515
}

0 commit comments

Comments
 (0)