8000 Merge branch '5.3' into 5.4 · symfony/symfony@f43a1ac · GitHub
[go: up one dir, main page]
Skip to content

Commit f43a1ac

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.3' into 5.4
* 5.3: [Process] intersect with getenv() in case-insensitive manner to get default envs [Serializer] fix support for lazy/unset properties Fix redundant type casts [Notifier] Fix AllMySms bridge body content Revert "[DoctrineBridge] add support for the JSON type"
2 parents 4e7e429 + c143be5 commit f43a1ac

File tree

27 files changed

+101
-91
lines changed

27 files changed

+101
-91
lines changed

‎src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ public function getTypes(string $class, string $property, array $context = [])
168168
switch ($typeOfField) {
169169
case Types::ARRAY:
170170
case 'json_array':
171-
case 'json':
172171
return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
173172

174173
case Types::SIMPLE_ARRAY:
@@ -283,7 +282,6 @@ private function getPhpType(string $doctrineType): ?string
283282
case Types::ARRAY:
284283
case Types::SIMPLE_ARRAY:
285284
case 'json_array':
286-
case 'json':
287285
return Type::BUILTIN_TYPE_ARRAY;
288286
}
289287

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public function typesProvider()
207207
new Type(Type::BUILTIN_TYPE_INT),
208208
new Type(Type::BUILTIN_TYPE_OBJECT, false, DoctrineRelation::class)
209209
)]],
210-
['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]],
210+
['json', null],
211211
];
212212

213213
return $provider;

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected function setUp(): void
5757

5858
protected function renderForm(FormView $view, array $vars = [])
5959
{
60-
return (string) $this->renderer->renderBlock($view, 'form', $vars);
60+
return $this->renderer->renderBlock($view, 'form', $vars);
6161
}
6262

6363
protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -66,42 +66,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
6666
$vars += ['label' => $label];
6767
}
6868

69-
return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
69+
return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
7070
}
7171

7272
protected function renderHelp(FormView $view)
7373
{
74-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
74+
return $this->renderer->searchAndRenderBlock($view, 'help');
7575
}
7676

7777
protected function renderErrors(FormView $view)
7878
{
79-
return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
79+
return $this->renderer->searchAndRenderBlock($view, 'errors');
8080
}
8181

8282
protected function renderWidget(FormView $view, array $vars = [])
8383
{
84-
return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
84+
return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
8585
}
8686

8787
protected function renderRow(FormView $view, array $vars = [])
8888
{
89-
return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
89+
return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
9090
}
9191

9292
protected function renderRest(FormView $view, array $vars = [])
9393
{
94-
return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
94+
return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
9595
}
9696

9797
protected function renderStart(FormView $view, array $vars = [])
9898
{
99-
return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
99+
return $this->renderer->renderBlock($view, 'form_start', $vars);
100100
}
101101

102102
protected function renderEnd(FormView $view, array $vars = [])
103103
{
104-
return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
104+
return $this->renderer->renderBlock($view, 'form_end', $vars);
105105
}
106106

107107
protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function testMoneyWidgetInIso()
107107

108108
protected function renderForm(FormView $view, array $vars = [])
109109
{
110-
return (string) $this->renderer->renderBlock($view, 'form', $vars);
110+
return $this->renderer->renderBlock($view, 'form', $vars);
111111
}
112112

113113
protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -116,42 +116,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
116116
$vars += ['label' => $label];
117117
}
118118

119-
return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
119+
return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
120120
}
121121

122122
protected function renderHelp(FormView $view)
123123
{
124-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
124+
return $this->renderer->searchAndRenderBlock($view, 'help');
125125
}
126126

127127
protected function renderErrors(FormView $view)
128128
{
129-
return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
129+
return $this->renderer->searchAndRenderBlock($view, 'errors');
130130
}
131131

132132
protected function renderWidget(FormView $view, array $vars = [])
133133
{
134-
return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
134+
return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
135135
}
136136

137137
protected function renderRow(FormView $view, array $vars = [])
138138
{
139-
return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
139+
return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
140140
}
141141

142142
protected function renderRest(FormView $view, array $vars = [])
143143
{
144-
return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
144+
return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
145145
}
146146

147147
protected function renderStart(FormView $view, array $vars = [])
148148
{
149-
return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
149+
return $this->renderer->renderBlock($view, 'form_start', $vars);
150150
}
151151

152152
protected function renderEnd(FormView $view, array $vars = [])
153153
{
154-
return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
154+
return $this->renderer->renderBlock($view, 'form_end', $vars);
155155
}
156156

157157
protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function setUp(): void
5959

6060
protected function renderForm(FormView $view, array $vars = [])
6161
{
62-
return (string) $this->renderer->renderBlock($view, 'form', $vars);
62+
return $this->renderer->renderBlock($view, 'form', $vars);
6363
}
6464

6565
protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -68,42 +68,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
6868
$vars += ['label' => $label];
6969
}
7070

71-
return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
71+
return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
7272
}
7373

7474
protected function renderHelp(FormView $view)
7575
{
76-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
76+
return $this->renderer->searchAndRenderBlock($view, 'help');
7777
}
7878

7979
protected function renderErrors(FormView $view)
8080
{
81-
return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
81+
return $this->renderer->searchAndRenderBlock($view, 'errors');
8282
}
8383

8484
protected function renderWidget(FormView $view, array $vars = [])
8585
{
86-
return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
86+
return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
8787
}
8888

8989
protected function renderRow(FormView $view, array $vars = [])
9090
{
91-
return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
91+
return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
9292
}
9393

