Skip to content

Commit e0abe83

Browse files
authored
Drop Psalm (#129)
As per our decision during the Hackathon
1 parent 1204767 commit e0abe83

File tree

6 files changed

+12
-90
lines changed

6 files changed

+12
-90
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@
1111
/phpcs.xml.dist export-ignore
1212
/phpstan.neon.dist export-ignore
1313
/phpunit.xml.dist export-ignore
14-
/psalm.xml export-ignore

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010
- composer.*
1111
- src/**
1212
- phpstan*
13-
- psalm*
1413
- tests/**
1514
push:
1615
branches:
@@ -20,10 +19,9 @@ on:
2019
- composer.*
2120
- src/**
2221
- phpstan*
23-
- psalm*
2422
- tests/**
2523

2624
jobs:
2725
static-analysis:
2826
name: "Static Analysis"
29-
uses: "doctrine/.github/.github/workflows/static-analysis[email protected]"
27+
uses: "doctrine/.github/.github/workflows/phpstan[email protected]"

composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
"require-dev": {
3232
"doctrine/coding-standard": "^12",
3333
"phpstan/phpstan": "^1.10",
34-
"phpunit/phpunit": "^10.5",
35-
"psalm/plugin-phpunit": "^0.18.3",
36-
"vimeo/psalm": "^5.21"
34+
"phpunit/phpunit": "^10.5"
3735
},
3836
"autoload": {
3937
"psr-4": {

psalm.xml

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

src/AbstractLexer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public function getInputUntilPosition(int $position)
138138
*
139139
* @return bool
140140
*
141-
* @psalm-assert-if-true !=null $this->lookahead
141+
* @phpstan-assert-if-true !=null $this->lookahead
142142
*/
143143
public function isNextToken(int|string|UnitEnum $type)
144144
{
@@ -152,7 +152,7 @@ public function isNextToken(int|string|UnitEnum $type)
152152
*
153153
* @return bool
154154
*
155-
* @psalm-assert-if-true !=null $this->lookahead
155+
* @phpstan-assert-if-true !=null $this->lookahead
156156
*/
157157
public function isNextTokenAny(array $types)
158158
{
@@ -164,7 +164,7 @@ public function isNextTokenAny(array $types)
164164
*
165165
* @return bool
166166
*
167-
* @psalm-assert-if-true !null $this->lookahead
167+
* @phpstan-assert-if-true !null $this->lookahead
168168
*/
169169
public function moveNext()
170170
{

tests/AbstractLexerTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function tearDown(): void
2929
setlocale(LC_ALL, null);
3030
}
3131

32-
/** @psalm-return list<array{string, list<Token<string, string|int>>}> */
32+
/** @phpstan-return list<array{string, list<Token<string, string|int>>}> */
3333
public static function dataProvider(): array
3434
{
3535
return [
@@ -83,7 +83,7 @@ public function testResetPosition(): void
8383
$this->assertEquals($expectedTokens[0], $this->concreteLexer->lookahead);
8484
}
8585

86-
/** @psalm-param list<Token<string, string|int>> $expectedTokens */
86+
/** @phpstan-param list<Token<string, string|int>> $expectedTokens */
8787
#[DataProvider('dataProvider')]
8888
public function testMoveNext(string $input, array $expectedTokens): void
8989
{
@@ -124,7 +124,7 @@ public function testUtf8Mismatch(): void
124124
);
125125
}
126126

127-
/** @psalm-param list<Token<string, string|int>> $expectedTokens */
127+
/** @phpstan-param list<Token<string, string|int>> $expectedTokens */
128128
#[DataProvider('dataProvider')]
129129
public function testPeek(string $input, array $expectedTokens): void
130130
{
@@ -141,7 +141,7 @@ public function testPeek(string $input, array $expectedTokens): void
141141
$this->assertNull($this->concreteLexer->peek());
142142
}
143143

144-
/** @psalm-param list<Token<string, string|int>> $expectedTokens */
144+
/** @phpstan-param list<Token<string, string|int>> $expectedTokens */
145145
#[DataProvider('dataProvider')]
146146
public function testGlimpse(string $input, array $expectedTokens): void
147147
{
@@ -161,7 +161,7 @@ public function testGlimpse(string $input, array $expectedTokens): void
161161
$this->assertNull($this->concreteLexer->peek());
162162
}
163163

164-
/** @psalm-return list<array{string, int, string}> */
164+
/** @phpstan-return list<array{string, int, string}> */
165165
public static function inputUntilPositionDataProvider(): array
166166
{
167167
return [
@@ -180,7 +180,7 @@ public function testGetInputUntilPosition(
180180
$this->assertSame($expectedInput, $this->concreteLexer->getInputUntilPosition($position));
181181
}
182182

183-
/** @psalm-param list<Token<string, string|int>> $expectedTokens */
183+
/** @phpstan-param list<Token<string, string|int>> $expectedTokens */
184184
#[DataProvider('dataProvider')]
185185
public function testIsNextToken(string $input, array $expectedTokens): void
186186
{
@@ -194,7 +194,7 @@ public function testIsNextToken(string $input, array $expectedTokens): void
194194
}
195195
}
196196

197-
/** @psalm-param list<Token<string, string|int>> $expectedTokens */
197+
/** @phpstan-param list<Token<string, string|int>> $expectedTokens */
198198
#[DataProvider('dataProvider')]
199199
public function testIsNextTokenAny(string $input, array $expectedTokens): void
200200
{

0 commit comments

Comments
 (0)