MQE-2207: merge 3.0.0-GA release branch to master

Author: jilu1

CHANGELOG.md

@@ -97,12 +97,6 @@ Magento Functional Testing Framework Changelog
 2.6.3
 -----
 
-### Fixes
-* added dependency to packages MFTF used but never specified in composer.json
-
-2.6.3
------
-
 ### New Feature
 * `--filter` option was added to `bin/mftf generate:tests` command. For more details please go to https://devdocs.magento.com/mftf/docs/commands/mftf.html#generatetests
 

composer.json

@@ -30,6 +30,7 @@
         "spomky-labs/otphp": "^10.0",
         "symfony/console": "^4.4",
         "symfony/finder": "^5.0",
+        "symfony/http-foundation": "^5.0",
         "symfony/mime": "^5.0",
         "symfony/process": "^4.4",
         "vlucas/phpdotenv": "^2.4",

composer.lock

@@ -6,7 +6,8 @@
  */
 namespace Magento\FunctionalTestingFramework\Allure\Event;
 
-use Symfony\Component\Mime\MimeTypes;
+use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 use Yandex\Allure\Adapter\AllureException;
 use Yandex\Allure\Adapter\Event\AddAttachmentEvent;
 
@@ -72,7 +73,7 @@ private function copyFile($filePath, $outputPath)
      */
     private function guessFileMimeType($filePath)
     {
-        $type = MimeTypes::getDefault()->guessMimeType($filePath);
+        $type = MimeTypeGuesser::getInstance()->guess($filePath);
         if (!isset($type)) {
             return DEFAULT_MIME_TYPE;
         }
@@ -86,11 +87,11 @@ private function guessFileMimeType($filePath)
      */
     private function guessFileExtension($mimeType)
     {
-        $candidate = MimeTypes::getDefault()->getExtensions($mimeType);
-        if (empty($candidate)) {
+        $candidate = ExtensionGuesser::getInstance()->guess($mimeType);
+        if (!isset($candidate)) {
             return DEFAULT_FILE_EXTENSION;
         }
-        return reset($candidate);
+        return $candidate;
     }
 
     /**