Skip to content

Commit 0148f46

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 b9f6750 + 9250952 commit 0148f46

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

AbstractRendererEngine.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function setTheme(FormView $view, $themes, bool $useDefaultThemes = true)
6868

6969
// Do not cast, as casting turns objects into arrays of properties
7070
$this->themes[$cacheKey] = \is_array($themes) ? $themes : [$themes];
71-
$this->useDefaultThemes[$cacheKey] = (bool) $useDefaultThemes;
71+
$this->useDefaultThemes[$cacheKey] = $useDefaultThemes;
7272

7373
// Unset instead of resetting to an empty array, in order to allow
7474
// implementations (like TwigRendererEngine) to check whether $cacheKey

FormFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function createNamedBuilder(string $name, string $type = FormType::class,
6666

6767
$type = $this->registry->getType($type);
6868

69-
$builder = $type->createBuilder($this, (string) $name, $options);
69+
$builder = $type->createBuilder($this, $name, $options);
7070

7171
// Explicitly call buildForm() in order to be able to override either
7272
// createBuilder() or buildForm() in the resolved form type

0 commit comments

Comments
 (0)