Skip to content

Commit 812c533

Browse files
fabpotfabpot
committed
minor symfony#59210 chore: PHP CS Fixer fixes (keradus)
This PR was squashed before being merged into the 7.3 branch. Discussion ---------- chore: PHP CS Fixer fixes | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Issues | Fix CS <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead --> | License | MIT Commits ------- 49c622f chore: PHP CS Fixer fixes
2 parents d57efd1 + 49c622f commit 812c533

File tree

13 files changed

+71
-69
lines changed

13 files changed

+71
-69
lines changed

‎.php-cs-fixer.dist.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
5757
// stop removing spaces on the end of the line in strings
5858
->notPath('Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php')
59+
// disable to not apply `native_function_invocation` rule, as we explicitly break it for testability reason, ref https://github.com/symfony/symfony/pull/59195
60+
->notPath('Symfony/Component/Mailer/Transport/NativeTransportFactory.php')
5961
// auto-generated proxies
6062
->notPath('Symfony/Component/Cache/Traits/RelayProxy.php')
6163
->notPath('Symfony/Component/Cache/Traits/Redis5Proxy.php')

‎src/Symfony/Component/AssetMapper/Tests/ImportMap/Resolver/JsDelivrEsmResolverTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ public static function provideDownloadPackagesTests()
443443
'body' => <<<'EOF'
444444
const je="\n//# sourceURL=",Ue="\n//# sourceMappingURL=",Me=/^(text|application)\/(x-)?javascript(;|$)/,_e=/^(application)\/wasm(;|$)/,Ie=/^(text|application)\/json(;|$)/,Re=/^(text|application)\/css(;|$)/,Te=/url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g;
445445
//# sourceMappingURL=/sm/ef3916de598f421a779ba0e69af94655b2043095cde2410cc01893452d893338.map
446-
EOF
446+
EOF,
447447
],
448448
],
449449
[

‎src/Symfony/Component/Console/Tests/Helper/TableTest.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public static function renderProvider()
112112
| 80-902734-1-6 | And Then There Were None | Agatha Christie |
113113
+---------------+--------------------------+------------------+
114114

115-
TABLE
115+
TABLE,
116116
],
117117
[
118118
['ISBN', 'Title', 'Author'],
@@ -157,7 +157,7 @@ public static function renderProvider()
157157
│ 80-902734-1-6 │ And Then There Were None │ Agatha Christie │
158158
└───────────────┴──────────────────────────┴──────────────────┘
159159

160-
TABLE
160+
TABLE,
161161
],
162162
[
163163
['ISBN', 'Title', 'Author'],
@@ -180,7 +180,7 @@ public static function renderProvider()
180180
║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie ║
181181
╚═══════════════╧══════════════════════════╧══════════════════╝
182182

183-
TABLE
183+
TABLE,
184184
],
185185
[
186186
['ISBN', 'Title'],
@@ -201,7 +201,7 @@ public static function renderProvider()
201201
| 80-902734-1-6 | And Then There Were None | Agatha Christie |
202202
+---------------+--------------------------+------------------+
203203

204-
TABLE
204+
TABLE,
205205
],
206206
[
207207
[],
@@ -220,7 +220,7 @@ public static function renderProvider()
220220
| 80-902734-1-6 | And Then There Were None | Agatha Christie |
221221
+---------------+--------------------------+------------------+
222222

223-
TABLE
223+
TABLE,
224224
],
225225
[
226226
['ISBN', 'Title', 'Author'],
@@ -245,7 +245,7 @@ public static function renderProvider()
245245
| | | Tolkien |
246246
+---------------+----------------------------+-----------------+
247247

248-
TABLE
248+
TABLE,
249249
],
250250
[
251251
['ISBN', 'Title'],
@@ -256,7 +256,7 @@ public static function renderProvider()
256256
| ISBN | Title |
257257
+------+-------+
258258

259-
TABLE
259+
TABLE,
260260
],
261261
[
262262
[],
@@ -279,7 +279,7 @@ public static function renderProvider()
279279
| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
280280
+---------------+----------------------+-----------------+
281281

282-
TABLE
282+
TABLE,
283283
],
284284
'Cell text with tags not used for Output styling' => [
285285
['ISBN', 'Title', 'Author'],
@@ -296,7 +296,7 @@ public static function renderProvider()
296296
| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
297297
+----------------------------------+----------------------+-----------------+
298298

299-
TABLE
299+
TABLE,
300300
],
301301
'Cell with colspan' => [
302302
['ISBN', 'Title', 'Author'],
@@ -336,7 +336,7 @@ public static function renderProvider()
336336
| Cupìdĭtâte díctá âtquè pôrrò, tèmpórà exercitátìónèm mòdí ânìmí núllà nèmò vèl níhìl! |
337337
+-------------------------------+-------------------------------+-----------------------------+
338338

339-
TABLE
339+
TABLE,
340340
],
341341
'Cell after colspan contains new line break' => [
342342
['Foo', 'Bar', 'Baz'],
@@ -355,7 +355,7 @@ public static function renderProvider()
355355
| bar | qux |
356356
+-----+-----+-----+
357357

358-
TABLE
358+
TABLE,
359359
],
360360
'Cell after colspan contains multiple new lines' => [
361361
['Foo', 'Bar', 'Baz'],
@@ -375,7 +375,7 @@ public static function renderProvider()
375375
| | quux |
376376
+-----+-----+------+
377377

378-
TABLE
378+
TABLE,
379379
],
380380
'Cell with rowspan' => [
381381
['ISBN', 'Title', 'Author'],
@@ -406,7 +406,7 @@ public static function renderProvider()
406406
| | Were None | |
407407
+---------------+---------------+-----------------+
408408

409-
TABLE
409+
TABLE,
410410
],
411411
'Cell with rowspan and colspan' => [
412412
['ISBN', 'Title', 'Author'],
@@ -437,7 +437,7 @@ public static function renderProvider()
437437
| J. R. R | |
438438
+------------------+---------+-----------------+
439439

440-
TABLE
440+
TABLE,
441441
],
442442
'Cell with rowspan and colspan contains new line break' => [
443443
['ISBN', 'Title', 'Author'],
@@ -480,7 +480,7 @@ public static function renderProvider()
480480
| 0-0 | |
481481
+-----------------+-------+-----------------+
482482

483-
TABLE
483+
TABLE,
484484
],
485485
'Cell with rowspan and colspan without using TableSeparator' => [
486486
['ISBN', 'Title', 'Author'],
@@ -511,7 +511,7 @@ public static function renderProvider()
511511
| | 0-0 |
512512
+-----------------+-------+-----------------+
513513

514-
TABLE
514+
TABLE,
515515
],
516516
'Cell with rowspan and colspan with separator inside a rowspan' => [
517517
['ISBN', 'Author'],
@@ -533,7 +533,7 @@ public static function renderProvider()
533533
| | Charles Dickens |
534534
+---------------+-----------------+
535535

536-
TABLE
536+
TABLE,
537537
],
538538
'Multiple header lines' => [
539539
[
@@ -549,7 +549,7 @@ public static function renderProvider()
549549
| ISBN | Title | Author |
550550
+------+-------+--------+
551551

552-
TABLE
552+
TABLE,
553553
],
554554
'Row with multiple cells' => [
555555
[],
@@ -567,7 +567,7 @@ public static function renderProvider()
567567
| 1 | 2 | 3 | 4 |
568568
+---+--+--+---+--+---+--+---+--+
569569

570-
TABLE
570+
TABLE,
571571
],
572572
'Coslpan and table cells with comment style' => [
573573
[
@@ -1305,7 +1305,7 @@ public static function renderSetTitle()
13051305
| 80-902734-1-6 | And Then There Were None | Agatha Christie |
13061306
+---------------+---------- footer --------+------------------+
13071307

1308-
TABLE
1308+
TABLE,
13091309
],
13101310
[
13111311
'Books',
@@ -1321,7 +1321,7 @@ public static function renderSetTitle()
13211321
│ 80-902734-1-6 │ And Then There Were None │ Agatha Christie │
13221322
└───────────────┴───────── Page 1/2 ───────┴──────────────────┘
13231323

1324-
TABLE
1324+
TABLE,
13251325
],
13261326
[
13271327
'Boooooooooooooooooooooooooooooooooooooooooooooooooooooooks',
@@ -1337,7 +1337,7 @@ public static function renderSetTitle()
13371337
| 80-902734-1-6 | And Then There Were None | Agatha Christie |
13381338
+- Page 1/99999999999999999999999999999999999999999999999... -+
13391339

1340-
TABLE
1340+
TABLE,
13411341
],
13421342
];
13431343
}