9494
protected function renderRest(FormView $view, array $vars = [])
9595
{
96-
return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
96+
return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
9797
}
9898

9999
protected function renderStart(FormView $view, array $vars = [])
100100
{
101-
return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
101+
return $this->renderer->renderBlock($view, 'form_start', $vars);
102102
}
103103

104104
protected function renderEnd(FormView $view, array $vars = [])
105105
{
106-
return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
106+
return $this->renderer->renderBlock($view, 'form_end', $vars);
107107
}
108108

109109
protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function testMoneyWidgetInIso()
111111

112112
protected function renderForm(FormView $view, array $vars = [])
113113
{
114-
return (string) $this->renderer->renderBlock($view, 'form', $vars);
114+
return $this->renderer->renderBlock($view, 'form', $vars);
115115
}
116116

117117
protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -120,42 +120,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
120120
$vars += ['label' => $label];
121121
}
122122

123-
return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
123+
return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
124124
}
125125

126126
protected function renderHelp(FormView $view)
127127
{
128-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
128+
return $this->renderer->searchAndRenderBlock($view, 'help');
129129
}
130130

131131
protected function renderErrors(FormView $view)
132132
{
133-
return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
133+
return $this->renderer->searchAndRenderBlock($view, 'errors');
134134
}
135135

136136
protected function renderWidget(FormView $view, array $vars = [])
137137
{
138-
return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
138+
return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
139139
}
140140

141141
protected function renderRow(FormView $view, array $vars = [])
142142
{
143-
return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
143+
return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
144144
}
145145

146146
protected function renderRest(FormView $view, array $vars = [])
147147
{
148-
return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
148+
return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
149149
}
150150

151151
protected function renderStart(FormView $view, array $vars = [])
152152
{
153-
return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
153+
return $this->renderer->renderBlock($view, 'form_start', $vars);
154154
}
155155

156156
protected function renderEnd(FormView $view, array $vars = [])
157157
{
158-
return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
158+
return $this->renderer->renderBlock($view, 'form_end', $vars);
159159
}
160160

161161
protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public function testLabelHtmlIsTrue()
331331

332332
protected function renderForm(FormView $view, array $vars = [])
333333
{
334-
return (string) $this->renderer->renderBlock($view, 'form', $vars);
334+
return $this->renderer->renderBlock($view, 'form', $vars);
335335
}
336336

337337
protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -340,42 +340,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
340340
$vars += ['label' => $label];
341341
}
342342

343-
return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
343+
return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
344344
}
345345

346346
protected function renderHelp(FormView $view)
347347
{
348-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
348+
return $this->renderer->searchAndRenderBlock($view, 'help');
349349
}
350350

351351
protected function renderErrors(FormView $view)
352352
{
353-
return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
353+
return $this->renderer->searchAndRenderBlock($view, 'errors');
354354
}
355355

356356
protected function renderWidget(FormView $view, array $vars = [])
357357
{
358-
return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
358+
return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
359359
}
360360

361361
protected function renderRow(FormView $view, array $vars = [])
362362
{
363-
return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
363+
return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
364364
}
365365

366366
protected function renderRest(FormView $view, array $vars = [])
367367
{
368-
return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
368+
return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
369369
}
370370

371371
protected function renderStart(FormView $view, array $vars = [])
372372
{
373-
return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
373+
return $this->renderer->renderBlock($view, 'form_start', $vars);
374374
}
375375

376376
protected function renderEnd(FormView $view, array $vars = [])
377377
{
378-
return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
378+
return $this->renderer->renderBlock($view, 'form_end', $vars);
379379
}
380380

381381
protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)

‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public function testLabelHtmlIsTrue()
217217

218218
protected function renderForm(FormView $view, array $vars = [])
219219
{
220-
return (string) $this->renderer->renderBlock($view, 'form', $vars);
220+
return $this->renderer->renderBlock($view, 'form', $vars);
221221
}
222222

223223
protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -226,42 +226,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
226226
$vars += ['label' => $label];
227227
}
228228

229-
return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
229+
return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
230230
}
231231

232232
protected function renderHelp(FormView $view)
233233
{
234-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
234+
return $this->renderer->searchAndRenderBlock($view, 'help');
235235
}
236236

237237
protected function renderErrors(FormView $view)
238238
{
239-
return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
239+
return $this->renderer->searchAndRenderBlock($view, 'errors');
240240
}
241241

242242
protected function renderWidget(FormView $view, array $vars = [])
243243
{
244-
return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
244+
return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
245245
}
246246

247247
protected function renderRow(FormView $view, array $vars = [])
248248
{
249-
return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
249+
return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
250250
}
251251

252252
protected function renderRest(FormView $view, array $vars = [])
253253
{
254-
return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
254+
return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
255255
}
256256

257257
protected function renderStart(FormView $view, array $vars = [])
258258
{
259-
return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
259+
return $this->renderer->renderBlock($view, 'form_start', $vars);
260260
}
261261

262262
protected function renderEnd(FormView $view, array $vars = [])
263263
{
264-
return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
264+
return $this->renderer->renderBlock($view, 'form_end', $vars);
265265
}
266266

267267
protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ private function createExpression(ContainerBuilder $container, string $expressio
10591059
private function createRequestMatcher(ContainerBuilder $container, string $path = null, string $host = null, int $port = null, array $methods = [], array $ips = null, array $attributes = []): Reference
10601060
{
10611061
if ($methods) {
1062-
$methods = array_map('strtoupper', (array) $methods);
1062+
$methods = array_map('strtoupper', $methods);
10631063
}
10641064

10651065
if (null !== $ips) {

0 commit comments

Comments
 (0)
0