Skip to content

Commit c0d8c3a

Browse files
authored
Update dev tools (#17)
1 parent f2974a5 commit c0d8c3a

File tree

5 files changed

+17
-25
lines changed

5 files changed

+17
-25
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ 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
2119
- run: composer validate --strict
2220
- run: composer normalize --working-dir=dev-tools ../composer.json --dry-run
21+
- run: dev-tools/vendor/bin/composer-require-checker check composer.json --config-file=.composer-require-checker.json
2322
- run: dev-tools/vendor/bin/phpmd src,tests text dev-tools/phpmd.xml
2423
- run: dev-tools/vendor/bin/php-cs-fixer fix --diff --dry-run -v
2524

.gitignore

Lines changed: 1 addition & 2 deletions
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 renamed to .php-cs-fixer.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@
1515
->in(__DIR__)
1616
;
1717

18-
if (PHP_VERSION_ID < 70000) {
19-
$finder
20-
->notPath('tests/Test/Constraint/XmlMatchesXsdForV7.php')
21-
;
22-
}
23-
24-
return PhpCsFixer\Config::create()
18+
return (new PhpCsFixer\Config())
2519
->setRiskyAllowed(true)
2620
->setRules([
2721
'@PhpCsFixer' => true,
2822
'@PhpCsFixer:risky' => true,
29-
'@PHP56Migration:risky' => true,
3023
'@PHPUnit60Migration:risky' => true,
3124
'header_comment' => ['header' => $header],
3225
])

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "php-cs-fixer/phpunit-constraint-xmlmatchesxsd",
3-
"type": "library",
43
"description": "Constraint for testing XML against XSD.",
54
"license": "MIT",
5+
"type": "library",
66
"authors": [
77
{
88
"name": "SpacePossum"
@@ -23,10 +23,6 @@
2323
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
2424
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
2525
},
26-
"config": {
27-
"optimize-autoloader": true,
28-
"sort-packages": true
29-
},
3026
"autoload": {
3127
"psr-4": {
3228
"PhpCsFixer\\PhpunitConstraintXmlMatchesXsd\\": "src/"
@@ -39,5 +35,9 @@
3935
"psr-4": {
4036
"PhpCsFixer\\PhpunitConstraintXmlMatchesXsd\\Tests\\": "tests/"
4137
}
38+
},
39+
"config": {
40+
"optimize-autoloader": true,
41+
"sort-packages": true
4242
}
4343
}

dev-tools/composer.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
{
22
"require": {
3-
"php": "^7.3 || ^8.0"
4-
},
5-
"conflict": {
6-
"hhvm": "*"
3+
"php": "^8.1"
74
},
85
"require-dev": {
9-
"friendsofphp/php-cs-fixer": "^2.15",
10-
"ergebnis/composer-normalize": "^2.5.1",
6+
"ergebnis/composer-normalize": "*",
7+
"maglnet/composer-require-checker": "^3.8",
118
"mi-schi/phpmd-extension": "^4.3",
12-
"phpmd/phpmd": "^2.6"
9+
"php-cs-fixer/shim": "^3.14.4",
10+
"phpmd/phpmd": "^2.13"
1311
},
1412
"config": {
13+
"allow-plugins": {
14+
"ergebnis/composer-normalize": true
15+
},
1516
"optimize-autoloader": true,
1617
"sort-packages": true
1718
}

0 commit comments

Comments
 (0)