Skip to content

Commit 61efc93

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 1ffda1f + 3ef7cb7 commit 61efc93

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Form/Type/DoctrineType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static function createChoiceLabel(object $choice): string
7575
*/
7676
public static function createChoiceName(object $choice, $key, string $value): string
7777
{
78-
return str_replace('-', '_', (string) $value);
78+
return str_replace('-', '_', $value);
7979
}
8080

8181
/**

Tests/Logger/DbalLoggerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
use Psr\Log\LoggerInterface;
1616
use Symfony\Bridge\Doctrine\Logger\DbalLogger;
1717

18+
/**
19+
* @group legacy
20+
*/
1821
class DbalLoggerTest extends TestCase
1922
{
2023
/**
@@ -46,8 +49,8 @@ public function getLogFixtures()
4649
['SQL', null, []],
4750
['SQL', [], []],
4851
['SQL', ['foo' => 'bar'], ['foo' => 'bar']],
49-
['SQL', ['foo' => "\x7F\xFF"], ['foo' => DbalLogger::BINARY_DATA_VALUE]],
50-
['SQL', ['foo' => "bar\x7F\xFF"], ['foo' => DbalLogger::BINARY_DATA_VALUE]],
52+
['SQL', ['foo' => "\x7F\xFF"], ['foo' => '(binary value)']],
53+
['SQL', ['foo' => "bar\x7F\xFF"], ['foo' => '(binary value)']],
5154
['SQL', ['foo' => ''], ['foo' => '']],
5255
];
5356
}

0 commit comments

Comments
 (0)