Skip to content

Commit 288752a

Browse files
Merge branch '4.4'
* 4.4: [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 [FrameworkBundle] make SodiumVault report bad decryption key accurately cs fix [Security] Allow to set a fixed algorithm [Security/Core] make encodedLength computation more generic [Security/Core] add fast path when encoded password cannot match anything #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 e7a1bd1 + 9a64a69 commit 288752a

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

Console/Descriptor/TextDescriptor.php

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

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

Secrets/SodiumVault.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,13 @@ public function reveal(string $name): ?string
115115
return null;
116116
}
117117

118-
return sodium_crypto_box_seal_open(include $file, $this->decryptionKey);
118+
if (false === $value = sodium_crypto_box_seal_open(include $file, $this->decryptionKey)) {
119+
$this->lastMessage = sprintf('Secrets cannot be revealed as the wrong decryption key was provided for "%s".', $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
120+
121+
return null;
122+
}
123+
124+
return $value;
119125
}
120126

121127
public function remove(string $name): bool

Tests/Controller/AbstractControllerTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,7 @@ public function testFileWhichDoesNotExist()
336336

337337
$controller = $this->createController();
338338

339-
/* @var BinaryFileResponse $response */
340-
$response = $controller->file('some-file.txt', 'test.php');
339+
$controller->file('some-file.txt', 'test.php');
341340
}
342341

343342
public function testIsGranted()

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

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

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

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)