minor #38304 [Translation] Allow Translatable objects to be used as strings (tgalopin)

fabpot · fabpot · commit ffb7f0e36feb · 2020-09-26T07:28:36.000+02:00
This PR was merged into the 5.2-dev branch. Discussion ---------- [Translation] Allow Translatable objects to be used as strings | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Allow Translatable objects to be used as strings. Commits ------- 0ba2064 [Translation] Allow Translatable objects to be used as strings
diff --git a/src/Symfony/Component/Translation/Tests/TranslatableTest.php b/src/Symfony/Component/Translation/Tests/TranslatableTest.php
@@ -27,7 +27,7 @@ public function testTrans($expected, $translatable, $translation, $locale)
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', [$translatable->getMessage() => $translation], $locale, $translatable->getDomain());
 
-        $this->assertEquals($expected, Translatable::trans($translator, $translatable, $locale));
+        $this->assertSame($expected, Translatable::trans($translator, $translatable, $locale));
     }
 
     /**
@@ -39,7 +39,12 @@ public function testFlattenedTrans($expected, $messages, $translatable)
         $translator->addLoader('array', new ArrayLoader());
         $translator->addResource('array', $messages, 'fr', '');
 
-        $this->assertEquals($expected, Translatable::trans($translator, $translatable, 'fr'));
+        $this->assertSame($expected, Translatable::trans($translator, $translatable, 'fr'));
+    }
+
+    public function testToString()
+    {
+        $this->assertSame('Symfony is great!', (string) new Translatable('Symfony is great!'));
     }
 
     public function getTransTests()
diff --git a/src/Symfony/Component/Translation/Translatable.php b/src/Symfony/Component/Translation/Translatable.php
@@ -29,6 +29,11 @@ public function __construct(string $message, array $parameters = [], string $dom
         $this->domain = $domain;
     }
 
+    public function __toString(): string
+    {
+        return $this->message;
+    }
+
     public function getMessage(): string
     {
         return $this->message;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ public function __construct(string $message, array $parameters = [], string $dom`
`29`	`29`	`$this->domain = $domain;`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ public function __toString(): string`
	`33`	`+ {`
	`34`	`+ return $this->message;`
	`35`	`+ }`
	`36`	`+`
`32`	`37`	`public function getMessage(): string`
`33`	`38`	`{`
`34`	`39`	`return $this->message;`