Skip to content

Commit 887be66

Browse files
Merge branch '4.3' into 4.4
* 4.3: (26 commits) Fix Twig 1.x compatibility [Translator] Improve farsi(persian) translations for Form Improve fa translations Spell "triggering" properly Added tests to cover the possibility of having scalars as services. fixed tests on old PHP versions [FrameworkBundle] Inform the user when save_path will be ignored fixed CS [SecurityBundle] Fix profiler dump for non-invokable security listeners fixed CS [Messenger] Doctrine Transport: Support setting auto_setup from DSN [Translator] Load plurals from po files properly [Serializer]: AbstractObjectNormalizer ignores the property types of discriminated classes [EventDispatcher] Add tag kernel.rest on 'debug.event_dispatcher' service [Console] Update to inherit and add licence Add missing test for workflow dump description [Intl] Remove --dev from intl compile autoloader [Messenger] fix publishing headers set on AmqpStamp Remove call to deprecated method [Intl] Init compile tmp volume ...
2 parents 030b536 + 4e53a5e commit 887be66

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DataCollector/LoggerDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private function getContainerDeprecationLogs()
149149
return $logs;
150150
}
151151

152-
private function getContainerCompilerLogs(?string $compilerLogsFilepath = null): array
152+
private function getContainerCompilerLogs(string $compilerLogsFilepath = null): array
153153
{
154154
if (!file_exists($compilerLogsFilepath)) {
155155
return [];

EventListener/LocaleAwareListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static function getSubscribedEvents()
6363
];
6464
}
6565

66-
private function setLocale(string $locale, ?string $defaultLocale = null): void
66+
private function setLocale(string $locale, string $defaultLocale = null): void
6767
{
6868
foreach ($this->localeAwareServices as $service) {
6969
try {

0 commit comments

Comments
 (0)