8000 minor #44274 Fix redundant type casts (fancyweb) · symfony/symfony@7b27c8d · GitHub
[go: up one dir, main page]
Skip to content

Commit 7b27c8d

Browse files
nicolas-grekasnicolas-grekas
committed
minor #44274 Fix redundant type casts (fancyweb)
This PR was merged into the 4.4 branch. Discussion ---------- Fix redundant type casts | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | - | Tickets | - | License | MIT | Doc PR | - Firstly, let's see if the CI is green as I expect it. I'll explain every change with a review comment. Commits ------- e724d5a Fix redundant type casts
2 parents dc04b8c + e724d5a commit 7b27c8d

File tree

23 files changed

+84
-96
lines changed

23 files changed

+84
-96
lines changed

‎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, 'hel F438 p');
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
@@ -298,7 +298,7 @@ public function testHelpHtmlIsTrue()
298298

299299
protected function renderForm(FormView $view, array $vars = [])
300300
{
301-
return (string) $this->renderer->renderBlock($view, 'form', $vars);
301+
return $this->renderer->renderBlock($view, 'form', $vars);
302302
}
303303

304304
protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -307,42 +307,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
307307
$vars += ['label' => $label];
308308
}
309309

310-
return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
310+
return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
311311
}
312312

313313
protected function renderHelp(FormView $view)
314314
{
315-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
315+
return $this->renderer->searchAndRenderBlock($view, 'help');
316316
}
317317

318318
protected function renderErrors(FormView $view)
319319
{
320-
return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
320+
return $this->renderer->searchAndRenderBlock($view, 'errors');
321321
}
322322

323323
protected function renderWidget(FormView $view, array $vars = [])
324324
{
325-
return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
325+
return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
326326
}
327327

328328
protected function renderRow(FormView $view, array $vars = [])
329329
{
330-
return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
330+
return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
331331
}
332332

333333
protected function renderRest(FormView $view, array $vars = [])
334334
{
335-
return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
335+
return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
336336
}
337337

338338
protected function renderStart(FormView $view, array $vars = [])
339339
{
340-
return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
340+
return $this->renderer->renderBlock($view, 'form_start', $vars);
341341
}
342342

343343
protected function renderEnd(FormView $view, array $vars = [])
344344
{
345-
return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
345+
return $this->renderer->renderBlock($view, 'form_end', $vars);
346346
}
347347

348348
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
@@ -184,7 +184,7 @@ public function testHelpHtmlIsTrue()
184184

185185
protected function renderForm(FormView $view, array $vars = [])
186186
{
187-
return (string) $this->renderer->renderBlock($view, 'form', $vars);
187+
return $this->renderer->renderBlock($view, 'form', $vars);
188188
}
189189

190190
protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -193,42 +193,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
193193
$vars += ['label' => $label];
194194
}
195195

196-
return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
196+
return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
197197
}
198198

199199
protected function renderHelp(FormView $view)
200200
{
201-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
201+
return $this->renderer->searchAndRenderBlock($view, 'help');
202202
}
203203

204204
protected function renderErrors(FormView $view)
205205
{
206-
return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
206+
return $this->renderer->searchAndRenderBlock($view, 'errors');
207207
}
208208

209209
protected function renderWidget(FormView $view, array $vars = [])
210210
{
211-
return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
211+
return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
212212
}
213213

214214
protected function renderRow(FormView $view, array $vars = [])
215215
{
216-
return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
216+
return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
217217
}
218218

219219
protected function renderRest(FormView $view, array $vars = [])
220220
{
221-
return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
221+
return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
222222
}
223223

224224
protected function renderStart(FormView $view, array $vars = [])
225225
{
226-
return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
226+
return $this->renderer->renderBlock($view, 'form_start', $vars);
227227
}
228228

229229
protected function renderEnd(FormView $view, array $vars = [])
230230
{
231-
return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
231+
return $this->renderer->renderBlock($view, 'form_end', $vars);
232232
}
233233

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

‎src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testThatRenderLogsTime()
3131
$container = $this->createMock(Container::class);
3232
$templateNameParser = $this->getTemplateNameParser();
3333
$globalVariables = $this->getGlobalVariables();
34-
$loader = $this->getLoader($this->getStorage());
34+
$loader = $this->getLoader(new StringStorage('foo'));
3535

3636
$stopwatch = new Stopwatch();
3737

@@ -60,17 +60,7 @@ private function getGlobalVariables(): GlobalVariables
6060
return $this->createMock(GlobalVariables::class);
6161
}
6262

63-
private function getStorage(): StringStorage
64-
{
65-
return $this->getMockBuilder(StringStorage::class)
66-
->disableOriginalConstructor()
67-
->getMockForAbstractClass();
68-
}
69-
70-
/**
71-
* @param StringStorage $storage
72-
*/
73-
private function getLoader($storage): Loader
63+
private function getLoader(StringStorage $storage): Loader
7464
{
7565
$loader = $this->getMockForAbstractClass(Loader::class);
7666
$loader->expects($this->once())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ private function createExpression(ContainerBuilder $container, string $expressio
730730
private function createRequestMatcher(ContainerBuilder $container, string $path = null, string $host = null, int $port = null, array $methods = [], array $ips = null, array $attributes = []): Reference
731731
{
732732
if ($methods) {
733-
$methods = array_map('strtoupper', (array) $methods);
733+
$methods = array_map('strtoupper', $methods);
734734
}
735735

736736
if (null !== $ips) {

0 commit comments

Comments
 (0)
0