Skip to content

Added rules for PHP8.4 and bump vendors #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2025
Merged

Added rules for PHP8.4 and bump vendors #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4d2a2e
Added rules for PHP8.4 and bump vendors
bohdanmoshchenko Sep 23, 2025
91faabf
Improve code
bohdanmoshchenko Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

declare(strict_types=1);

use PhpCsFixer\Finder;
use VisualCraft\PhpCsFixerConfig;

$finder = PhpCsFixer\Finder::create()
$finder = Finder::create()
->in(__DIR__ . '/src')
->append([
__DIR__ . '/.php-cs-fixer.dist.php',
Expand Down
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Pick one of the rule sets:
* [`VisualCraft\PhpCsFixerConfig\RuleSet\Php81`](src/RuleSet/Php81.php)
* [`VisualCraft\PhpCsFixerConfig\RuleSet\Php82`](src/RuleSet/Php82.php)
* [`VisualCraft\PhpCsFixerConfig\RuleSet\Php83`](src/RuleSet/Php83.php)
* [`VisualCraft\PhpCsFixerConfig\RuleSet\Php84`](src/RuleSet/Php84.php)

Create a configuration file `.php-cs-fixer.dist.php` in the root of your project:

Expand All @@ -37,7 +38,7 @@ $finder = PhpCsFixer\Finder::create()
])
;

$config = PhpCsFixerConfig\Factory::fromRuleSet(new PhpCsFixerConfig\RuleSet\Php83());
$config = PhpCsFixerConfig\Factory::fromRuleSet(new PhpCsFixerConfig\RuleSet\Php84());
$config
->setFinder($finder)
->setCacheFile(__DIR__ . '/.php-cs-fixer.cache')
Expand Down Expand Up @@ -66,8 +67,8 @@ Optionally override rules from a rule set by passing in an array of rules to be
])
;

