Skip to content

Commit 4d32d14

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 17fb46a + f9f431f commit 4d32d14

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

Console/Descriptor/TextDescriptor.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ private function renderEventListenerTable(EventDispatcherInterface $eventDispatc
508508
$tableHeaders = ['Order', 'Callable', 'Priority'];
509509
$tableRows = [];
510510

511-
$order = 1;
512511
foreach ($eventListeners as $order => $listener) {
513512
$tableRows[] = [sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
514513
}

Tests/Controller/ControllerTraitTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,7 @@ public function testFileWhichDoesNotExist()
277277
$this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
278278
$controller = $this->createController();
279279

280-
/* @var BinaryFileResponse $response */
281-
$response = $controller->file('some-file.txt', 'test.php');
280+
$controller->file('some-file.txt', 'test.php');
282281
}
283282

284283
public function testIsGranted()

Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class TestExtension extends Extension implements PrependExtensionInterface
2626
public function load(array $configs, ContainerBuilder $container)
2727
{
2828
$configuration = $this->getConfiguration($configs, $container);
29-
$config = $this->processConfiguration($configuration, $configs);
29+
$this->processConfiguration($configuration, $configs);
3030

3131
$container->setAlias('test.annotation_reader', new Alias('annotation_reader', true));
3232
}

Tests/Functional/SessionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function testFlash($config, $insulate)
5959
}
6060

6161
// set flash
62-
$crawler = $client->request('GET', '/session_setflash/Hello%20world.');
62+
$client->request('GET', '/session_setflash/Hello%20world.');
6363

6464
// check flash displays on redirect
6565
$this->assertStringContainsString('Hello world.', $client->followRedirect()->text());

0 commit comments

Comments
 (0)