Skip to content

chore: bump dev tools and re-apply CS #33

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
keradus merged 3 commits into from
Feb 26, 2026
Merged

chore: bump dev tools and re-apply CS #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
129a03f
bump dev tools and re-apply CS
keradus Feb 26, 2026
856b12e
bump maglnet/
keradus Feb 26, 2026
80724d7
Merge branch 'master' into fix3
keradus Feb 26, 2026
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
15 changes: 9 additions & 6 deletions .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/*
* This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
*
Expand All @@ -13,13 +15,13 @@
use PhpCsFixer\Finder;

$header = <<<'EOF'
This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.

(c) Dariusz Rumiński <dariusz.ruminski@gmail.com>
(c) Dariusz Rumiński <dariusz.ruminski@gmail.com>

This source file is subject to the MIT license that is bundled
with this source code in the file LICENSE.
EOF;
This source file is subject to the MIT license that is bundled
with this source code in the file LICENSE.
EOF;

$finder = Finder::create()
->exclude('tests/Fixtures')
Expand All @@ -30,9 +32,10 @@
return (new Config())
->setRiskyAllowed(true)
->setRules([
'@auto' => true,
'@auto:risky' => true,
'@PhpCsFixer' => true,
'@PhpCsFixer:risky' => true,
'@PHPUnit60Migration:risky' => true,
'header_comment' => ['header' => $header],
])
->setFinder($finder)
Expand Down
8 changes: 4 additions & 4 deletions dev-tools/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"require": {
"php": "^8.1"
"php": "^8.5"
},
"require-dev": {
"ergebnis/composer-normalize": "*",
"maglnet/composer-require-checker": "^3.8",
"ergebnis/composer-normalize": "^2.50",
"maglnet/composer-require-checker": "^4.21",
"mi-schi/phpmd-extension": "^4.3",
"php-cs-fixer/shim": "^3.68.5",
"php-cs-fixer/shim": "^3.94.2",
"phpmd/phpmd": "^2.15"
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/Constraint/IsIdenticalString.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/*
* This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
*
Expand All @@ -11,6 +13,4 @@

namespace PhpCsFixer\PhpunitConstraintIsIdenticalString\Constraint;

use PHPUnit\Runner\Version;

class_alias(IsIdenticalStringForV9::class, IsIdenticalString::class);
2 changes: 2 additions & 0 deletions src/Constraint/IsIdenticalStringForV9.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/*
* This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
*
Expand Down
6 changes: 4 additions & 2 deletions tests/Constraint/IsIdenticalStringTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/*
* This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
*
Expand All @@ -21,7 +23,7 @@
*/
final class IsIdenticalStringTest extends TestCase
{
public function testSameStringsConstraintFail()
public function testSameStringsConstraintFail(): void
{
$this->expectException(
'PHPUnit\Framework\ExpectationFailedException'
Expand All @@ -31,7 +33,7 @@ public function testSameStringsConstraintFail()
'#^Failed asserting that two strings are identical\.[\n] \#Warning\: Strings contain different line endings\! Debug using remapping \["\\\r" => "R", "\\\n" => "N", "\\\t" => "T"\]\:\n \-N\n \+RN$#'
);
} else {
$this->expectExceptionMessageRegExp(
$this->expectExceptionMessageMatches(
'#^Failed asserting that two strings are identical\.[\n] \#Warning\: Strings contain different line endings\! Debug using remapping \["\\\r" => "R", "\\\n" => "N", "\\\t" => "T"\]\:\n \-N\n \+RN$#'
);
}
Expand Down