-$config = PhpCsFixerConfig\Factory::fromRuleSet(new PhpCsFixerConfig\RuleSet\Php83());
+$config = PhpCsFixerConfig\Factory::fromRuleSet(new PhpCsFixerConfig\RuleSet\Php83(), [
-$config = PhpCsFixerConfig\Factory::fromRuleSet(new PhpCsFixerConfig\RuleSet\Php84());
+$config = PhpCsFixerConfig\Factory::fromRuleSet(new PhpCsFixerConfig\RuleSet\Php84(), [
+ 'strict_comparison' => false,
+]);
$config
Expand Down
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
],
"require": {
"php": "^7.4 || ^8.0",
"friendsofphp/php-cs-fixer": "^3.34",
"kubawerlos/php-cs-fixer-custom-fixers": "^3.16",
"pedrotroller/php-cs-custom-fixer": "^2.28"
"friendsofphp/php-cs-fixer": "^3.87",
"kubawerlos/php-cs-fixer-custom-fixers": "^3.34",
"pedrotroller/php-cs-custom-fixer": "^2.34"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.25",
"vimeo/psalm": "^4.22"
"ergebnis/composer-normalize": "^2.48",
"vimeo/psalm": "^6.13"
},
"minimum-stability": "stable",
"prefer-stable": true,
Expand Down
1 change: 1 addition & 0 deletions psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
<directory name="src"/>
</errorLevel>
</MixedReturnTypeCoercion>
<UnusedClass errorLevel="suppress"/>
</issueHandlers>
</psalm>
2 changes: 1 addition & 1 deletion src/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
final class Factory
{
/**
* @psalm-param array<string, array|bool> $overrideRules
* @psalm-param array<string, array<string, mixed>|bool> $overrideRules
*/
public static function fromRuleSet(RuleSetInterface $ruleSet, array $overrideRules = []): Config
{
Expand Down
64 changes: 41 additions & 23 deletions src/RuleSet/Php74.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,35 @@

namespace VisualCraft\PhpCsFixerConfig\RuleSet;

use PhpCsFixerCustomFixers\Fixer\CommentSurroundedBySpacesFixer;
use PhpCsFixerCustomFixers\Fixer\MultilineCommentOpeningClosingAloneFixer;
use PhpCsFixerCustomFixers\Fixer\NoDoctrineMigrationsGeneratedCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoDuplicatedImportsFixer;
use PhpCsFixerCustomFixers\Fixer\NoImportFromGlobalNamespaceFixer;
use PhpCsFixerCustomFixers\Fixer\NoLeadingSlashInGlobalNamespaceFixer;
use PhpCsFixerCustomFixers\Fixer\NoNullableBooleanTypeFixer;
use PhpCsFixerCustomFixers\Fixer\NoPhpStormGeneratedCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessDoctrineRepositoryCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessParenthesisFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessStrlenFixer;
use PhpCsFixerCustomFixers\Fixer\PhpdocNoSuperfluousParamFixer;
use PhpCsFixerCustomFixers\Fixer\PhpdocTypesTrimFixer;
use PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer;
use PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer;
use PhpCsFixerCustomFixers\Fixers;
use VisualCraft\PhpCsFixerConfig\RuleSetInterface;

final class Php74 implements RuleSetInterface
{
#[\Override]
public function name(): string
{
return 'Visual Craft (PHP 7.4)';
}

#[\Override]
public function rules(): array
{
return [
Expand Down Expand Up @@ -68,39 +88,37 @@ public function rules(): array
'while',
],
],
\PhpCsFixerCustomFixers\Fixer\CommentSurroundedBySpacesFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\MultilineCommentOpeningClosingAloneFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoDoctrineMigrationsGeneratedCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoDuplicatedImportsFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoImportFromGlobalNamespaceFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoLeadingSlashInGlobalNamespaceFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoNullableBooleanTypeFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoPhpStormGeneratedCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessDoctrineRepositoryCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessParenthesisFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessStrlenFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpdocNoSuperfluousParamFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpdocTypesTrimFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer::name() => true,
CommentSurroundedBySpacesFixer::name() => true,
MultilineCommentOpeningClosingAloneFixer::name() => true,
NoDoctrineMigrationsGeneratedCommentFixer::name() => true,
NoDuplicatedImportsFixer::name() => true,
NoImportFromGlobalNamespaceFixer::name() => true,
NoLeadingSlashInGlobalNamespaceFixer::name() => true,
NoNullableBooleanTypeFixer::name() => true,
NoPhpStormGeneratedCommentFixer::name() => true,
NoSuperfluousConcatenationFixer::name() => true,
NoUselessCommentFixer::name() => true,
NoUselessDoctrineRepositoryCommentFixer::name() => true,
NoUselessParenthesisFixer::name() => true,
NoUselessStrlenFixer::name() => true,
PhpdocNoSuperfluousParamFixer::name() => true,
PhpdocTypesTrimFixer::name() => true,
SingleSpaceAfterStatementFixer::name() => true,
SingleSpaceBeforeStatementFixer::name() => true,
'PedroTroller/ordered_with_getter_and_setter_first' => true,
'PedroTroller/line_break_between_method_arguments' => [
'max-args' => false,
'max-length' => 120,
'automatic-argument-merge' => true,
],
'PedroTroller/line_break_between_statements' => true,
'method_chaining_indentation' => false,
];
}

#[\Override]
public function getCustomFixers(): iterable
{
yield from new \PhpCsFixerCustomFixers\Fixers();
yield from new Fixers();
yield from new \PedroTroller\CS\Fixer\Fixers();
}

#[\Override]
public function getRiskyAllowed(): bool
{
return true;
Expand Down
79 changes: 51 additions & 28 deletions src/RuleSet/Php80.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,40 @@

namespace VisualCraft\PhpCsFixerConfig\RuleSet;

use PhpCsFixerCustomFixers\Fixer\CommentSurroundedBySpacesFixer;
use PhpCsFixerCustomFixers\Fixer\MultilineCommentOpeningClosingAloneFixer;
use PhpCsFixerCustomFixers\Fixer\NoDoctrineMigrationsGeneratedCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoDuplicatedImportsFixer;
use PhpCsFixerCustomFixers\Fixer\NoImportFromGlobalNamespaceFixer;
use PhpCsFixerCustomFixers\Fixer\NoLeadingSlashInGlobalNamespaceFixer;
use PhpCsFixerCustomFixers\Fixer\NoNullableBooleanTypeFixer;
use PhpCsFixerCustomFixers\Fixer\NoPhpStormGeneratedCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessDirnameCallFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessDoctrineRepositoryCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessParenthesisFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessStrlenFixer;
use PhpCsFixerCustomFixers\Fixer\PhpdocNoSuperfluousParamFixer;
use PhpCsFixerCustomFixers\Fixer\PhpdocTypesTrimFixer;
use PhpCsFixerCustomFixers\Fixer\PhpUnitAssertArgumentsOrderFixer;
use PhpCsFixerCustomFixers\Fixer\PhpUnitDedicatedAssertFixer;
use PhpCsFixerCustomFixers\Fixer\PhpUnitNoUselessReturnFixer;
use PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer;
use PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer;
use PhpCsFixerCustomFixers\Fixer\StringableInterfaceFixer;
use PhpCsFixerCustomFixers\Fixers;
use VisualCraft\PhpCsFixerConfig\RuleSetInterface;

final class Php80 implements RuleSetInterface
{
#[\Override]
public function name(): string
{
return 'Visual Craft (PHP 8.0)';
}

#[\Override]
public function rules(): array
{
return [
Expand Down Expand Up @@ -68,44 +93,42 @@ public function rules(): array
'while',
],
],
\PhpCsFixerCustomFixers\Fixer\CommentSurroundedBySpacesFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\MultilineCommentOpeningClosingAloneFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoDoctrineMigrationsGeneratedCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoDuplicatedImportsFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoImportFromGlobalNamespaceFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoLeadingSlashInGlobalNamespaceFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoNullableBooleanTypeFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoPhpStormGeneratedCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessDirnameCallFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessDoctrineRepositoryCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessParenthesisFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessStrlenFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpUnitAssertArgumentsOrderFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpUnitDedicatedAssertFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpUnitNoUselessReturnFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpdocNoSuperfluousParamFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpdocTypesTrimFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\StringableInterfaceFixer::name() => true,
CommentSurroundedBySpacesFixer::name() => true,
MultilineCommentOpeningClosingAloneFixer::name() => true,
NoDoctrineMigrationsGeneratedCommentFixer::name() => true,
NoDuplicatedImportsFixer::name() => true,
NoImportFromGlobalNamespaceFixer::name() => true,
NoLeadingSlashInGlobalNamespaceFixer::name() => true,
NoNullableBooleanTypeFixer::name() => true,
NoPhpStormGeneratedCommentFixer::name() => true,
NoSuperfluousConcatenationFixer::name() => true,
NoUselessCommentFixer::name() => true,
NoUselessDirnameCallFixer::name() => true,
NoUselessDoctrineRepositoryCommentFixer::name() => true,
NoUselessParenthesisFixer::name() => true,
NoUselessStrlenFixer::name() => true,
PhpUnitAssertArgumentsOrderFixer::name() => true,
PhpUnitDedicatedAssertFixer::name() => true,
PhpUnitNoUselessReturnFixer::name() => true,
PhpdocNoSuperfluousParamFixer::name() => true,
PhpdocTypesTrimFixer::name() => true,
SingleSpaceAfterStatementFixer::name() => true,
SingleSpaceBeforeStatementFixer::name() => true,
StringableInterfaceFixer::name() => true,
'PedroTroller/ordered_with_getter_and_setter_first' => true,
'PedroTroller/line_break_between_method_arguments' => [
'max-args' => false,
'max-length' => 120,
'automatic-argument-merge' => true,
],
'PedroTroller/line_break_between_statements' => true,
'method_chaining_indentation' => false,
];
}

#[\Override]
public function getCustomFixers(): iterable
{
yield from new \PhpCsFixerCustomFixers\Fixers();
yield from new Fixers();
yield from new \PedroTroller\CS\Fixer\Fixers();
}

#[\Override]
public function getRiskyAllowed(): bool
{
return true;
Expand Down
79 changes: 51 additions & 28 deletions src/RuleSet/Php81.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,40 @@

namespace VisualCraft\PhpCsFixerConfig\RuleSet;

use PhpCsFixerCustomFixers\Fixer\CommentSurroundedBySpacesFixer;
use PhpCsFixerCustomFixers\Fixer\MultilineCommentOpeningClosingAloneFixer;
use PhpCsFixerCustomFixers\Fixer\NoDoctrineMigrationsGeneratedCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoDuplicatedImportsFixer;
use PhpCsFixerCustomFixers\Fixer\NoImportFromGlobalNamespaceFixer;
use PhpCsFixerCustomFixers\Fixer\NoLeadingSlashInGlobalNamespaceFixer;
use PhpCsFixerCustomFixers\Fixer\NoNullableBooleanTypeFixer;
use PhpCsFixerCustomFixers\Fixer\NoPhpStormGeneratedCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessDirnameCallFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessDoctrineRepositoryCommentFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessParenthesisFixer;
use PhpCsFixerCustomFixers\Fixer\NoUselessStrlenFixer;
use PhpCsFixerCustomFixers\Fixer\PhpdocNoSuperfluousParamFixer;
use PhpCsFixerCustomFixers\Fixer\PhpdocTypesTrimFixer;
use PhpCsFixerCustomFixers\Fixer\PhpUnitAssertArgumentsOrderFixer;
use PhpCsFixerCustomFixers\Fixer\PhpUnitDedicatedAssertFixer;
use PhpCsFixerCustomFixers\Fixer\PhpUnitNoUselessReturnFixer;
use PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer;
use PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer;
use PhpCsFixerCustomFixers\Fixer\StringableInterfaceFixer;
use PhpCsFixerCustomFixers\Fixers;
use VisualCraft\PhpCsFixerConfig\RuleSetInterface;

final class Php81 implements RuleSetInterface
{
#[\Override]
public function name(): string
{
return 'Visual Craft (PHP 8.1)';
}

#[\Override]
public function rules(): array
{
return [
Expand Down Expand Up @@ -68,44 +93,42 @@ public function rules(): array
'while',
],
],
\PhpCsFixerCustomFixers\Fixer\CommentSurroundedBySpacesFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\MultilineCommentOpeningClosingAloneFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoDoctrineMigrationsGeneratedCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoDuplicatedImportsFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoImportFromGlobalNamespaceFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoLeadingSlashInGlobalNamespaceFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoNullableBooleanTypeFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoPhpStormGeneratedCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessDirnameCallFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessDoctrineRepositoryCommentFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessParenthesisFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\NoUselessStrlenFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpUnitAssertArgumentsOrderFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpUnitDedicatedAssertFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpUnitNoUselessReturnFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpdocNoSuperfluousParamFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\PhpdocTypesTrimFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer::name() => true,
\PhpCsFixerCustomFixers\Fixer\StringableInterfaceFixer::name() => true,
CommentSurroundedBySpacesFixer::name() => true,
MultilineCommentOpeningClosingAloneFixer::name() => true,
NoDoctrineMigrationsGeneratedCommentFixer::name() => true,
NoDuplicatedImportsFixer::name() => true,
NoImportFromGlobalNamespaceFixer::name() => true,
NoLeadingSlashInGlobalNamespaceFixer::name() => true,
NoNullableBooleanTypeFixer::name() => true,
NoPhpStormGeneratedCommentFixer::name() => true,
NoSuperfluousConcatenationFixer::name() => true,
NoUselessCommentFixer::name() => true,
NoUselessDirnameCallFixer::name() => true,
NoUselessDoctrineRepositoryCommentFixer::name() => true,
NoUselessParenthesisFixer::name() => true,
NoUselessStrlenFixer::name() => true,
PhpUnitAssertArgumentsOrderFixer::name() => true,
PhpUnitDedicatedAssertFixer::name() => true,
PhpUnitNoUselessReturnFixer::name() => true,
PhpdocNoSuperfluousParamFixer::name() => true,
PhpdocTypesTrimFixer::name() => true,
SingleSpaceAfterStatementFixer::name() => true,
SingleSpaceBeforeStatementFixer::name() => true,
StringableInterfaceFixer::name() => true,
'PedroTroller/ordered_with_getter_and_setter_first' => true,
'PedroTroller/line_break_between_method_arguments' => [
'max-args' => false,
'max-length' => 120,
'automatic-argument-merge' => true,
],
'PedroTroller/line_break_between_statements' => true,
'method_chaining_indentation' => false,
];
}

#[\Override]
public function getCustomFixers(): iterable
{
yield from new \PhpCsFixerCustomFixers\Fixers();
yield from new Fixers();
yield from new \PedroTroller\CS\Fixer\Fixers();
}

#[\Override]
public function getRiskyAllowed(): bool
{
return true;
Expand Down
Loading