Skip to content

Commit 2fe1372

Browse files
authoredMar 27, 2020
Merge pull request magento#659 from magento/2.6.4-develop
MQE-2052: MFTF uses undeclared dependency
2 parents 5f67481 + e45ea37 commit 2fe1372

File tree

5 files changed

+809
-1313
lines changed

5 files changed

+809
-1313
lines changed
 

‎.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 7.0
43
- 7.1
54
- 7.2
65
- 7.3

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ Magento Functional Testing Framework Changelog
33
2.6.3
44
-----
55

6+
### Fixes
7+
* added dependency to packages MFTF used but never specified in composer.json
8+
9+
2.6.3
10+
-----
11+
612
### New Feature
713
* `--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
814

‎composer.json

+12-8
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,35 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "2.6.3",
5+
"version": "2.6.4",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
99
"sort-packages": true
1010
},
1111
"require": {
12-
"php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0",
12+
"php": "~7.1.0||~7.2.0||~7.3.0",
1313
"ext-curl": "*",
14+
"ext-dom": "*",
1415
"ext-json": "*",
1516
"ext-openssl": "*",
1617
"allure-framework/allure-codeception": "~1.3.0",
1718
"aws/aws-sdk-php": "^3.132",
1819
"codeception/codeception": "~2.4.5",
19-
"composer/composer": "^1.4",
20-
"consolidation/robo": "^1.0.0",
20+
"composer/composer": "^1.6",
2121
"csharpru/vault-php": "~3.5.3",
2222
"csharpru/vault-php-guzzle6-transport": "^2.0",
2323
"flow/jsonpath": ">0.2",
2424
"fzaninotto/faker": "^1.6",
2525
"monolog/monolog": "^1.0",
2626
"mustache/mustache": "~2.5",
27-
"symfony/process": "^2.8 || ^3.1 || ^4.0",
28-
"vlucas/phpdotenv": "^2.4",
29-
"php-webdriver/webdriver": "^1.8.0"
27+
"php-webdriver/webdriver": "^1.8.0",
28+
"symfony/console": "^4.4",
29+
"symfony/finder": "^4.4",
30+
"symfony/http-foundation": "^4.4",
31+
"symfony/mime": "^4.4",
32+
"symfony/process": "^4.4",
33+
"vlucas/phpdotenv": "^2.4"
3034
},
3135
"require-dev": {
3236
"squizlabs/php_codesniffer": "~3.2",
@@ -52,7 +56,7 @@
5256
"files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
5357
"psr-4": {
5458
"Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
55-
"MFTF\\": "dev/tests/functional/MFTF"
59+
"MFTF\\": "dev/tests/functional/tests/MFTF"
5660
}
5761
},
5862
"autoload-dev": {

‎composer.lock

+786-1,298
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Magento/FunctionalTestingFramework/Allure/Event/AddUniqueAttachmentEvent.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
*/
77
namespace Magento\FunctionalTestingFramework\Allure\Event;
88

9-
use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser;
10-
use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
9+
use Symfony\Component\Mime\MimeTypes;
1110
use Yandex\Allure\Adapter\AllureException;
1211
use Yandex\Allure\Adapter\Event\AddAttachmentEvent;
1312

@@ -73,7 +72,7 @@ private function copyFile($filePath, $outputPath)
7372
*/
7473
private function guessFileMimeType($filePath)
7574
{
76-
$type = MimeTypeGuesser::getInstance()->guess($filePath);
75+
$type = MimeTypes::getDefault()->guessMimeType($filePath);
7776
if (!isset($type)) {
7877
return DEFAULT_MIME_TYPE;
7978
}
@@ -87,11 +86,11 @@ private function guessFileMimeType($filePath)
8786
*/
8887
private function guessFileExtension($mimeType)
8988
{
90-
$candidate = ExtensionGuesser::getInstance()->guess($mimeType);
91-
if (!isset($candidate)) {
89+
$candidate = MimeTypes::getDefault()->getExtensions($mimeType);
90+
if (empty($candidate)) {
9291
return DEFAULT_FILE_EXTENSION;
9392
}
94-
return $candidate;
93+
return reset($candidate);
9594
}
9695

9796
/**

0 commit comments

Comments
 (0)
Please sign in to comment.