Skip to content

Commit 0b71e4a

Browse files
authored
Merge pull request #1141 from ergebnis/feature/php-cs-fixer
Enhancement: Update `friendsofphp/php-cs-fixer`
2 parents 0a3e42e + bc3db2f commit 0b71e4a

File tree

15 files changed

+33
-16
lines changed

15 files changed

+33
-16
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88

99
For a full diff see [`6.38.0...main`][6.38.0...main].
1010

11+
### Changed
12+
13+
- Updated `friendsofphp/php-cs-fixer` ([#1141]), by [@localheinz]
14+
1115
## [`6.38.0`][6.38.0]
1216

1317
For a full diff see [`6.37.0...6.38.0`][6.37.0...6.38.0].
@@ -1774,6 +1778,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
17741778
[#1109]: https://github.com/ergebnis/php-cs-fixer-config/pull/1109
17751779
[#1139]: https://github.com/ergebnis/php-cs-fixer-config/pull/1139
17761780
[#1140]: https://github.com/ergebnis/php-cs-fixer-config/pull/1140
1781+
[#1141]: https://github.com/ergebnis/php-cs-fixer-config/pull/1141
17771782

17781783
[@dependabot]: https://github.com/apps/dependabot
17791784
[@linuxjuggler]: https://github.com/linuxjuggler

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
2121
"ext-filter": "*",
2222
"erickskrauch/php-cs-fixer-custom-fixers": "~1.3.0",
23-
"friendsofphp/php-cs-fixer": "~3.64.0",
23+
"friendsofphp/php-cs-fixer": "~3.65.0",
2424
"kubawerlos/php-cs-fixer-custom-fixers": "~3.22.0"
2525
},
2626
"require-dev": {

composer.lock

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

src/RuleSet/Php74.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,7 @@ public static function create(): RuleSet
683683
'phpdoc_to_param_type' => false,
684684
'phpdoc_to_property_type' => [
685685
'scalar_types' => true,
686+
'types_map' => [],
686687
'union_types' => false,
687688
],
688689
'phpdoc_to_return_type' => false,

src/RuleSet/Php80.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@ public static function create(): RuleSet
696696
'phpdoc_to_param_type' => false,
697697
'phpdoc_to_property_type' => [
698698
'scalar_types' => true,
699+
'types_map' => [],
699700
'union_types' => true,
700701
],
701702
'phpdoc_to_return_type' => false,

src/RuleSet/Php81.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@ public static function create(): RuleSet
698698
'phpdoc_to_param_type' => false,
699699
'phpdoc_to_property_type' => [
700700
'scalar_types' => true,
701+
'types_map' => [],
701702
'union_types' => true,
702703
],
703704
'phpdoc_to_return_type' => false,

src/RuleSet/Php82.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@ public static function create(): RuleSet
698698
'phpdoc_to_param_type' => false,
699699
'phpdoc_to_property_type' => [
700700
'scalar_types' => true,
701+
'types_map' => [],
701702
'union_types' => true,
702703
],
703704
'phpdoc_to_return_type' => false,

src/RuleSet/Php83.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@ public static function create(): RuleSet
698698
'phpdoc_to_param_type' => false,
699699
'phpdoc_to_property_type' => [
700700
'scalar_types' => true,
701+
'types_map' => [],
701702
'union_types' => true,
702703
],
703704
'phpdoc_to_return_type' => false,

src/RuleSet/Php84.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@ public static function create(): RuleSet
698698
'phpdoc_to_param_type' => false,
699699
'phpdoc_to_property_type' => [
700700
'scalar_types' => true,
701+
'types_map' => [],
701702
'union_types' => true,
702703
],
703704
'phpdoc_to_return_type' => false,

test/Unit/RuleSet/Php74Test.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@ protected function expectedRules(): Rules
706706
'phpdoc_to_param_type' => false,
707707
'phpdoc_to_property_type' => [
708708
'scalar_types' => true,
709+
'types_map' => [],
709710
'union_types' => false,
710711
],
711712
'phpdoc_to_return_type' => false,

0 commit comments

Comments
 (0)