Skip to content

Commit c70e169

Browse files
authored
Merge branch 'MFTF3.0.0-RC2' into MQE-2082-Rebase
2 parents 4b8581f + 4f1dd85 commit c70e169

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+888
-572
lines changed

.travis.yml

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

composer.json

+8-5
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
"sort-packages": true
1010
},
1111
"require": {
12-
"php": "~7.2.0||~7.3.0",
12+
"php": "^7.3",
1313
"ext-curl": "*",
1414
"ext-dom": "*",
1515
"ext-json": "*",
1616
"ext-openssl": "*",
17-
"allure-framework/allure-codeception": "~1.3.0",
17+
"allure-framework/allure-codeception": "~1.4.0",
1818
"aws/aws-sdk-php": "^3.132",
19-
"codeception/codeception": "~2.4.5",
19+
"codeception/codeception": "~4.1.4",
20+
"codeception/module-asserts": "^1.1",
21+
"codeception/module-sequence": "^1.0",
22+
"codeception/module-webdriver": "^1.0",
2023
"composer/composer": "^1.6",
2124
"csharpru/vault-php": "~3.5.3",
2225
"csharpru/vault-php-guzzle6-transport": "^2.0",
@@ -31,14 +34,14 @@
3134
},
3235
"require-dev": {
3336
"squizlabs/php_codesniffer": "~3.2",
34-
"sebastian/phpcpd": "~3.0 || ~4.0",
37+
"sebastian/phpcpd": "~4.0||~5.0",
3538
"brainmaestro/composer-git-hooks": "^2.3.1",
3639
"doctrine/cache": "<1.7.0",
3740
"codeception/aspect-mock": "^3.0",
3841
"goaop/framework": "2.2.0",
3942
"codacy/coverage": "^1.4",
4043
"phpmd/phpmd": "^2.6.0",
41-
"phpunit/phpunit": "~6.5.0 || ~7.0.0",
44+
"phpunit/phpunit": "~9.0.0",
4245
"rregeer/phpunit-coverage-check": "^0.1.4",
4346
"php-coveralls/php-coveralls": "^1.0",
4447
"symfony/stopwatch": "~3.4.6"

0 commit comments

Comments
 (0)