Skip to content

Commit 6874ceb

Browse files
Merge branch '4.3' into 4.4
* 4.3: [OptionsResolve] Revert change in tests for a not-merged change in code [HttpClient] fix handling of 3xx with no Location header - ignore Content-Length when no body is expected [Workflow] Made the configuration more robust for the 'property' key [Security/Core] make NativePasswordEncoder use sodium to validate passwords when possible #30432 fix an error message fix paths to detect code owners [HttpClient] ignore the body of responses to HEAD requests [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4 [SecurityBundle] Fix wrong assertion Remove unused local variables in tests [Yaml][Parser] Remove the getLastLineNumberBeforeDeprecation() internal unused method Make sure to collect child forms created on *_SET_DATA events [WebProfilerBundle] Improve display in Email panel for dark theme do not render errors for checkboxes twice
2 parents f223736 + 3cb9263 commit 6874ceb

File tree

6 files changed

+7
-9
lines changed

6 files changed

+7
-9
lines changed

Node/SearchAndRenderBlockNode.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public function compile(Compiler $compiler)
3333

3434
preg_match('/_([^_]+)$/', $this->getAttribute('name'), $matches);
3535

36-
$label = null;
3736
$arguments = iterator_to_array($this->getNode('arguments'));
3837
$blockNameSuffix = $matches[1];
3938

Resources/views/Form/bootstrap_4_horizontal_layout.html.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ col-sm-10
8282
<div class="{{ block('form_group_class') }}">
8383
{{- form_widget(form) -}}
8484
{{- form_help(form) -}}
85-
{{- form_errors(form) -}}
8685
</div>{#--#}
8786
</div>
8887
{%- endblock checkbox_row %}

Tests/AppVariableTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ public function testGetFlashes()
180180
$flashMessages = $this->setFlashMessages();
181181
$this->assertEquals($flashMessages, $this->appVariable->getFlashes([]));
182182

183-
$flashMessages = $this->setFlashMessages();
183+
$this->setFlashMessages();
184184
$this->assertEquals([], $this->appVariable->getFlashes('this-does-not-exist'));
185185

186-
$flashMessages = $this->setFlashMessages();
186+
$this->setFlashMessages();
187187
$this->assertEquals(
188188
['this-does-not-exist' => []],
189189
$this->appVariable->getFlashes(['this-does-not-exist'])

Tests/Command/LintCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function testLintFileNotReadable()
5252
$filename = $this->createFile('');
5353
unlink($filename);
5454

55-
$ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
55+
$tester->execute(['filename' => [$filename]], ['decorated' => false]);
5656
}
5757

5858
public function testLintFileCompileTimeException()

Tests/Extension/StopwatchExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function testTiming($template, $events)
3434
$twig->addExtension(new StopwatchExtension($this->getStopwatch($events)));
3535

3636
try {
37-
$nodes = $twig->render('template');
37+
$twig->render('template');
3838
} catch (RuntimeError $e) {
3939
throw $e->getPrevious();
4040
}

Tests/Extension/TranslationExtensionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ public function testTransUnknownKeyword()
6060
{
6161
$this->expectException('Twig\Error\SyntaxError');
6262
$this->expectExceptionMessage('Unexpected token. Twig was looking for the "with", "from", or "into" keyword in "index" at line 3.');
63-
$output = $this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
63+
$this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
6464
}
6565

6666
public function testTransComplexBody()
6767
{
6868
$this->expectException('Twig\Error\SyntaxError');
6969
$this->expectExceptionMessage('A message inside a trans tag must be a simple text in "index" at line 2.');
70-
$output = $this->getTemplate("{% trans %}\n{{ 1 + 2 }}{% endtrans %}")->render();
70+
$this->getTemplate("{% trans %}\n{{ 1 + 2 }}{% endtrans %}")->render();
7171
}
7272

7373
/**
@@ -77,7 +77,7 @@ public function testTransChoiceComplexBody()
7777
{
7878
$this->expectException('Twig\Error\SyntaxError');
7979
$this->expectExceptionMessage('A message inside a transchoice tag must be a simple text in "index" at line 2.');
80-
$output = $this->getTemplate("{% transchoice count %}\n{{ 1 + 2 }}{% endtranschoice %}")->render();
80+
$this->getTemplate("{% transchoice count %}\n{{ 1 + 2 }}{% endtranschoice %}")->render();
8181
}
8282

8383
public function getTransTests()

0 commit comments

Comments
 (0)