symfony
diff --git a/‎src/Symfony/Component/Mime/Part/TextPart.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Part/TextPart.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Mime/Part/TextPart.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Part/TextPart.php
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Mime/Tests/Part/TextPartTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Tests/Part/TextPartTest.php
+13-5Lines changed: 13 additions & 5 deletions b/‎src/Symfony/Component/Mime/Tests/Part/TextPartTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Tests/Part/TextPartTest.php
+13-5Lines changed: 13 additions & 5 deletions
@@ -220,13 +220,13 @@ private function getEncoder(): ContentEncoderInterface
         return self::$encoders[$this->encoding];
     }
 
-    public static function addEncoder(string $name, ContentEncoderInterface $encoder): void
+    public static function addEncoder(ContentEncoderInterface $encoder): void
     {
-        if (\in_array($name, self::DEFAULT_ENCODERS, true)) {
+        if (\in_array($encoder->getName(), self::DEFAULT_ENCODERS, true)) {
             throw new InvalidArgumentException('You are not allowed to change the default encoders ("quoted-printable", "base64", and "8bit").');
         }
 
-        self::$encoders[$name] = $encoder;
+        self::$encoders[$encoder->getName()] = $encoder;
     }
 
     private function chooseEncoding(): string
 
@@ -103,21 +103,29 @@ public function testEncoding()
     public function testCustomEncoderNeedsToRegisterFirst()
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The encoding must be one of "quoted-printable", "base64", "8bit", "exception_test" ("upper_encoder" given).');
-        TextPart::addEncoder('exception_test', $this->createMock(ContentEncoderInterface::class));
-        new TextPart('content', 'utf-8', 'plain', 'upper_encoder');
+        $this->expectExceptionMessage('The encoding must be one of "quoted-printable", "base64", "8bit", "upper_encoder" ("this_encoding_does_not_exist" given).');
+
+        $upperEncoder = $this->createMock(ContentEncoderInterface::class);
+        $upperEncoder->method('getName')->willReturn('upper_encoder');
+
+        TextPart::addEncoder($upperEncoder);
+        new TextPart('content', 'utf-8', 'plain', 'this_encoding_does_not_exist');
     }
 
     public function testOverwriteDefaultEncoder()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('You are not allowed to change the default encoders ("quoted-printable", "base64", and "8bit").');
-        TextPart::addEncoder('8bit', $this->createMock(ContentEncoderInterface::class));
+
+        $base64Encoder = $this->createMock(ContentEncoderInterface::class);
+        $base64Encoder->method('getName')->willReturn('base64');
+
+        TextPart::addEncoder($base64Encoder);
     }
 
     public function testCustomEncoding()
     {
-        TextPart::addEncoder('upper_encoder', new class implements ContentEncoderInterface {
+        TextPart::addEncoder(new class implements ContentEncoderInterface {
             public function encodeByteStream($stream, int $maxLineLength = 0): iterable
             {
                 $filter = stream_filter_append($stream, 'string.toupper', \STREAM_FILTER_READ);
Original file line number	Diff line number	Diff line change
`@@ -220,13 +220,13 @@ private function getEncoder(): ContentEncoderInterface`
`220`	`220`	`return self::$encoders[$this->encoding];`
`221`	`221`	`}`
`222`	`222`
`223`		`- public static function addEncoder(string $name, ContentEncoderInterface $encoder): void`
	`223`	`+ public static function addEncoder(ContentEncoderInterface $encoder): void`
`224`	`224`	`{`
`225`		`- if (\in_array($name, self::DEFAULT_ENCODERS, true)) {`
	`225`	`+ if (\in_array($encoder->getName(), self::DEFAULT_ENCODERS, true)) {`
`226`	`226`	`throw new InvalidArgumentException('You are not allowed to change the default encoders ("quoted-printable", "base64", and "8bit").');`
`227`	`227`	`}`
`228`	`228`
`229`		`- self::$encoders[$name] = $encoder;`
	`229`	`+ self::$encoders[$encoder->getName()] = $encoder;`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`private function chooseEncoding(): string`
Original file line number	Diff line number	Diff line change
`@@ -103,21 +103,29 @@ public function testEncoding()`
`103`	`103`	`public function testCustomEncoderNeedsToRegisterFirst()`
`104`	`104`	`{`
`105`	`105`	`$this->expectException(InvalidArgumentException::class);`
`106`		`- $this->expectExceptionMessage('The encoding must be one of "quoted-printable", "base64", "8bit", "exception_test" ("upper_encoder" given).');`
`107`		`- TextPart::addEncoder('exception_test', $this->createMock(ContentEncoderInterface::class));`
`108`		`- new TextPart('content', 'utf-8', 'plain', 'upper_encoder');`
	`106`	`+ $this->expectExceptionMessage('The encoding must be one of "quoted-printable", "base64", "8bit", "upper_encoder" ("this_encoding_does_not_exist" given).');`
	`107`	`+`
	`108`	`+ $upperEncoder = $this->createMock(ContentEncoderInterface::class);`
	`109`	`+ $upperEncoder->method('getName')->willReturn('upper_encoder');`
	`110`	`+`
	`111`	`+ TextPart::addEncoder($upperEncoder);`
	`112`	`+ new TextPart('content', 'utf-8', 'plain', 'this_encoding_does_not_exist');`
`109`	`113`	`}`
`110`	`114`
`111`	`115`	`public function testOverwriteDefaultEncoder()`
`112`	`116`	`{`
`113`	`117`	`$this->expectException(InvalidArgumentException::class);`
`114`	`118`	`$this->expectExceptionMessage('You are not allowed to change the default encoders ("quoted-printable", "base64", and "8bit").');`
`115`		`- TextPart::addEncoder('8bit', $this->createMock(ContentEncoderInterface::class));`
	`119`	`+`
	`120`	`+ $base64Encoder = $this->createMock(ContentEncoderInterface::class);`
	`121`	`+ $base64Encoder->method('getName')->willReturn('base64');`
	`122`	`+`
	`123`	`+ TextPart::addEncoder($base64Encoder);`
`116`	`124`	`}`
`117`	`125`
`118`	`126`	`public function testCustomEncoding()`
`119`	`127`	`{`
`120`		`- TextPart::addEncoder('upper_encoder', new class implements ContentEncoderInterface {`
	`128`	`+ TextPart::addEncoder(new class implements ContentEncoderInterface {`
`121`	`129`	`public function encodeByteStream($stream, int $maxLineLength = 0): iterable`
`122`	`130`	`{`
`123`	`131`	`$filter = stream_filter_append($stream, 'string.toupper', \STREAM_FILTER_READ);`