Use all available methods to detect the attachment extension instead of just one

Author: Webklex

CHANGELOG.md

@@ -6,7 +6,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [UNRELEASED]
 ### Fixed
-- NaN
+- Use all available methods to detect the attachment extension instead of just one
 
 ### Added
 - NaN

src/Attachment.php

@@ -302,21 +302,25 @@ public function getMimeType(): ?string {
  * @return string|null
  */
  public function getExtension(): ?string {
+ $extension = null;
  $guesser = "\Symfony\Component\Mime\MimeTypes";
  if (class_exists($guesser) !== false) {
  /** @var Symfony\Component\Mime\MimeTypes $guesser */
  $extensions = $guesser::getDefault()->getExtensions($this->getMimeType());
- return $extensions[0] ?? null;
+ $extension = $extensions[0] ?? null;
  }
-
- $deprecated_guesser = "\Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser";
- if (class_exists($deprecated_guesser) !== false){
- /** @var \Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser $deprecated_guesser */
- return $deprecated_guesser::getInstance()->guess($this->getMimeType());
+ if ($extension === null) {
+ $deprecated_guesser = "\Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser";
+ if (class_exists($deprecated_guesser) !== false){
+ /** @var \Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser $deprecated_guesser */
+ $extension = $deprecated_guesser::getInstance()->guess($this->getMimeType());
+ }
  }
-
- $extensions = explode(".", $this->part->filename ?: $this->part->name);
- return end($extensions);
+ if ($extension === null) {
+ $extensions = explode(".", $this->filename);
+ $extension = end($extensions);
+ }
+ return $extension;
  }
 
  /**