Skip to content

Commit dd45a1c

Browse files
Merge branch '7.4' into 8.0
* 7.4: (21 commits) [ObjectMapper] lazy loading [Filesystem] Unify logic for isAbsolute() in Path [DependencyInjection] Include return type in AppReference shape [Finder] Make method calls explicit in ExcludeDirectoryFilterIterator [Cache] Remove unset call on undefined variable in PhpArrayAdapter [Twig] Ensure WrappedTemplatedEmail::getReturnPath() returns a string [Routing] Simplify importing routes defined on controller services Fix tests [DependendcyInjection] Improve shape for "from_callable" definitions [PHPDoc] Fix various PHPDoc syntax errors [Console] Add missing VERBOSITY_SILENT case in CommandDataCollector [Notifier] Remove unused $transportName argument in EmailChannel::notify() [Translation] Remove an unused argument passed to parseNode() method [HttpClient] Reject 3xx pushed responses [Serializer] Use Asia/Tokyo instead of Japan in tests [ProxyManagerBridge] Remove comment that reference github discussion [JsonPath] Remove unused "nothing" property from JsonCrawler [ErrorHandler] Improve PHPDoc precision in SerializerErrorRenderer [Routing] Fix matching the "0" URL [Form] Fix EnumType choice_label logic for grouped choices ...
2 parents 58e9ab8 + 125608d commit dd45a1c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Command/TranslationLintCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7070
{
7171
$locales = $input->getOption('locale');
7272

73-
/** @var array<string, array<string, array<string, \Throwable>> $errors */
73+
/** @var array<string, array<string, array<string, \Throwable>>> $errors */
7474
$errors = [];
7575
$domainsByLocales = [];
7676

PseudoLocalizationTranslator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ private function parseNode(\DOMNode $node): array
183183

184184
$parts[] = [false, false, '>'];
185185

186-
$parts = array_merge($parts, $this->parseNode($childNode, $parts));
186+
$parts = array_merge($parts, $this->parseNode($childNode));
187187

188188
$parts[] = [false, false, '</'.$childNode->tagName.'>'];
189189
}

0 commit comments

Comments
 (0)