Skip to content

Commit 3cb9263

Browse files
Merge branch '3.4' into 4.3
* 3.4: #30432 fix an error message fix paths to detect code owners [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4 Remove unused local variables in tests Make sure to collect child forms created on *_SET_DATA events do not render errors for checkboxes twice
2 parents 499b3f3 + a2fa4d0 commit 3cb9263

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
@@ -28,7 +28,6 @@ public function compile(Compiler $compiler)
2828

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

31-
$label = null;
3231
$arguments = iterator_to_array($this->getNode('arguments'));
3332
$blockNameSuffix = $matches[1];
3433

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
@@ -58,14 +58,14 @@ public function testTransUnknownKeyword()
5858
{
5959
$this->expectException('Twig\Error\SyntaxError');
6060
$this->expectExceptionMessage('Unexpected token. Twig was looking for the "with", "from", or "into" keyword in "index" at line 3.');
61-
$output = $this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
61+
$this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
6262
}
6363

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

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

8181
public function getTransTests()

0 commit comments

Comments
 (0)