Skip to content

Commit 6035756

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # composer.json
2 parents 922e6f6 + c8dc24c commit 6035756

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[![Tests](https://github.com/InteractionDesignFoundation/coding-standard/actions/workflows/test.yml/badge.svg)](https://github.com/InteractionDesignFoundation/coding-standard/actions/workflows/test.yml)
12
[![PHP Psalm](https://github.com/InteractionDesignFoundation/coding-standard/actions/workflows/psalm.yml/badge.svg)](https://github.com/InteractionDesignFoundation/coding-standard/actions/workflows/psalm.yml)
23
[![Type coverage](https://shepherd.dev/github/InteractionDesignFoundation/coding-standard/coverage.svg)](https://shepherd.dev/github/InteractionDesignFoundation/coding-standard)
34

composer.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,10 @@
1010
"squizlabs/php_codesniffer": "^4.0"
1111
},
1212
"require-dev": {
13-
"friendsofphp/php-cs-fixer": "^3.88",
13+
"friendsofphp/php-cs-fixer": "^3.89",
1414
"phpunit/phpunit": "^12.4",
1515
"vimeo/psalm": "^6.13"
1616
},
17-
"repositories": [
18-
{
19-
"type": "vcs",
20-
"url": "https://github.com/alies-dev/slevomat-coding-standard"
21-
}
22-
],
2317
"minimum-stability": "dev",
2418
"prefer-stable": true,
2519
"autoload": {
@@ -42,7 +36,9 @@
4236
"cs": "@cs:fix",
4337
"cs:check": "phpcs -p -s --colors --report-full --report-summary --cache=.cache/phpcs",
4438
"cs:fix": "phpcbf -p --colors --cache=.cache/phpcs",
45-
"psalm": "psalm",
39+
"sa": "@psalm",
40+
"psalm": "psalm --config=psalm.xml",
41+
"psalm:bl": "@psalm --set-baseline=psalm-baseline.xml --long-progress --no-cache",
4642
"test": "phpunit"
4743
}
4844
}

psalm-baseline.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
2+
<files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
3+
<file src="IxDFCodingStandard/Helpers/ClassHelper.php">
4+
<InternalClass>
5+
<code><![CDATA[\SlevomatCodingStandard\Helpers\ClassHelper]]></code>
6+
</InternalClass>
7+
</file>
8+
<file src="IxDFCodingStandard/Helpers/TokenHelper.php">
9+
<InternalClass>
10+
<code><![CDATA[\SlevomatCodingStandard\Helpers\TokenHelper]]></code>
11+
<code><![CDATA[parent::NAME_TOKEN_CODES]]></code>
12+
</InternalClass>
13+
</file>
314
<file src="IxDFCodingStandard/Sniffs/Classes/ForbidDirectClassInheritanceSniff.php">
415
<UndefinedClass>
516
<code><![CDATA[Sniff]]></code>

0 commit comments

Comments
 (0)