Skip to content

Commit faed6ad

Browse files
Merge branch '5.3' into 5.4
* 5.3: [Security] Do not overwrite already stored tokens for REMOTE_USER authentication [Validator] Fix validation for single level domains Fix redundant type casts Increased the reserved memory from 10k to 32k [DoctrineBridge] Add DbalLoggerTest to group legacy Leverage DBAL's getNativeConnection() method Fix idempotency of LocoProvider write method
2 parents 578a165 + 0777e9a commit faed6ad

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.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 = []): string
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 = []): string
@@ -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): string
7575
{
76-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
76+
return $this->renderer->searchAndRenderBlock($view, 'help');
7777
}
7878

7979
protected function renderErrors(FormView $view): string
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 = []): string
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 = []): string
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 = []): string
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 = []): string
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 = []): string
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): void

Tests/Extension/FormExtensionBootstrap5LayoutTest.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 = []): string
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 = []): string
@@ -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): string
127127
{
128-
return (string) $this->renderer->searchAndRenderBlock($view, 'help');
128+
return $this->renderer->searchAndRenderBlock($view, 'help');
129129
}
130130

131131
protected function renderErrors(FormView $view): string
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 = []): string
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 = []): string
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 = []): string
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 = []): string
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 = []): string
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): void

0 commit comments

Comments
 (0)