Skip to content

Commit b5e374e

Browse files
authored
chore: bump dev tools and re-apply CS (#33)
1 parent ea22aa0 commit b5e374e

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

.php-cs-fixer.dist.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
57
*
@@ -13,13 +15,13 @@
1315
use PhpCsFixer\Finder;
1416

1517
$header = <<<'EOF'
16-
This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
18+
This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
1719
18-
(c) Dariusz Rumiński <dariusz.ruminski@gmail.com>
20+
(c) Dariusz Rumiński <dariusz.ruminski@gmail.com>
1921
20-
This source file is subject to the MIT license that is bundled
21-
with this source code in the file LICENSE.
22-
EOF;
22+
This source file is subject to the MIT license that is bundled
23+
with this source code in the file LICENSE.
24+
EOF;
2325

2426
$finder = Finder::create()
2527
->exclude('tests/Fixtures')
@@ -30,9 +32,10 @@
3032
return (new Config())
3133
->setRiskyAllowed(true)
3234
->setRules([
35+
'@auto' => true,
36+
'@auto:risky' => true,
3337
'@PhpCsFixer' => true,
3438
'@PhpCsFixer:risky' => true,
35-
'@PHPUnit60Migration:risky' => true,
3639
'header_comment' => ['header' => $header],
3740
])
3841
->setFinder($finder)

dev-tools/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"require": {
3-
"php": "^8.1"
3+
"php": "^8.5"
44
},
55
"require-dev": {
6-
"ergebnis/composer-normalize": "*",
7-
"maglnet/composer-require-checker": "^3.8",
6+
"ergebnis/composer-normalize": "^2.50",
7+
"maglnet/composer-require-checker": "^4.21",
88
"mi-schi/phpmd-extension": "^4.3",
9-
"php-cs-fixer/shim": "^3.68.5",
9+
"php-cs-fixer/shim": "^3.94.2",
1010
"phpmd/phpmd": "^2.15"
1111
},
1212
"config": {

src/Constraint/IsIdenticalString.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
57
*
@@ -11,6 +13,4 @@
1113

1214
namespace PhpCsFixer\PhpunitConstraintIsIdenticalString\Constraint;
1315

14-
use PHPUnit\Runner\Version;
15-
1616
class_alias(IsIdenticalStringForV9::class, IsIdenticalString::class);

src/Constraint/IsIdenticalStringForV9.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
57
*

tests/Constraint/IsIdenticalStringTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of PHP CS Fixer / PHPUnit Constraint IsIdenticalString.
57
*
@@ -21,7 +23,7 @@
2123
*/
2224
final class IsIdenticalStringTest extends TestCase
2325
{
24-
public function testSameStringsConstraintFail()
26+
public function testSameStringsConstraintFail(): void
2527
{
2628
$this->expectException(
2729
'PHPUnit\Framework\ExpectationFailedException'
@@ -31,7 +33,7 @@ public function testSameStringsConstraintFail()
3133
'#^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$#'
3234
);
3335
} else {
34-
$this->expectExceptionMessageRegExp(
36+
$this->expectExceptionMessageMatches(
3537
'#^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$#'
3638
);
3739
}

0 commit comments

Comments
 (0)