8000 Revert "temporary apply not-yet-solved CS issues" · symfony/symfony@7e37da6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7e37da6

Browse files
keraduskeradus
committed
Revert "temporary apply not-yet-solved CS issues"
This reverts commit e030c4e.
1 parent 1e014bf commit 7e37da6

26 files changed

+162
-28
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderPostgresTest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ protected function bootstrapProvider(): DoctrineTokenProvider
4242
'password' => 'password',
4343
], $config);
4444
$connection->executeStatement(<<<'SQL'
45-
DROP TABLE IF EXISTS rememberme_token;
46-
SQL);
45+
DROP TABLE IF EXISTS rememberme_token;
46+
SQL);
4747

4848
$connection->executeStatement(<<<'SQL'
49-
CREATE TABLE rememberme_token (
50-
series CHAR(88) UNIQUE PRIMARY KEY NOT NULL,
51-
value VARCHAR(88) NOT NULL, -- CHAR(88) adds spaces at the end
52-
lastUsed TIMESTAMP NOT NULL,
53-
class VARCHAR(100) NOT NULL,
54-
username VARCHAR(200) NOT NULL
55-
);
56-
SQL);
49+
CREATE TABLE rememberme_token (
50+
series CHAR(88) UNIQUE PRIMARY KEY NOT NULL,
51+
value VARCHAR(88) NOT NULL, -- CHAR(88) adds spaces at the end
52+
lastUsed TIMESTAMP NOT NULL,
53+
class VARCHAR(100) NOT NULL,
54+
username VARCHAR(200) NOT NULL
55+
);
56+
SQL);
5757

5858
return new DoctrineTokenProvider($connection);
5959
}

‎src/Symfony/Bridge/PhpUnit/Tests/ExpectDeprecationTraitTest.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ final class ExpectDeprecationTraitTest extends TestCase
2424

2525
/**
2626
* Do not remove this test in the next major version.
27+
*
28+
* @group legacy
2729
*/
2830
#[Group('legacy')]
2931
public function testOne()
@@ -34,6 +36,10 @@ public function testOne()
3436

3537
/**
3638
* Do not remove this test in the next major version.
39+
*
40+
* @group legacy
41+
*
42+
* @runInSeparateProcess
3743
*/
3844
#[Group('legacy')]
3945
#[RunInSeparateProcess]
@@ -45,6 +51,8 @@ public function testOneInIsolation()
4551

4652
/**
4753
* Do not remove this test in the next major version.
54+
*
55+
* @group legacy
4856
*/
4957
#[Group('legacy')]
5058
public function testMany()
@@ -58,6 +66,8 @@ public function testMany()
5866
/**
5967
* Do not remove this test in the next major version.
6068
*
69+
* @group legacy
70+
*
6171
* @expectedDeprecation foo
6272
*/
6373
#[Group('legacy')]
@@ -71,6 +81,8 @@ public function testOneWithAnnotation()
7181
/**
7282
* Do not remove this test in the next major version.
7383
*
84+
* @group legacy
85+
*
7486
* @expectedDeprecation foo
7587
* @expectedDeprecation bar
7688
*/

‎src/Symfony/Bridge/PhpUnit/Tests/ExpectedDeprecationAnnotationTest.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ final class ExpectedDeprecationAnnotationTest extends TestCase
2121
/**
2222
* Do not remove this test in the next major versions.
2323
*
24+
* @group legacy
25+
*
2426
* @expectedDeprecation foo
2527
*/
2628
#[Group('legacy')]
@@ -32,6 +34,8 @@ public function testOne()
3234
/**
3335
* Do not remove this test in the next major versions.
3436
*
37+
* @group legacy
38+
*
3539
* @expectedDeprecation foo
3640
* @expectedDeprecation bar
3741
*/

‎src/Symfony/Bridge/PhpUnit/Tests/FailTests/ExpectDeprecationTraitTestFail.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ final class ExpectDeprecationTraitTestFail extends TestCase
3030

3131
/**
3232
* Do not remove this test in the next major version.
33+
*
34+
* @group legacy
3335
*/
3436
#[Group('legacy')]
3537
public function testOne()
@@ -40,6 +42,10 @@ public function testOne()
4042

4143
/**
4244
* Do not remove this test in the next major version.
45+
*
46+
* @group legacy
47+
*
48+
* @runInSeparateProcess
4349
*/
4450
#[Group('legacy')]
4551
#[RunInSeparateProcess]

