Rename messageId to message

Nate Wiebe · Nate Wiebe · commit e08aebb4f57d · 2020-08-28T09:21:27.000-04:00
diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -111,7 +111,7 @@ public function trans($message, array $arguments = [], string $domain = null, st
         if ($message instanceof Translatable) {
             $arguments += $message->getParameters();
             $domain = $message->getDomain();
-            $message = $message->getMessageId();
+            $message = $message->getMessage();
         }
 
         if (null !== $count) {
@@ -121,8 +121,8 @@ public function trans($message, array $arguments = [], string $domain = null, st
         return $this->getTranslator()->trans($message, $arguments, $domain, $locale);
     }
 
-    public function createTranslatable(string $messageId, array $parameters = [], string $domain = 'messages'): Translatable
+    public function createTranslatable(string $message, array $parameters = [], string $domain = 'messages'): Translatable
     {
-        return new Translatable($messageId, $parameters, $domain);
+        return new Translatable($message, $parameters, $domain);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -77,7 +77,7 @@ protected function doEnterNode(Node $node, Environment $env): Node
 
             if ($nodeArguments->getIterator()->current() instanceof ConstantExpression) {
                 $this->messages[] = [
-                    $this->getReadMessageIdFromArguments($nodeArguments, 0),
+                    $this->getReadMessageFromArguments($nodeArguments, 0),
                     $this->getReadDomainFromArguments($nodeArguments, 2),
                 ];
             }
@@ -118,7 +118,7 @@ public function getPriority(): int
         return 0;
     }
 
-    private function getReadMessageIdFromArguments(Node $arguments, int $index): ?string
+    private function getReadMessageFromArguments(Node $arguments, int $index): ?string
     {
         if ($arguments->hasNode('message')) {
             $argument = $arguments->getNode('message');
@@ -128,10 +128,10 @@ private function getReadMessageIdFromArguments(Node $arguments, int $index): ?st
             return null;
         }
 
-        return $this->getReadMessageIdFromNode($argument);
+        return $this->getReadMessageFromNode($argument);
     }
 
-    private function getReadMessageIdFromNode(Node $node): ?string
+    private function getReadMessageFromNode(Node $node): ?string
     {
         if ($node instanceof ConstantExpression) {
             return $node->getAttribute('value');
diff --git a/src/Symfony/Component/Translation/Resources/functions/translatable.php b/src/Symfony/Component/Translation/Resources/functions/translatable.php
@@ -15,8 +15,8 @@
     /**
      * @author Nate Wiebe <nate@northern.co>
      */
-    function t(string $messageId, array $parameters = [], string $domain = 'messages'): Translatable
+    function t(string $message, array $parameters = [], string $domain = 'messages'): Translatable
     {
-        return new Translatable($messageId, $parameters, $domain);
+        return new Translatable($message, $parameters, $domain);
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/TranslatableTest.php b/src/Symfony/Component/Translation/Tests/TranslatableTest.php
@@ -25,7 +25,7 @@ public function testTrans($expected, $translatable, $translation, $locale)
     {
         $translator = new Translator('en');
         $translator->addLoader('array', new ArrayLoader());
-        $translator->addResource('array', [$translatable->getMessageId() => $translation], $locale, $translatable->getDomain());
+        $translator->addResource('array', [$translatable->getMessage() => $translation], $locale, $translatable->getDomain());
 
         $this->assertEquals($expected, Translatable::trans($translator, $translatable, $locale));
     }
diff --git a/src/Symfony/Component/Translation/Translatable.php b/src/Symfony/Component/Translation/Translatable.php
@@ -21,20 +21,20 @@
  */
 final class Translatable
 {
-    private $messageId;
+    private $message;
     private $parameters;
     private $domain;
 
-    public function __construct(string $messageId, array $parameters = [], string $domain = 'messages')
+    public function __construct(string $message, array $parameters = [], string $domain = 'messages')
     {
-        $this->messageId = $messageId;
+        $this->message = $message;
         $this->parameters = $parameters;
         $this->domain = $domain;
     }
 
-    public function getMessageId(): string
+    public function getMessage(): string
     {
-        return $this->messageId;
+        return $this->message;
     }
 
     public function getParameters(): array
@@ -49,6 +49,6 @@ public function getDomain(): string
 
     public static function trans(TranslatorInterface $translator, self $translatable, ?string $locale = null): string
     {
-        return $translator->trans($translatable->getMessageId(), $translatable->getParameters(), $translatable->getDomain(), $locale);
+        return $translator->trans($translatable->getMessage(), $translatable->getParameters(), $translatable->getDomain(), $locale);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function trans($message, array $arguments = [], string $domain = null, st`
`111`	`111`	`if ($message instanceof Translatable) {`
`112`	`112`	`$arguments += $message->getParameters();`
`113`	`113`	`$domain = $message->getDomain();`
`114`		`- $message = $message->getMessageId();`
	`114`	`+ $message = $message->getMessage();`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`if (null !== $count) {`
`@@ -121,8 +121,8 @@ public function trans($message, array $arguments = [], string $domain = null, st`
`121`	`121`	`return $this->getTranslator()->trans($message, $arguments, $domain, $locale);`
`122`	`122`	`}`
`123`	`123`
`124`		`- public function createTranslatable(string $messageId, array $parameters = [], string $domain = 'messages'): Translatable`
	`124`	`+ public function createTranslatable(string $message, array $parameters = [], string $domain = 'messages'): Translatable`
`125`	`125`	`{`
`126`		`- return new Translatable($messageId, $parameters, $domain);`
	`126`	`+ return new Translatable($message, $parameters, $domain);`
`127`	`127`	`}`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ protected function doEnterNode(Node $node, Environment $env): Node`
`77`	`77`
`78`	`78`	`if ($nodeArguments->getIterator()->current() instanceof ConstantExpression) {`
`79`	`79`	`$this->messages[] = [`
`80`		`- $this->getReadMessageIdFromArguments($nodeArguments, 0),`
	`80`	`+ $this->getReadMessageFromArguments($nodeArguments, 0),`
`81`	`81`	`$this->getReadDomainFromArguments($nodeArguments, 2),`
`82`	`82`	`];`
`83`	`83`	`}`
`@@ -118,7 +118,7 @@ public function getPriority(): int`
`118`	`118`	`return 0;`
`119`	`119`	`}`
`120`	`120`
`121`		`- private function getReadMessageIdFromArguments(Node $arguments, int $index): ?string`
	`121`	`+ private function getReadMessageFromArguments(Node $arguments, int $index): ?string`
`122`	`122`	`{`
`123`	`123`	`if ($arguments->hasNode('message')) {`
`124`	`124`	`$argument = $arguments->getNode('message');`
`@@ -128,10 +128,10 @@ private function getReadMessageIdFromArguments(Node $arguments, int $index): ?st`
`128`	`128`	`return null;`
`129`	`129`	`}`
`130`	`130`
`131`		`- return $this->getReadMessageIdFromNode($argument);`
	`131`	`+ return $this->getReadMessageFromNode($argument);`
`132`	`132`	`}`
`133`	`133`
`134`		`- private function getReadMessageIdFromNode(Node $node): ?string`
	`134`	`+ private function getReadMessageFromNode(Node $node): ?string`
`135`	`135`	`{`
`136`	`136`	`if ($node instanceof ConstantExpression) {`
`137`	`137`	`return $node->getAttribute('value');`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`/**`
`16`	`16`	`* @author Nate Wiebe <nate@northern.co>`
`17`	`17`	`*/`
`18`		`- function t(string $messageId, array $parameters = [], string $domain = 'messages'): Translatable`
	`18`	`+ function t(string $message, array $parameters = [], string $domain = 'messages'): Translatable`
`19`	`19`	`{`
`20`		`- return new Translatable($messageId, $parameters, $domain);`
	`20`	`+ return new Translatable($message, $parameters, $domain);`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function testTrans($expected, $translatable, $translation, $locale)`
`25`	`25`	`{`
`26`	`26`	`$translator = new Translator('en');`
`27`	`27`	`$translator->addLoader('array', new ArrayLoader());`
`28`		`- $translator->addResource('array', [$translatable->getMessageId() => $translation], $locale, $translatable->getDomain());`
	`28`	`+ $translator->addResource('array', [$translatable->getMessage() => $translation], $locale, $translatable->getDomain());`
`29`	`29`
`30`	`30`	`$this->assertEquals($expected, Translatable::trans($translator, $translatable, $locale));`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,20 +21,20 @@`
`21`	`21`	`*/`
`22`	`22`	`final class Translatable`
`23`	`23`	`{`
`24`		`- private $messageId;`
	`24`	`+ private $message;`
`25`	`25`	`private $parameters;`
`26`	`26`	`private $domain;`
`27`	`27`
`28`		`- public function __construct(string $messageId, array $parameters = [], string $domain = 'messages')`
	`28`	`+ public function __construct(string $message, array $parameters = [], string $domain = 'messages')`
`29`	`29`	`{`
`30`		`- $this->messageId = $messageId;`
	`30`	`+ $this->message = $message;`
`31`	`31`	`$this->parameters = $parameters;`
`32`	`32`	`$this->domain = $domain;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function getMessageId(): string`
	`35`	`+ public function getMessage(): string`
`36`	`36`	`{`
`37`		`- return $this->messageId;`
	`37`	`+ return $this->message;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public function getParameters(): array`
`@@ -49,6 +49,6 @@ public function getDomain(): string`
`49`	`49`
`50`	`50`	`public static function trans(TranslatorInterface $translator, self $translatable, ?string $locale = null): string`
`51`	`51`	`{`
`52`		`- return $translator->trans($translatable->getMessageId(), $translatable->getParameters(), $translatable->getDomain(), $locale);`
	`52`	`+ return $translator->trans($translatable->getMessage(), $translatable->getParameters(), $translatable->getDomain(), $locale);`
`53`	`53`	`}`
`54`	`54`	`}`