Skip to content

Commit 63b61d6

Browse files
eblnebln
committed
Update cs-fixer, codestyle & baseline for tests
1 parent e974b79 commit 63b61d6

17 files changed

+357
-303
lines changed

‎.github/workflows/buildTest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Require php-cs-fixer
2323
run: |
2424
mkdir --parents ./tools/php-cs-fixer
25-
composer require --working-dir=tools/php-cs-fixer friendsofphp/php-cs-fixer "friendsofphp/php-cs-fixer:3.15.1" --prefer-dist --no-progress
25+
composer require --working-dir=tools/php-cs-fixer friendsofphp/php-cs-fixer "friendsofphp/php-cs-fixer:3.58" --prefer-dist --no-progress
2626
- name: Install dependencies
2727
run: composer install --prefer-dist --no-progress
2828
- name: Unit tests

‎.php-cs-fixer.dist.php

+10-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
declare(strict_types=1);
44

55
/*
6-
* @see https://mlocati.github.io/php-cs-fixer-configurator/#version:3.15
6+
* @see https://mlocati.github.io/php-cs-fixer-configurator/#version:3.58
77
* @see https://cs.symfony.com/doc/rules/index.html
88
* @see https://cs.symfony.com/doc/ruleSets/index.html
99
*/
@@ -19,12 +19,12 @@
1919
$config->setRiskyAllowed(true)
2020
->setRules(
2121
[
22-
'@PER' => true,
22+
'@PER-CS2.0' => true,
2323
'@Symfony' => true,
2424
'@PhpCsFixer' => true,
2525
'@PhpCsFixer:risky' => true,
2626
'@PHPUnit100Migration:risky' => true,
27-
// '@PHP80Migration:risky' => true,
27+
// '@PHP80Migration:risky' => true,
2828
'@PHP82Migration' => true,
2929
'no_superfluous_phpdoc_tags' => true,
3030
'native_function_invocation' => false,
@@ -33,7 +33,7 @@
3333
'single_line_comment_style' => ['comment_types' => [ /* 'hash' */],],
3434
'phpdoc_summary' => false,
3535
'cast_spaces' => ['space' => 'none'],
36-
'binary_operator_spaces' => ['default' => null, 'operators' => ['=' => 'align_single_space_minimal', '=>' => 'align_single_space_minimal_by_scope']],
36+
'binary_operator_spaces' => ['default' => 'at_least_single_space', 'operators' => ['=' => 'align_single_space_minimal', '=>' => 'align_single_space_minimal_by_scope']],
3737
'no_unused_imports' => true,
3838
'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['const', 'class', 'function']],
3939
'control_structure_braces' => true,
@@ -45,14 +45,19 @@
4545
'simplified_null_return' => true,
4646
'statement_indentation' => true,
4747
'blank_line_before_statement' => ['statements' => ['continue', 'declare', 'default', 'exit', 'goto', 'include', 'include_once', 'require', 'require_once', 'return', 'switch']],
48+
'yoda_style' => ['less_and_greater' => false],
49+
'type_declaration_spaces' => ['elements' => ['function']],
50+
'fully_qualified_strict_types' => false,
4851
]
4952
)
5053
->setFinder($finder);
5154

