From 10e628571dc95dc9364f07a19e82fab0ecf59cd0 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Wed, 5 Nov 2025 21:15:58 +0100 Subject: [PATCH 1/4] chore: update deps --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index d455dd5..7857a4e 100644 --- a/composer.json +++ b/composer.json @@ -11,12 +11,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "symfony/process": "^5.4 || ^6.4 || ^7.2 || ^8.0" + "symfony/process": "^5.4 || ^6.4 || ^7.3 || ^8.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.75", - "maglnet/composer-require-checker": "^3.8 || ^4", - "phpunit/phpunit": "^9.6.22 || ^10.5.45 || ^11.5.12" + "friendsofphp/php-cs-fixer": "^3.89", + "maglnet/composer-require-checker": "^3.8 || ^4.18", + "phpunit/phpunit": "^9.6.22 || ^10.5.58 || ^11.5.43" }, "config": { "optimize-autoloader": true, From 27cae207c39378224081c0b4d73fc19413d00de4 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Wed, 5 Nov 2025 21:16:08 +0100 Subject: [PATCH 2/4] update usage of renamed sets --- .php-cs-fixer.dist.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 55cd144..a9a9375 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -12,9 +12,9 @@ return (new PhpCsFixer\Config()) ->setRiskyAllowed(true) ->setRules(array( - '@PHP71Migration' => true, - '@PHP71Migration:risky' => true, - '@PHPUnit75Migration:risky' => true, + '@PHP7x1Migration' => true, + '@PHP7x1Migration:risky' => true, + '@PHPUnit7x5Migration:risky' => true, '@PhpCsFixer' => true, '@PhpCsFixer:risky' => true, // 'general_phpdoc_annotation_remove' => ['annotations' => ['expectedDeprecation']], // one should use PHPUnit built-in method instead From 6141e790189d675e2dd49fb283797532bdf78e14 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Wed, 5 Nov 2025 21:17:48 +0100 Subject: [PATCH 3/4] update rulesets to auto and re-apply CS --- .php-cs-fixer.dist.php | 5 ++--- src/ScriptExecutor.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index a9a9375..64a0077 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -12,9 +12,8 @@ return (new PhpCsFixer\Config()) ->setRiskyAllowed(true) ->setRules(array( - '@PHP7x1Migration' => true, - '@PHP7x1Migration:risky' => true, - '@PHPUnit7x5Migration:risky' => true, + '@auto' => true, + '@auto:risky' => true, '@PhpCsFixer' => true, '@PhpCsFixer:risky' => true, // 'general_phpdoc_annotation_remove' => ['annotations' => ['expectedDeprecation']], // one should use PHPUnit built-in method instead diff --git a/src/ScriptExecutor.php b/src/ScriptExecutor.php index 8ecdd0f..f1512a0 100644 --- a/src/ScriptExecutor.php +++ b/src/ScriptExecutor.php @@ -103,7 +103,7 @@ public function getResult(bool $checkCode = true): CliResult \sprintf( "Cannot execute `%s`:\n%s\nCode: %s\nExit text: %s\nError output: %s\nDetails:\n%s", $command, - implode("\n", array_map(static function ($line) { return "$ {$line}"; }, $tmpFileLines)), + implode("\n", array_map(static fn ($line) => "$ {$line}", $tmpFileLines)), $this->result->getCode(), isset(Process::$exitCodes[$this->result->getCode()]) ? Process::$exitCodes[$this->result->getCode()] : 'Unknown exit code', $this->result->getError(), From 703e1f8efd87f0f7eeaeb197a2b0c7d4b6e9bce0 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Wed, 5 Nov 2025 21:19:57 +0100 Subject: [PATCH 4/4] re-enable the rule --- .php-cs-fixer.dist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 64a0077..950f87a 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -16,7 +16,7 @@ '@auto:risky' => true, '@PhpCsFixer' => true, '@PhpCsFixer:risky' => true, - // 'general_phpdoc_annotation_remove' => ['annotations' => ['expectedDeprecation']], // one should use PHPUnit built-in method instead + 'general_phpdoc_annotation_remove' => ['annotations' => ['expectedDeprecation']], // one should use PHPUnit built-in method instead 'header_comment' => ['header' => $header], )) ->setFinder(