Skip to content

Commit bfa46ff

Browse files
chore(deps): update dependency friendsofphp/php-cs-fixer to v3.75.0
1 parent 7e95853 commit bfa46ff

40 files changed

+277
-121
lines changed

composer.lock

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

vendor/composer/InstalledVersions.php

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
*/
2727
class InstalledVersions
2828
{
29+
/**
30+
* @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
31+
* @internal
32+
*/
33+
private static $selfDir = null;
34+
2935
/**
3036
* @var mixed[]|null
3137
* @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
@@ -322,6 +328,18 @@ public static function reload($data)
322328
self::$installedIsLocalDir = false;
323329
}
324330

331+
/**
332+
* @return string
333+
*/
334+
private static function getSelfDir()
335+
{
336+
if (self::$selfDir === null) {
337+
self::$selfDir = strtr(__DIR__, '\\', '/');
338+
}
339+
340+
return self::$selfDir;
341+
}
342+
325343
/**
326344
* @return array[]
327345
* @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
@@ -336,7 +354,7 @@ private static function getInstalled()
336354
$copiedLocalDir = false;
337355

338356
if (self::$canGetVendors) {
339-
$selfDir = strtr(__DIR__, '\\', '/');
357+
$selfDir = self::getSelfDir();
340358
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
341359
$vendorDir = strtr($vendorDir, '\\', '/');
342360
if (isset(self::$installedByVendor[$vendorDir])) {

vendor/composer/installed.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,24 +1255,25 @@
12551255
},
12561256
{
12571257
"name": "friendsofphp/php-cs-fixer",
1258-
"version": "v3.72.0",
1259-
"version_normalized": "3.72.0.0",
1258+
"version": "v3.75.0",
1259+
"version_normalized": "3.75.0.0",
12601260
"source": {
12611261
"type": "git",
12621262
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
1263-
"reference": "900389362c43d116fee1ffc51f7878145fa61b57"
1263+
"reference": "399a128ff2fdaf4281e4e79b755693286cdf325c"
12641264
},
12651265
"dist": {
12661266
"type": "zip",
1267-
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/900389362c43d116fee1ffc51f7878145fa61b57",
1268-
"reference": "900389362c43d116fee1ffc51f7878145fa61b57",
1267+
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/399a128ff2fdaf4281e4e79b755693286cdf325c",
1268+
"reference": "399a128ff2fdaf4281e4e79b755693286cdf325c",
12691269
"shasum": ""
12701270
},
12711271
"require": {
12721272
"clue/ndjson-react": "^1.0",
12731273
"composer/semver": "^3.4",
12741274
"composer/xdebug-handler": "^3.0.3",
12751275
"ext-filter": "*",
1276+
"ext-hash": "*",
12761277
"ext-json": "*",
12771278
"ext-tokenizer": "*",
12781279
"fidry/cpu-core-counter": "^1.2",
@@ -1312,7 +1313,7 @@
13121313
"ext-dom": "For handling output formats in XML",
13131314
"ext-mbstring": "For handling non-UTF8 characters."
13141315
},
1315-
"time": "2025-03-13T11:25:37+00:00",
1316+
"time": "2025-03-31T18:40:42+00:00",
13161317
"bin": [
13171318
"php-cs-fixer"
13181319
],
@@ -1349,7 +1350,7 @@
13491350
],
13501351
"support": {
13511352
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
1352-
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.72.0"
1353+
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.75.0"
13531354
},
13541355
"funding": [
13551356
{

vendor/composer/installed.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php return array(
22
'root' => array(
33
'name' => 'amphibee/akeneo-connector',
4-
'pretty_version' => '1.21',
5-
'version' => '1.21.0.0',
4+
'pretty_version' => '1.22.2',
5+
'version' => '1.22.2.0',
66
'reference' => null,
77
'type' => 'wordpress-plugin',
88
'install_path' => __DIR__ . '/../../',
@@ -29,8 +29,8 @@
2929
'dev_requirement' => false,
3030
),
3131
'amphibee/akeneo-connector' => array(
32-
'pretty_version' => '1.21',
33-
'version' => '1.21.0.0',
32+
'pretty_version' => '1.22.2',
33+
'version' => '1.22.2.0',
3434
'reference' => null,
3535
'type' => 'wordpress-plugin',
3636
'install_path' => __DIR__ . '/../../',
@@ -183,9 +183,9 @@
183183
'dev_requirement' => true,
184184
),
185185
'friendsofphp/php-cs-fixer' => array(
186-
'pretty_version' => 'v3.72.0',
187-
'version' => '3.72.0.0',
188-
'reference' => '900389362c43d116fee1ffc51f7878145fa61b57',
186+
'pretty_version' => 'v3.75.0',
187+
'version' => '3.75.0.0',
188+
'reference' => '399a128ff2fdaf4281e4e79b755693286cdf325c',
189189
'type' => 'application',
190190
'install_path' => __DIR__ . '/../friendsofphp/php-cs-fixer',
191191
'aliases' => array(),

vendor/friendsofphp/php-cs-fixer/CHANGELOG.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,59 @@ CHANGELOG for PHP CS Fixer
33

44
This file contains changelogs for stable releases only.
55

6+
Changelog for v3.75.0
7+
---------------------
8+
9+
* feat: `ClassAttributesSeparationFixer` - add support for asymmetric visibility (#8518)
10+
* fix: `NativeFunctionInvocationFixer` - fix for property hooks (#8540)
11+
* chore: add return types for data providers for fixers (#8542)
12+
* chore: add return types for data providers for non-fixers (#8543)
13+
* chore: add return types for remaining data providers (#8544)
14+
* chore: make data providers key type `int` if all the keys are strings (#8550)
15+
* chore: make data providers key type `string` if all the keys are strings (#8545)
16+
* chore: SwitchContinueToBreakFixerTest - improve test case descriptions/typehint (#8546)
17+
* chore: `FunctionsAnalyzerTest` cleanup (#8539)
18+
* deps: bump the phpstan group in /dev-tools with 2 updates (#8537)
19+
* test: ProjectCodeTest::testDataProvidersDeclaredReturnType - allow for int as iterable keys (#8548)
20+
21+
Changelog for v3.74.0
22+
---------------------
23+
24+
* feat: add `--format=@auto` (#8513)
25+
* fix: `BracesPositionFixer` - do not create two consecutive whitespace tokens (#8496)
26+
* fix: `MbStrFunctionsFixer` - fix imports with leading backslash (#8507)
27+
* fix: `NoUnreachableDefaultArgumentValueFixer` - do not crash on property hook (#8512)
28+
* fix: `OrderedImportsFixer` - do not take the braces part in grouped imports into account (#8459)
29+
* fix: `OrderedImportsFixer` - fix syntax error with grouped use statement and multiple use with comma (#8483)
30+
* fix: `PhpUnitAttributesFixer` - handle parentheses after data provider method name (#8510)
31+
* fix: `PhpUnitMethodCasingFixer` - do not touch anonymous class (#8463)
32+
* chore: make options that have default and allowed sets the same size the same array (#8529)
33+
* chore: update return type of `FixerOptionInterface::getAllowedValues` (#8530)
34+
* chore: `Preg` - improve types (#8527)
35+
* CI: fix code coverage job (#8520)
36+
* CI: try MacOS job without ParaUnit (#8528)
37+
* deps: update PHPStan (#8531)
38+
* deps: upgrade `PHPStan/*` (#8524)
39+
40+
Changelog for v3.73.1
41+
---------------------
42+
43+
* fix: `OrderedClassElementsFixer` - do not crash on property hook (#8517)
44+
45+
Changelog for v3.73.0
46+
---------------------
47+
48+
* feat: add support for asymmetric visibility to Doctrine's fixers (#8415)
49+
* fix: `GeneralPhpdocTagRenameFixer` - do not rename keys in array shape definition (#8477)
50+
* fix: `MethodArgumentSpaceFixer` - handle when nested in HTML (#8503)
51+
* chore: update `checkbashisms` to 2.25.5 (#8519)
52+
* DX: cleanup `NoExtraBlankLinesFixerTest` (#8505)
53+
* DX: for duplicated test methods check methods without parameters (#8508)
54+
* DX: remove more duplicated test methods (#8506)
55+
* refactor: `Tokenizer` hash metode using `xxHash` (#8491)
56+
* refactor: `TokensAnalyzerTest` - better test `isArray` and `isArrayMultiLine` (#8504)
57+
* test: run code coverage on PHP 8.4 (#8448)
58+
659
Changelog for v3.72.0
760
---------------------
861

vendor/friendsofphp/php-cs-fixer/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"require": {
2323
"php": "^7.4 || ^8.0",
2424
"ext-filter": "*",
25+
"ext-hash": "*",
2526
"ext-json": "*",
2627
"ext-tokenizer": "*",
2728
"clue/ndjson-react": "^1.0",

vendor/friendsofphp/php-cs-fixer/src/AbstractDoctrineAnnotationFixer.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,12 @@ private function nextElementAcceptsDoctrineAnnotations(Tokens $tokens, int $inde
222222
$modifierKinds[] = T_READONLY;
223223
}
224224

225+
if (\defined('T_PRIVATE_SET')) { // @TODO: drop condition when PHP 8.4+ is required
226+
$modifierKinds[] = T_PRIVATE_SET;
227+
$modifierKinds[] = T_PROTECTED_SET;
228+
$modifierKinds[] = T_PUBLIC_SET;
229+
}
230+
225231
while ($tokens[$index]->isGivenKind($modifierKinds)) {
226232
$index = $tokens->getNextMeaningfulToken($index);
227233
}

vendor/friendsofphp/php-cs-fixer/src/Config.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Config implements ConfigInterface, ParallelAwareConfigInterface
4040
*/
4141
private ?iterable $finder = null;
4242

43-
private string $format = 'txt';
43+
private string $format;
4444

4545
private bool $hideProgress = false;
4646

@@ -77,9 +77,11 @@ public function __construct(string $name = 'default')
7777
if (Utils::isFutureModeEnabled()) {
7878
$this->name = $name.' (future mode)';
7979
$this->rules = ['@PER-CS' => true];
80+
$this->format = '@auto';
8081
} else {
8182
$this->name = $name;
8283
$this->rules = ['@PSR12' => true];
84+
$this->format = 'txt';
8385
}
8486

8587
// @TODO 4.0 cleanup

vendor/friendsofphp/php-cs-fixer/src/Console/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
final class Application extends BaseApplication
4545
{
4646
public const NAME = 'PHP CS Fixer';
47-
public const VERSION = '3.72.0';
47+
public const VERSION = '3.75.0';
4848
public const VERSION_CODENAME = 'Persian Successor';
4949

5050
/**

vendor/friendsofphp/php-cs-fixer/src/Console/Command/FixCommand.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,11 @@ public function getHelp(): string
100100
101101
<info>$ php %command.full_name% --path-mode=intersection /path/to/dir</info>
102102
103-
The <comment>--format</comment> option for the output format. Supported formats are `txt` (default one), `json`, `xml`, `checkstyle`, `junit` and `gitlab`.
103+
The <comment>--format</comment> option for the output format. Supported formats are `@auto` (default one on v4+), `txt` (default one on v3), `json`, `xml`, `checkstyle`, `junit` and `gitlab`.
104+
105+
* `@auto` aims to auto-select best reporter for given CI or local execution (resolution into best format is outside of BC promise and is future-ready)
106+
* `gitlab` for GitLab
107+
* `@auto,{format}` takes `@auto` under CI, and {format} otherwise
104108
105109
NOTE: the output for the following formats are generated in accordance with schemas
106110

0 commit comments

Comments
 (0)