5255
if (false) {
5356
$resolver = new \PhpCsFixer\Console\ConfigurationResolver($config, [], '', new \PhpCsFixer\ToolInfo());
5457
echo "\n\n# DUMPING EFFECTIVE RULES #################\n";
55-
var_export($resolver->getRules());
58+
$rules = $resolver->getRules();
59+
ksort($rules);
60+
var_export($rules);
5661
echo "\n\n###########################################\n";
5762

5863
die();

‎phpstan-baseline.php

+63-10
Large diffs are not rendered by default.

‎src/Exception/AdapterThrowableInterface.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44

55
namespace brnc\Symfony1\Message\Exception;
66

7-
interface AdapterThrowableInterface extends \Throwable
8-
{
9-
}
7+
interface AdapterThrowableInterface extends \Throwable {}

‎src/Exception/InvalidTypeException.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44

55
namespace brnc\Symfony1\Message\Exception;
66

7-
class InvalidTypeException extends \InvalidArgumentException implements AdapterThrowableInterface
8-
{
9-
}
7+
class InvalidTypeException extends \InvalidArgumentException implements AdapterThrowableInterface {}

‎tests/Adapter/RequestBasicTest.php

+47-47
Original file line numberDiff line numberDiff line change
@@ -18,56 +18,56 @@ final class RequestBasicTest extends TestCase
1818
public function testProtocolVersion(): void
1919
{
2020
$request = $this->createRequest();
21-
static::assertSame('', $request->getProtocolVersion());
22-
static::assertSame([], $request->getServerParams());
21+
self::assertSame('', $request->getProtocolVersion());
22+
self::assertSame([], $request->getServerParams());
2323
$request = $request->withProtocolVersion('1.1');
24-
static::assertSame('1.1', $request->getProtocolVersion());
25-
static::assertSame(['SERVER_PROTOCOL' => 'HTTP/1.1'], $request->getServerParams());
24+
self::assertSame('1.1', $request->getProtocolVersion());
25+
self::assertSame(['SERVER_PROTOCOL' => 'HTTP/1.1'], $request->getServerParams());
2626
}
2727

2828
/** @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */
2929
public function testPresetProtocolVersion(): void
3030
{
3131
$request = $this->createRequest('GET', ['SERVER_PROTOCOL' => 'HTTP/1.1']);
32-
static::assertSame('1.1', $request->getProtocolVersion());
33-
static::assertSame(['SERVER_PROTOCOL' => 'HTTP/1.1'], $request->getServerParams());
32+
self::assertSame('1.1', $request->getProtocolVersion());
33+
self::assertSame(['SERVER_PROTOCOL' => 'HTTP/1.1'], $request->getServerParams());
3434
}
3535

3636
/** @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */
3737
public function testMethod(): void
3838
{
3939
$mock = $this->createSymfonyMock();
4040
$request = Request::fromSfWebRequest($mock);
41-
static::assertSame('GET', $request->getMethod());
41+
self::assertSame('GET', $request->getMethod());
4242
$request = $request->withMethod('PuRgE');
43-
static::assertSame('PuRgE', $request->getMethod());
44-
static::assertSame('PURGE', $mock->getMethod());
43+
self::assertSame('PuRgE', $request->getMethod());
44+
self::assertSame('PURGE', $mock->getMethod());
4545
$request = $request->withMethod('GET');
46-
static::assertSame('GET', $request->getMethod());
47-
static::assertSame('GET', $mock->getMethod());
46+
self::assertSame('GET', $request->getMethod());
47+
self::assertSame('GET', $mock->getMethod());
4848
}
4949

5050
/**
51-
* @dataProvider withHeaderProvider
51+
* @dataProvider provideHeaderCases
5252
*
5353
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
5454
*/
5555
public function testHeader(string $name, string $value, array $expectedHeaders, array $expectedServerParams): void
5656
{
5757
$request = $this->createRequest();
58-
static::assertFalse($request->hasHeader($name));
59-
static::assertSame([], $request->getHeader($name));
60-
static::assertSame([], $request->getServerParams());
58+
self::assertFalse($request->hasHeader($name));
59+
self::assertSame([], $request->getHeader($name));
60+
self::assertSame([], $request->getServerParams());
6161
$request = $request->withHeader($name, 'FIRST VALUE');
6262
$request = $request->withHeader($name, $value);
63-
static::assertTrue($request->hasHeader($name));
64-
static::assertSame([$value], $request->getHeader($name));
65-
static::assertSame($value, $request->getHeaderLine($name));
66-
static::assertSame($expectedHeaders, $request->getHeaders());
67-
static::assertSame($expectedServerParams, $request->getServerParams());
63+
self::assertTrue($request->hasHeader($name));
64+
self::assertSame([$value], $request->getHeader($name));
65+
self::assertSame($value, $request->getHeaderLine($name));
66+
self::assertSame($expectedHeaders, $request->getHeaders());
67+
self::assertSame($expectedServerParams, $request->getServerParams());
6868
}
6969

70-
public static function withHeaderProvider(): array
70+
public static function provideHeaderCases(): iterable
7171
{
7272
return [
7373
[
@@ -105,49 +105,49 @@ public static function withHeaderProvider(): array
105105
public function testWithAddedHeader(): void
106106
{
107107
$request = $this->createRequest();
108-
static::assertFalse($request->hasHeader('X-Foo'));
109-
static::assertSame([], $request->getHeader('X-Foo'));
110-
static::assertSame([], $request->getServerParams());
108+
self::assertFalse($request->hasHeader('X-Foo'));
109+
self::assertSame([], $request->getHeader('X-Foo'));
110+
self::assertSame([], $request->getServerParams());
111111
$request = $request->withAddedHeader('X-Foo', 'bar');
112-
static::assertTrue($request->hasHeader('X-Foo'));
112+
self::assertTrue($request->hasHeader('X-Foo'));
113113
$request = $request->withAddedHeader('X-Foo', 'baz');
114-
static::assertTrue($request->hasHeader('X-Foo'));
115-
static::assertSame(['bar', 'baz'], $request->getHeader('X-Foo'));
116-
static::assertSame('bar,baz', $request->getHeaderLine('X-Foo'));
117-
static::assertSame(['X-Foo' => ['bar', 'baz']], $request->getHeaders());
118-
static::assertSame(['HTTP_X_FOO' => 'bar,baz'], $request->getServerParams());
114+
self::assertTrue($request->hasHeader('X-Foo'));
115+
self::assertSame(['bar', 'baz'], $request->getHeader('X-Foo'));
116+
self::assertSame('bar,baz', $request->getHeaderLine('X-Foo'));
117+
self::assertSame(['X-Foo' => ['bar', 'baz']], $request->getHeaders());
118+
self::assertSame(['HTTP_X_FOO' => 'bar,baz'], $request->getServerParams());
119119
}
120120

121121
/** @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */
122122
public function testWithArrayAddedHeader(): void
123123
{
124124
$request = $this->createRequest();
125-
static::assertFalse($request->hasHeader('X-Foo'));
126-
static::assertSame([], $request->getHeader('X-Foo'));
127-
static::assertSame([], $request->getServerParams());
125+
self::assertFalse($request->hasHeader('X-Foo'));
126+
self::assertSame([], $request->getHeader('X-Foo'));
127+
self::assertSame([], $request->getServerParams());
128128
$request = $request->withAddedHeader('X-Foo', 'foo');
129-
static::assertTrue($request->hasHeader('X-Foo'));
129+
self::assertTrue($request->hasHeader('X-Foo'));
130130
$request = $request->withAddedHeader('X-Foo', ['bar', 'baz']);
131-
static::assertTrue($request->hasHeader('X-Foo'));
132-
static::assertSame(['foo', 'bar', 'baz'], $request->getHeader('X-Foo'));
133-
static::assertSame('foo,bar,baz', $request->getHeaderLine('X-Foo'));
134-
static::assertSame(['X-Foo' => ['foo', 'bar', 'baz']], $request->getHeaders());
135-
static::assertSame(['HTTP_X_FOO' => 'foo,bar,baz'], $request->getServerParams());
131+
self::assertTrue($request->hasHeader('X-Foo'));
132+
self::assertSame(['foo', 'bar', 'baz'], $request->getHeader('X-Foo'));
133+
self::assertSame('foo,bar,baz', $request->getHeaderLine('X-Foo'));
134+
self::assertSame(['X-Foo' => ['foo', 'bar', 'baz']], $request->getHeaders());
135+
self::assertSame(['HTTP_X_FOO' => 'foo,bar,baz'], $request->getServerParams());
136136
}
137137

138138
/** @throws \SebastianBergmann\RecursionContext\InvalidArgumentException */
139139
public function testWithoutHeader(): void
140140
{
141141
$request = $this->createRequest('GET', ['HTTP_X_FOO' => 'bar, baz']);
142-
static::assertTrue($request->hasHeader('X-Foo'));
143-
static::assertSame(['bar', 'baz'], $request->getHeader('X-Foo'));
144-
static::assertSame('bar, baz', $request->getHeaderLine('X-Foo'));
145-
static::assertSame(['x-foo' => ['bar', 'baz']], $request->getHeaders());
146-
static::assertSame(['HTTP_X_FOO' => 'bar, baz'], $request->getServerParams());
142+
self::assertTrue($request->hasHeader('X-Foo'));
143+
self::assertSame(['bar', 'baz'], $request->getHeader('X-Foo'));
144+
self::assertSame('bar, baz', $request->getHeaderLine('X-Foo'));
145+
self::assertSame(['x-foo' => ['bar', 'baz']], $request->getHeaders());
146+
self::assertSame(['HTTP_X_FOO' => 'bar, baz'], $request->getServerParams());
147147
$request = $request->withoutHeader('x-FoO');
148-
static::assertFalse($request->hasHeader('X-Foo'));
149-
static::assertSame([], $request->getHeader('X-Foo'));
150-
static::assertSame([], $request->getServerParams());
148+
self::assertFalse($request->hasHeader('X-Foo'));
149+
self::assertSame([], $request->getHeader('X-Foo'));
150+
self::assertSame([], $request->getServerParams());
151151
}
152152

153153
private function createRequest(

‎tests/Adapter/RequestReadingTest.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function testHasHeader(array $request, $headerName, $hasHeader, $getHeade
3434
$sfWebRequest->prepare($request['method'], $request['server']);
3535
$readingRequestMock = Request::fromSfWebRequest($sfWebRequest);
3636

37-
static::assertSame($hasHeader, $readingRequestMock->hasHeader($headerName));
37+
self::assertSame($hasHeader, $readingRequestMock->hasHeader($headerName));
3838
}
3939

4040
/**
@@ -53,7 +53,7 @@ public function testGetHeader(array $request, $headerName, $hasHeader, $getHeade
5353
$sfWebRequest = new \sfWebRequest();
5454
$sfWebRequest->prepare($request['method'], $request['server']);
5555
$readingRequestMock = Request::fromSfWebRequest($sfWebRequest);
56-
static::assertSame($getHeader, $readingRequestMock->getHeader($headerName));
56+
self::assertSame($getHeader, $readingRequestMock->getHeader($headerName));
5757
}
5858

5959
/**
@@ -78,7 +78,7 @@ public function testGetHeaderLine(
7878
$sfWebRequest = new \sfWebRequest();
7979
$sfWebRequest->prepare($request['method'], $request['server']);
8080
$readingRequestMock = Request::fromSfWebRequest($sfWebRequest);
81-
static::assertSame($getHeaderLine, $readingRequestMock->getHeaderLine($headerName));
81+
self::assertSame($getHeaderLine, $readingRequestMock->getHeaderLine($headerName));
8282
}
8383

8484
/**
@@ -103,10 +103,10 @@ public function testGetHeaders(
103103
$sfWebRequest = new \sfWebRequest();
104104
$sfWebRequest->prepare($request['method'], $request['server']);
105105
$readingRequestMock = Request::fromSfWebRequest($sfWebRequest);
106-
static::assertSame($expectedHeaders, $readingRequestMock->getHeaders());
106+
self::assertSame($expectedHeaders, $readingRequestMock->getHeaders());
107107
}
108108

109-
public static function provideHeaderTestData(): array
109+
public static function provideHeaderTestData(): iterable
110110
{
111111
return [
112112
'happy case' => [
@@ -199,7 +199,7 @@ public static function provideHeaderTestData(): array
199199
/**
200200
* @phpstan-param mixed $expectedVersion
201201
*
202-
* @dataProvider provideProtocolVersionData
202+
* @dataProvider provideGetProtocolVersionCases
203203
*
204204
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
205205
*/
@@ -208,10 +208,10 @@ public function testGetProtocolVersion(array $request, $expectedVersion): void
208208
$sfWebRequest = new \sfWebRequest();
209209
$sfWebRequest->prepare($request['method'], $request['server']);
210210
$readingRequestMock = Request::fromSfWebRequest($sfWebRequest);
211-
static::assertSame($expectedVersion, $readingRequestMock->getProtocolVersion());
211+
self::assertSame($expectedVersion, $readingRequestMock->getProtocolVersion());
212212
}
213213

214-
public static function provideProtocolVersionData(): array
214+
public static function provideGetProtocolVersionCases(): iterable
215215
{
216216
return [
217217
'happy case' => [

0 commit comments

Comments
 (0)