Skip to content

Commit 4afce04

Browse files
Update to Psalm 4
1 parent fb188a2 commit 4afce04

File tree

6 files changed

+27
-57
lines changed

6 files changed

+27
-57
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: "php7.3 ./tools/composer update --no-ansi --no-interaction --no-progress"
3333

3434
- name: "Run vimeo/psalm"
35-
run: "php7.3 ./tools/psalm --config=psalm.xml --no-progress --shepherd --show-info=false --stats"
35+
run: "php7.3 ./tools/psalm --config=.psalm/config.xml --no-progress --shepherd --show-info=false --stats"
3636

3737
backward-compatibility:
3838
name: Backward Compatibility

.phive/phars.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
33
<phar name="php-cs-fixer" version="^2.16" installed="2.16.4" location="./tools/php-cs-fixer" copy="true"/>
4-
<phar name="psalm" version="^3.8" installed="3.18.2" location="./tools/psalm" copy="true"/>
4+
<phar name="psalm" version="^4.0" installed="4.0.1" location="./tools/psalm" copy="true"/>
55
<phar name="roave/backwardcompatibilitycheck" version="^5.0.0" installed="5.0.0" location="./tools/roave-backward-compatibility-check" copy="true"/>
66
</phive>

.psalm/baseline.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<files psalm-version="4.0.1@b1e2e30026936ef8d5bf6a354d1c3959b6231f44">
3+
<file src="src/Enumerator.php">
4+
<DocblockTypeContradiction occurrences="2">
5+
<code>!is_array($variable) &amp;&amp; !is_object($variable)</code>
6+
<code>is_object($variable)</code>
7+
</DocblockTypeContradiction>
8+
</file>
9+
</files>

.psalm/config.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<psalm
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns="https://getpsalm.org/schema/config"
5+
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
6+
resolveFromConfigFile="false"
7+
totallyTyped="false"
8+
errorBaseline=".psalm/baseline.xml"
9+
>
10+
<projectFiles>
11+
<directory name="src" />
12+
<ignoreFiles>
13+
<directory name="vendor" />
14+
</ignoreFiles>
15+
</projectFiles>
16+
</psalm>

psalm.xml

Lines changed: 0 additions & 55 deletions
This file was deleted.

tools/psalm

64.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)