Skip to content

Commit dd087f2

Browse files
authored
Update dev tools (#13)
1 parent 3724cfc commit dd087f2

File tree

5 files changed

+16
-25
lines changed

5 files changed

+16
-25
lines changed

.github/workflows/ci.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ jobs:
1111
- uses: actions/checkout@v3
1212
- uses: shivammathur/setup-php@v2
1313
with:
14-
php-version: '7.4'
14+
php-version: '8.1'
1515
coverage: none
16-
tools: composer:v1
17-
- run: composer global require hirak/prestissimo
1816
- run: composer update --no-progress
1917
- run: composer update --no-progress --working-dir=dev-tools
2018
- run: composer info --direct --working-dir=dev-tools | sort

.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/.php_cs
2-
/.php_cs.cache
1+
/.php-cs-fixer.cache
32
/.phpunit.result.cache
43
/composer.lock
54
/vendor/

.php_cs.dist .php-cs-fixer.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@
1414
->in(__DIR__)
1515
;
1616

17-
if (PHP_VERSION_ID < 70000) {
18-
$finder
19-
->notPath('tests/Test/Constraint/IsIdenticalStringForV7.php')
20-
;
21-
}
22-
23-
return PhpCsFixer\Config::create()
17+
return (new PhpCsFixer\Config)
2418
->setRiskyAllowed(true)
2519
->setRules([
2620
'@PhpCsFixer' => true,

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "php-cs-fixer/phpunit-constraint-isidenticalstring",
3-
"type": "library",
43
"description": "Constraint for testing strings considering not-same line endings.",
54
"license": "MIT",
5+
"type": "library",
66
"authors": [
77
{
88
"name": "Dariusz Rumiński",
@@ -18,10 +18,6 @@
1818
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
1919
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
2020
},
21-
"config": {
22-
"optimize-autoloader": true,
23-
"sort-packages": true
24-
},
2521
"autoload": {
2622
"psr-4": {
2723
"PhpCsFixer\\PhpunitConstraintIsIdenticalString\\": "src/"
@@ -34,5 +30,9 @@
3430
"psr-4": {
3531
"PhpCsFixer\\PhpunitConstraintIsIdenticalString\\Tests\\": "tests/"
3632
}
33+
},
34+
"config": {
35+
"optimize-autoloader": true,
36+
"sort-packages": true
3737
}
3838
}

dev-tools/composer.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"require": {
3-
"php": "^7.3"
4-
},
5-
"conflict": {
6-
"hhvm": "*"
3+
"php": "^8.1"
74
},
85
"require-dev": {
9-
"friendsofphp/php-cs-fixer": "^2.14",
10-
"localheinz/composer-normalize": "^1.1",
11-
"maglnet/composer-require-checker": "^2.0",
6+
"ergebnis/composer-normalize": "*",
7+
"maglnet/composer-require-checker": "^3.8",
128
"mi-schi/phpmd-extension": "^4.3",
13-
"phpmd/phpmd": "^2.6"
9+
"php-cs-fixer/shim": "^3.14.4",
10+
"phpmd/phpmd": "^2.13"
1411
},
1512
"config": {
13+
"allow-plugins": {
14+
"ergebnis/composer-normalize": true
15+
},
1616
"optimize-autoloader": true,
1717
"sort-packages": true
1818
}

0 commit comments

Comments
 (0)