From bee9bfabfa8b4045a66bf82520e492cddbaffa66 Mon Sep 17 00:00:00 2001 From: Maksim Tiugaev Date: Fri, 27 Sep 2024 21:14:25 +0300 Subject: [PATCH] Fix extracting of message from ->trans() method with named params --- Extractor/Visitor/TransMethodVisitor.php | 2 +- Tests/Fixtures/extractor-ast/translation.html.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Extractor/Visitor/TransMethodVisitor.php b/Extractor/Visitor/TransMethodVisitor.php index 011bf3b1..a3dcd6d2 100644 --- a/Extractor/Visitor/TransMethodVisitor.php +++ b/Extractor/Visitor/TransMethodVisitor.php @@ -44,7 +44,7 @@ public function leaveNode(Node $node): ?Node if ('trans' === $name || 't' === $name) { $firstNamedArgumentIndex = $this->nodeFirstNamedArgumentIndex($node); - if (!$messages = $this->getStringArguments($node, 0 < $firstNamedArgumentIndex ? 0 : 'message')) { + if (!$messages = $this->getStringArguments($node, 0 < $firstNamedArgumentIndex ? 0 : 'id')) { return null; } diff --git a/Tests/Fixtures/extractor-ast/translation.html.php b/Tests/Fixtures/extractor-ast/translation.html.php index 68d966bc..ac233fa8 100644 --- a/Tests/Fixtures/extractor-ast/translation.html.php +++ b/Tests/Fixtures/extractor-ast/translation.html.php @@ -46,14 +46,14 @@ trans('default domain', [], null); ?> -trans(message: 'ordered-named-arguments-in-trans-method', parameters: [], domain: 'not_messages'); ?> -trans(domain: 'not_messages', message: 'disordered-named-arguments-in-trans-method', parameters: []); ?> +trans(id: 'ordered-named-arguments-in-trans-method', parameters: [], domain: 'not_messages'); ?> +trans(domain: 'not_messages', id: 'disordered-named-arguments-in-trans-method', parameters: []); ?> trans($key = 'variable-assignation-inlined-in-trans-method-call1', $parameters = [], $domain = 'not_messages'); ?> trans('variable-assignation-inlined-in-trans-method-call2', $parameters = [], $domain = 'not_messages'); ?> trans('variable-assignation-inlined-in-trans-method-call3', [], $domain = 'not_messages'); ?> -trans(domain: $domain = 'not_messages', message: $key = 'variable-assignation-inlined-with-named-arguments-in-trans-method', parameters: $parameters = []); ?> +trans(domain: $domain = 'not_messages', id: $key = 'variable-assignation-inlined-with-named-arguments-in-trans-method', parameters: $parameters = []); ?> trans('mix-named-arguments', parameters: ['foo' => 'bar']); ?> trans('mix-named-arguments-locale', parameters: ['foo' => 'bar'], locale: 'de'); ?>