[Mime] Simplify code

fabpot · fabpot · commit f54ed8b9b60a · 2022-07-22T17:33:44.000+02:00
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -501,16 +501,11 @@ private function prepareParts(): ?array
             $names = array_filter(array_unique($names));
         }
 
-        // usage of reflection is a temporary workaround for missing getters that will be added in 6.2
-        $dispositionRef = new \ReflectionProperty(TextPart::class, 'disposition');
-        $dispositionRef->setAccessible(true);
-        $nameRef = new \ReflectionProperty(TextPart::class, 'name');
-        $nameRef->setAccessible(true);
         $attachmentParts = $inlineParts = [];
         foreach ($this->attachments as $attachment) {
             $part = $this->createDataPart($attachment);
             if (isset($attachment['part'])) {
-                $attachment['name'] = $nameRef->getValue($part);
+                $attachment['name'] = $part->getName();
             }
 
             foreach ($names as $name) {
@@ -527,7 +522,7 @@ private function prepareParts(): ?array
                 break;
             }
 
-            if ('inline' === $dispositionRef->getValue($part)) {
+            if ('inline' === $part->getDisposition()) {
                 $inlineParts[$attachment['name']] = $part;
             } else {
                 $attachmentParts[] = $part;
diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Component/Mime/Part/TextPart.php
@@ -89,6 +89,11 @@ public function setDisposition(string $disposition): static
         return $this;
     }
 
+    public function getDisposition(): ?string
+    {
+        return $this->disposition;
+    }
+
     /**
      * Sets the name of the file (used by FormDataPart).
      *
@@ -102,7 +107,7 @@ public function setName(string $name): static
     }
 
     /**
-     * Gets the name of the file (used by FormDataPart).
+     * Gets the name of the file.
      */
     public function getName(): ?string
     {

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,11 @@ public function setDisposition(string $disposition): static`
`89`	`89`	`return $this;`
`90`	`90`	`}`
`91`	`91`
	`92`	`+ public function getDisposition(): ?string`
	`93`	`+ {`
	`94`	`+ return $this->disposition;`
	`95`	`+ }`
	`96`	`+`
`92`	`97`	`/**`
`93`	`98`	`* Sets the name of the file (used by FormDataPart).`
`94`	`99`	`*`
`@@ -102,7 +107,7 @@ public function setName(string $name): static`
`102`	`107`	`}`
`103`	`108`
`104`	`109`	`/**`
`105`		`- * Gets the name of the file (used by FormDataPart).`
	`110`	`+ * Gets the name of the file.`
`106`	`111`	`*/`
`107`	`112`	`public function getName(): ?string`
`108`	`113`	`{`