‎src/Symfony/Component/JsonEncoder/Decode/PhpAstBuilder.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
use Symfony\Component\TypeInfo\Type\BackedEnumType;
5454
use Symfony\Component\TypeInfo\Type\CollectionType;
5555
use Symfony\Component\TypeInfo\Type\ObjectType;
56-
use Symfony\Component\TypeInfo\TypeIdentifier;
5756
use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
57+
use Symfony\Component\TypeInfo\TypeIdentifier;
5858

5959
/**
6060
* Builds a PHP syntax tree that decodes JSON.

‎src/Symfony/Component/JsonEncoder/Encode/PhpAstBuilder.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
use Symfony\Component\JsonEncoder\Exception\RuntimeException;
4646
use Symfony\Component\JsonEncoder\Exception\UnexpectedValueException;
4747
use Symfony\Component\TypeInfo\Type\ObjectType;
48-
use Symfony\Component\TypeInfo\TypeIdentifier;
4948
use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
49+
use Symfony\Component\TypeInfo\TypeIdentifier;
5050

5151
/**
5252
* Builds a PHP syntax tree that encodes data to JSON.

‎src/Symfony/Component/JsonEncoder/Mapping/GenericTypePropertyMetadataLoader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
use Symfony\Component\TypeInfo\Type\IntersectionType;
1919
use Symfony\Component\TypeInfo\Type\ObjectType;
2020
use Symfony\Component\TypeInfo\Type\UnionType;
21-
use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
2221
use Symfony\Component\TypeInfo\Type\WrappingTypeInterface;
22+
use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
2323

2424
/**
2525
* Enhances properties encoding/decoding metadata based on properties' generic type.

‎src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ private function isAllowedProperty(string $class, string $property, bool $writeA
722722
return (bool) ($this->propertyReflectionFlags & \ReflectionProperty::IS_PRIVATE);
723723
}
724724

725-
if (\PHP_VERSION_ID >= 80400 &&$reflectionProperty->isVirtual() && !$reflectionProperty->hasHook(\PropertyHookType::Set)) {
725+
if (\PHP_VERSION_ID >= 80400 && $reflectionProperty->isVirtual() && !$reflectionProperty->hasHook(\PropertyHookType::Set)) {
726726
return false;
727727
}
728728
}
@@ -976,7 +976,7 @@ private function getWriteVisiblityForProperty(\ReflectionProperty $reflectionPro
976976

977977
if ($reflectionProperty->isProtectedSet()) {
978978
return PropertyWriteInfo::VISIBILITY_PROTECTED;
979-
}
979+
}
980980
}
981981

982982
if ($reflectionProperty->isPrivate()) {

‎src/Symfony/Component/Routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static function routeProvider()
4747
root
4848
prefix_segment
4949
leading_segment
50-
EOF
50+
EOF,
5151
],
5252
'Nested - small group' => [
5353
[
@@ -60,7 +60,7 @@ public static function routeProvider()
6060
/prefix/segment/
6161
-> prefix_segment
6262
-> leading_segment
63-
EOF
63+
EOF,
6464
],
6565
'Nested - contains item at intersection' => [
6666
[
@@ -73,7 +73,7 @@ public static function routeProvider()
7373
/prefix/segment/
7474
-> prefix_segment
7575
-> leading_segment
76-
EOF
76+
EOF,
7777
],
7878
'Simple one level nesting' => [
7979
[
@@ -88,7 +88,7 @@ public static function routeProvider()
8888
-> nested_segment
8989
-> some_segment
9090
-> other_segment
91-
EOF
91+
EOF,
9292
],
9393
'Retain matching order with groups' => [
9494
[
@@ -110,7 +110,7 @@ public static function routeProvider()
110110
-> dd
111111
-> ee
112112
-> ff
113-
EOF
113+
EOF,
114114
],
115115
'Retain complex matching order with groups at base' => [
116116
[
@@ -142,7 +142,7 @@ public static function routeProvider()
142142
-> -> ee
143143
-> -> ff
144144
-> parent
145-
EOF
145+
EOF,
146146
],
147147

148148
'Group regardless of segments' => [
@@ -163,7 +163,7 @@ public static function routeProvider()
163163
-> g1
164164
-> g2
165165
-> g3
166-
EOF
166+
EOF,
167167
],
168168
];
169169
}

‎src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private function isSetMethod(\ReflectionMethod $method): bool
102102
&& 0 < $method->getNumberOfParameters()
103103
&& str_starts_with($method->name, 'set')
104104
&& !ctype_lower($method->name[3])
105-
;
105+
;
106106
}
107107

108108
protected function extractAttributes(object $object, ?string $format = null, array $context = []): array

‎src/Symfony/Component/Serializer/Tests/Attribute/ContextTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static function provideValidInputs(): iterable
8686
-normalizationContext: []
8787
-denormalizationContext: []
8888
}
89-
DUMP
89+
DUMP,
9090
];
9191

9292
yield 'named arguments: with normalization context option' => [
@@ -100,7 +100,7 @@ public static function provideValidInputs(): iterable
100100
]
101101
-denormalizationContext: []
102102
}
103-
DUMP
103+
DUMP,
104104
];
105105

106106
yield 'named arguments: with denormalization context option' => [
@@ -114,7 +114,7 @@ public static function provideValidInputs(): iterable
114114
"foo" => "bar",
115115
]
116116
}
117-
DUMP
117+
DUMP,
118118
];
119119

120120
yield 'named arguments: with groups option as string' => [
@@ -130,7 +130,7 @@ public static function provideValidInputs(): iterable
130130
-normalizationContext: []
131131
-denormalizationContext: []
132132
}
133-
DUMP
133+
DUMP,
134134
];
135135

136136
yield 'named arguments: with groups option as array' => [
@@ -147,7 +147,7 @@ public static function provideValidInputs(): iterable
147147
-normalizationContext: []
148148
-denormalizationContext: []
149149
}
150-
DUMP
150+
DUMP,
151151
];
152152
}
153153
}

0 commit comments

Comments
 (0)