Skip to content

Commit e258644

Browse files
committed
Fix psalm issues
1 parent 2bbd240 commit e258644

File tree

4 files changed

+34
-13
lines changed

4 files changed

+34
-13
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
"scripts": {
4747
"cs:fix": "php-cs-fixer fix -v",
4848
"test": "phpunit",
49-
"psalm": "psalm"
49+
"psalm": "psalm",
50+
"psalm:baseline": "psalm --set-baseline=psalm-baseline.xml"
5051
},
5152
"config": {
5253
"sort-packages": true

psalm-baseline.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<files psalm-version="6.10.1@f9fd6bc117e9ce1e854c2ed6777e7135aaa4966b">
3+
<file src="src/Attribute/Field.php">
4+
<ClassMustBeFinal>
5+
<code><![CDATA[Field]]></code>
6+
</ClassMustBeFinal>
7+
</file>
8+
<file src="src/Exception/DefinitionException.php">
9+
<ClassMustBeFinal>
10+
<code><![CDATA[DefinitionException]]></code>
11+
</ClassMustBeFinal>
12+
</file>
13+
<file src="src/Exception/GeneratorException.php">
14+
<ClassMustBeFinal>
15+
<code><![CDATA[GeneratorException]]></code>
16+
</ClassMustBeFinal>
17+
</file>
18+
<file src="src/Exception/InvalidTypeException.php">
19+
<ClassMustBeFinal>
20+
<code><![CDATA[InvalidTypeException]]></code>
21+
</ClassMustBeFinal>
22+
</file>
23+
<file src="src/Generator.php">
24+
<ClassMustBeFinal>
25+
<code><![CDATA[Generator]]></code>
26+
</ClassMustBeFinal>
27+
</file>
28+
</files>

psalm.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns="https://getpsalm.org/schema/config"
44
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
55
errorLevel="2"
6+
errorBaseline="psalm-baseline.xml"
67
findUnusedCode="false"
78
findUnusedBaselineEntry="true"
89
>
@@ -13,10 +14,6 @@
1314
</ignoreFiles>
1415
</projectFiles>
1516
<issueHandlers>
16-
<UndefinedAttributeClass>
17-
<errorLevel type="suppress">
18-
<referencedClass name="JetBrains\PhpStorm\ExpectedValues" />
19-
</errorLevel>
20-
</UndefinedAttributeClass>
17+
<MissingOverrideAttribute errorLevel="suppress" />
2118
</issueHandlers>
2219
</psalm>

src/Schema/Reference.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@ public function __construct(
1919

2020
public function jsonSerialize(): string
2121
{
22-
if (!\strrpos($this->className, '\\')) {
23-
return '#/definitions/' . $this->className;
24-
}
22+
$pos = \strrpos($this->className, '\\');
2523

26-
// basename of the class
27-
$basename = \substr($this->className, (int) \strrpos($this->className, '\\') + 1);
28-
29-
return '#/definitions/' . $basename;
24+
return '#/definitions/' . ($pos === false ? $this->className : \substr($this->className, $pos + 1));
3025
}
3126
}

0 commit comments

Comments
 (0)