‎src/Symfony/Bridge/PhpUnit/Tests/FailTests/NoAssertionsTestRisky.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ final class NoAssertionsTestRisky extends TestCase
2727

2828
/**
2929
* Do not remove this test in the next major version.
30+
*
31+
* @group legacy
3032
*/
3133
#[Group('legacy')]
3234
public function testOne()

‎src/Symfony/Bridge/PhpUnit/Tests/Metadata/AttributeReaderTest.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
class AttributeReaderTest extends TestCase
2222
{
23+
/**
24+
* @dataProvider provideReadCases
25+
*/
2326
#[DataProvider('provideReadCases')]
2427
public function testAttributesAreRead(string $method, string $attributeClass, array $expected)
2528
{

‎src/Symfony/Bridge/PhpUnit/Tests/OnlyExpectingDeprecationSkippedTest.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@
1717

1818
/**
1919
* This test is meant to be skipped.
20+
*
21+
* @requires extension ext-dummy
2022
*/
2123
#[RequiresPhpExtension('ext-dummy')]
2224
final class OnlyExpectingDeprecationSkippedTest extends TestCase
2325
{
2426
/**
2527
* Do not remove this test in the next major versions.
2628
*
29+
* @group legacy
30+
*
2731
* @expectedDeprecation unreachable
2832
*/
2933
#[Group('legacy')]

‎src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
/**
2020
* Don't remove this test case, it tests the legacy group.
2121
*
22+
* @group legacy
23+
*
2224
* @runTestsInSeparateProcesses
2325
*/
2426
#[RequiresPhpunit('<10')]

‎src/Symfony/Component/Cache/Traits/RedisTrait.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,10 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
364364

365365
foreach ($context as $name => $value) {
366366
match ($name) {
367-
'use-cache', 'client-tracking', 'throw-on-error', 'client-invalidations', 'reply-literal', 'persistent', => $context[$name] = filter_var($value, \FILTER_VALIDATE_BOOLEAN),
368-
'max-retries', 'serializer', 'compression', 'compression-level', => $context[$name] = filter_var($value, \FILTER_VALIDATE_INT),
367+
'use-cache', 'client-tracking', 'throw-on-error', 'client-invalidations', 'reply-literal', 'persistent',
368+
=> $context[$name] = filter_var($value, \FILTER_VALIDATE_BOOLEAN),
369+
'max-retries', 'serializer', 'compression', 'compression-level',
370+
=> $context[$name] = filter_var($value, \FILTER_VALIDATE_INT),
369371
default => null,
370372
};
371373
}
@@ -770,7 +772,8 @@ private static function filterSslOptions(array $options): array
770772
{
771773
foreach ($options as $name => $value) {
772774
match ($name) {
773-
'allow_self_signed', 'capture_peer_cert', 'capture_peer_cert_chain', 'disable_compression', 'SNI_enabled', 'verify_peer', 'verify_peer_name', => $options[$name] = filter_var($value, \FILTER_VALIDATE_BOOLEAN),
775+
'allow_self_signed', 'capture_peer_cert', 'capture_peer_cert_chain', 'disable_compression', 'SNI_enabled', 'verify_peer', 'verify_peer_name',
776+
=> $options[$name] = filter_var($value, \FILTER_VALIDATE_BOOLEAN),
774777
default => null,
775778
};
776779
}

‎src/Symfony/Component/Console/ArgumentResolver/ValueResolver/DateTimeValueResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ public function resolve(string $argumentName, InputInterface $input, ReflectionM
6363
}
6464

6565
if ($value instanceof \DateTimeInterface) {
66-
/* @var class-string<\DateTimeImmutable>|class-string<\DateTime> $class */
66+
/** @var class-string<\DateTimeImmutable>|class-string<\DateTime> $class */
6767
return [$value instanceof $class ? $value : $class::createFromInterface($value)];
6868
}
6969

7070
$format = $attribute?->format;
7171

72-
/* @var class-string<\DateTimeImmutable>|class-string<\DateTime> $class */
72+
/** @var class-string<\DateTimeImmutable>|class-string<\DateTime> $class */
7373
if (null !== $format) {
7474
$date = $class::createFromFormat($format, $value, $this->clock?->now()->getTimeZone());
7575

0 commit comments

Comments
 (0)
0