[Mime] Replace ternary by get_debug_type function

alamirault · alamirault · commit d8a0ee1c4a5f · 2022-05-17T21:57:00.000+02:00
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -279,7 +279,7 @@ public function getPriority(): int
     public function text($body, string $charset = 'utf-8')
     {
         if (null !== $body && !\is_string($body) && !\is_resource($body)) {
-            throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', \is_object($body) ? \get_class($body) : \gettype($body)));
+            throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', get_debug_type($body)));
         }
 
         $this->text = $body;
@@ -309,7 +309,7 @@ public function getTextCharset(): ?string
     public function html($body, string $charset = 'utf-8')
     {
         if (null !== $body && !\is_string($body) && !\is_resource($body)) {
-            throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', \is_object($body) ? \get_class($body) : \gettype($body)));
+            throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', get_debug_type($body)));
         }
 
         $this->html = $body;
@@ -339,7 +339,7 @@ public function getHtmlCharset(): ?string
     public function attach($body, string $name = null, string $contentType = null)
     {
         if (!\is_string($body) && !\is_resource($body)) {
-            throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', \is_object($body) ? \get_class($body) : \gettype($body)));
+            throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', get_debug_type($body)));
         }
 
         $this->attachments[] = ['body' => $body, 'name' => $name, 'content-type' => $contentType, 'inline' => false];
@@ -365,7 +365,7 @@ public function attachFromPath(string $path, string $name = null, string $conten
     public function embed($body, string $name = null, string $contentType = null)
     {
         if (!\is_string($body) && !\is_resource($body)) {
-            throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', \is_object($body) ? \get_class($body) : \gettype($body)));
+            throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', get_debug_type($body)));
         }
 
         $this->attachments[] = ['body' => $body, 'name' => $name, 'content-type' => $contentType, 'inline' => true];
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -400,23 +400,23 @@ public function testMissingHeaderDoesNotThrowError()
     public function testAttachBodyExpectStringOrResource()
     {
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessage('The body must be a string or a resource (got "boolean").');
+        $this->expectExceptionMessage('The body must be a string or a resource (got "bool").');
 
         (new Email())->attach(false);
     }
 
     public function testEmbedBodyExpectStringOrResource()
     {
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessage('The body must be a string or a resource (got "boolean").');
+        $this->expectExceptionMessage('The body must be a string or a resource (got "bool").');
 
         (new Email())->embed(false);
     }
 
     public function testHtmlBodyExpectStringOrResourceOrNull()
     {
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessage('The body must be a string, a resource or null (got "boolean").');
+        $this->expectExceptionMessage('The body must be a string, a resource or null (got "bool").');
 
         (new Email())->html(false);
     }
@@ -439,7 +439,7 @@ public function testHtmlBodyAcceptedTypes()
     public function testTextBodyExpectStringOrResourceOrNull()
     {
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessage('The body must be a string, a resource or null (got "boolean").');
+        $this->expectExceptionMessage('The body must be a string, a resource or null (got "bool").');
 
         (new Email())->text(false);
     }

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ public function getPriority(): int`
`279`	`279`	`public function text($body, string $charset = 'utf-8')`
`280`	`280`	`{`
`281`	`281`	`if (null !== $body && !\is_string($body) && !\is_resource($body)) {`
`282`		`- throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', \is_object($body) ? \get_class($body) : \gettype($body)));`
	`282`	`+ throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', get_debug_type($body)));`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`$this->text = $body;`
`@@ -309,7 +309,7 @@ public function getTextCharset(): ?string`
`309`	`309`	`public function html($body, string $charset = 'utf-8')`
`310`	`310`	`{`
`311`	`311`	`if (null !== $body && !\is_string($body) && !\is_resource($body)) {`
`312`		`- throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', \is_object($body) ? \get_class($body) : \gettype($body)));`
	`312`	`+ throw new \TypeError(sprintf('The body must be a string, a resource or null (got "%s").', get_debug_type($body)));`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`$this->html = $body;`
`@@ -339,7 +339,7 @@ public function getHtmlCharset(): ?string`
`339`	`339`	`public function attach($body, string $name = null, string $contentType = null)`
`340`	`340`	`{`
`341`	`341`	`if (!\is_string($body) && !\is_resource($body)) {`
`342`		`- throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', \is_object($body) ? \get_class($body) : \gettype($body)));`
	`342`	`+ throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', get_debug_type($body)));`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`$this->attachments[] = ['body' => $body, 'name' => $name, 'content-type' => $contentType, 'inline' => false];`
`@@ -365,7 +365,7 @@ public function attachFromPath(string $path, string $name = null, string $conten`
`365`	`365`	`public function embed($body, string $name = null, string $contentType = null)`
`366`	`366`	`{`
`367`	`367`	`if (!\is_string($body) && !\is_resource($body)) {`
`368`		`- throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', \is_object($body) ? \get_class($body) : \gettype($body)));`
	`368`	`+ throw new \TypeError(sprintf('The body must be a string or a resource (got "%s").', get_debug_type($body)));`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`$this->attachments[] = ['body' => $body, 'name' => $name, 'content-type' => $contentType, 'inline' => true];`
Original file line number	Diff line number	Diff line change
`@@ -400,23 +400,23 @@ public function testMissingHeaderDoesNotThrowError()`
`400`	`400`	`public function testAttachBodyExpectStringOrResource()`
`401`	`401`	`{`
`402`	`402`	`$this->expectException(\TypeError::class);`
`403`		`- $this->expectExceptionMessage('The body must be a string or a resource (got "boolean").');`
	`403`	`+ $this->expectExceptionMessage('The body must be a string or a resource (got "bool").');`
`404`	`404`
`405`	`405`	`(new Email())->attach(false);`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`public function testEmbedBodyExpectStringOrResource()`
`409`	`409`	`{`
`410`	`410`	`$this->expectException(\TypeError::class);`
`411`		`- $this->expectExceptionMessage('The body must be a string or a resource (got "boolean").');`
	`411`	`+ $this->expectExceptionMessage('The body must be a string or a resource (got "bool").');`
`412`	`412`
`413`	`413`	`(new Email())->embed(false);`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`public function testHtmlBodyExpectStringOrResourceOrNull()`
`417`	`417`	`{`
`418`	`418`	`$this->expectException(\TypeError::class);`
`419`		`- $this->expectExceptionMessage('The body must be a string, a resource or null (got "boolean").');`
	`419`	`+ $this->expectExceptionMessage('The body must be a string, a resource or null (got "bool").');`
`420`	`420`
`421`	`421`	`(new Email())->html(false);`
`422`	`422`	`}`
`@@ -439,7 +439,7 @@ public function testHtmlBodyAcceptedTypes()`
`439`	`439`	`public function testTextBodyExpectStringOrResourceOrNull()`
`440`	`440`	`{`
`441`	`441`	`$this->expectException(\TypeError::class);`
`442`		`- $this->expectExceptionMessage('The body must be a string, a resource or null (got "boolean").');`
	`442`	`+ $this->expectExceptionMessage('The body must be a string, a resource or null (got "bool").');`
`443`	`443`
`444`	`444`	`(new Email())->text(false);`
`445`	`445`	`}`