Skip to content

Commit c7cd139

Browse files
committed
Apply PER2.0 phpcs (part 1)
1 parent bf85677 commit c7cd139

File tree

7 files changed

+31
-44
lines changed

7 files changed

+31
-44
lines changed

composer.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
},
3737
"require-dev": {
3838
"phpunit/phpunit": "^9.6|^10.0",
39-
"vimeo/psalm": "^5.22"
39+
"phpstan/extension-installer": "^1.4",
40+
"phpstan/phpstan": "^1.11",
41+
"phpstan/phpstan-strict-rules": "^1.6"
4042
},
4143
"autoload-dev": {
4244
"psr-4": {

phpstan.neon

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
includes:
2+
- phar://phpstan.phar/conf/bleedingEdge.neon
3+
parameters:
4+
level: 1
5+
strictRules:
6+
allRules: true
7+
fileExtensions:
8+
- php
9+
paths:
10+
- src
11+
tmpDir: vendor/.cache.phpstan
12+
reportUnmatchedIgnoredErrors: false

psalm.xml

-16
This file was deleted.

src/Compiler/PCRECompiler.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,9 @@ protected function wrap(string $pcre): string
279279
return $this->delimiter . $pcre . $this->delimiter . \implode('', $this->flags);
280280
}
281281

282-
/**
283-
* @param string|null $token
284-
*/
285282
protected function formatException(string $message, string $token = null): string
286283
{
287-
$suffix = \sprintf(' in %s token definition', $token ?: '<unknown>');
284+
$suffix = \sprintf(' in %s token definition', $token ?? '<unknown>');
288285

289286
$message = \str_replace('Compilation failed: ', '', $message);
290287
$message = \preg_replace('/([\w_]+\(\):\h+)/', '', $message);

src/Token/Renderer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private function escape(string $value): string
7373

7474
private function inline(string $value): string
7575
{
76-
return (string) (\preg_replace('/\h+/u', ' ', $value) ?? $value);
76+
return \preg_replace('/\h+/u', ' ', $value) ?? $value;
7777
}
7878

7979
private function shouldBeShorten(string $value): bool

src/polyfill.php

+12-20
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,27 @@
22

33
namespace Phplrt\Lexer\Buffer {
44

5-
if (
6-
!\class_exists(Buffer::class, false)
7-
&& \class_exists(\Phplrt\Buffer\Buffer::class)
8-
) {
9-
/** @psalm-suppress UndefinedClass */
5+
if (!\class_exists(Buffer::class, false)
6+
&& \class_exists(\Phplrt\Buffer\Buffer::class)) {
7+
// @phpstan-ignore-next-line
108
\class_alias(\Phplrt\Buffer\Buffer::class, Buffer::class);
119
}
1210

13-
if (
14-
!\class_exists(ArrayBuffer::class, false)
15-
&& \class_exists(\Phplrt\Buffer\ArrayBuffer::class)
16-
) {
17-
/** @psalm-suppress UndefinedClass */
11+
if (!\class_exists(ArrayBuffer::class, false)
12+
&& \class_exists(\Phplrt\Buffer\ArrayBuffer::class)) {
13+
// @phpstan-ignore-next-line
1814
\class_alias(\Phplrt\Buffer\ArrayBuffer::class, ArrayBuffer::class);
1915
}
2016

21-
if (
22-
!\class_exists(ExtrusiveBuffer::class, false)
23-
&& \class_exists(\Phplrt\Buffer\ExtrusiveBuffer::class, false)
24-
) {
25-
/** @psalm-suppress UndefinedClass */
17+
if (!\class_exists(ExtrusiveBuffer::class, false)
18+
&& \class_exists(\Phplrt\Buffer\ExtrusiveBuffer::class, false)) {
19+
// @phpstan-ignore-next-line
2620
\class_alias(\Phplrt\Buffer\ExtrusiveBuffer::class, ExtrusiveBuffer::class);
2721
}
2822

29-
if (
30-
!\class_exists(LazyBuffer::class, false)
31-
&& \class_exists(\Phplrt\Buffer\LazyBuffer::class)
32-
) {
33-
/** @psalm-suppress UndefinedClass */
23+
if (!\class_exists(LazyBuffer::class, false)
24+
&& \class_exists(\Phplrt\Buffer\LazyBuffer::class)) {
25+
// @phpstan-ignore-next-line
3426
\class_alias(\Phplrt\Buffer\LazyBuffer::class, LazyBuffer::class);
3527
}
3628
}

tests/Functional/MultistateLexerTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public function testSimpleMultistateExpression(): void
4848
$result = (new Multistate([
4949
'string' => [
5050
'escaped_quote' => '\\\\"',
51-
'quote' => '"',
52-
'char' => '\w',
51+
'quote' => '"',
52+
'char' => '\w',
5353
],
5454
'default' => [
5555
'quote' => '"'

0 commit comments

Comments
 (0)