Skip to content

Commit e0118a0

Browse files
author
Yevhen Miroshnychenko
committed
Merge branch '2.3-develop' into MAGETWO-89229
2 parents 8f2b658 + c33674d commit e0118a0

File tree

784 files changed

+958
-968
lines changed

Some content is hidden

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

784 files changed

+958
-968
lines changed

‎dev/tests/acceptance/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/process": ">=2.7 <3.4",
2323
"henrikbjorn/lurker": "^1.2",
2424
"magento/magento2-functional-testing-framework": "~2.1.1",
25-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
25+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
2626
"vlucas/phpdotenv": "~2.4"
2727
},
2828
"autoload": {

‎dev/tests/acceptance/composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/functional/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function ($errNo, $errStr, $errFile, $errLine) {
5151

5252
$errName = isset($errorNames[$errNo]) ? $errorNames[$errNo] : "";
5353

54-
throw new \PHPUnit_Framework_Exception(
54+
throw new \PHPUnit\Framework\Exception(
5555
sprintf("%s: %s in %s:%s.", $errName, $errStr, $errFile, $errLine),
5656
$errNo
5757
);

‎dev/tests/functional/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"sort-packages": true
44
},
55
"require": {
6-
"php": "7.0.2|~7.0.6|~7.1.0",
7-
"magento/mtf": "1.0.0-rc59",
6+
"php": "7.0.2|~7.0.6|~7.1.0|~7.2.0",
7+
"magento/mtf": "1.0.0-rc60",
88
"allure-framework/allure-phpunit": "~1.2.0",
99
"doctrine/annotations": "1.4.*",
10-
"phpunit/phpunit": "~4.8.0|~5.5.0",
11-
"phpunit/phpunit-selenium": ">=1.2"
10+
"phpunit/phpunit": "~6.5.0",
11+
"phpunit/phpunit-selenium": "~4.1.0"
1212
},
1313
"suggest": {
1414
"netwing/selenium-server-standalone": "dev-master",

‎dev/tests/functional/lib/Magento/Mtf/Troubleshooting/AdminAnalyzer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected function configure()
7474
*/
7575
protected function execute(InputInterface $input, OutputInterface $output)
7676
{
77-
\PHPUnit_Util_Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
77+
\PHPUnit\Util\Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
7878
$this->output = $this->objectManager->create(
7979
\Magento\Mtf\Console\Output::class,
8080
['output' => $output]

‎dev/tests/functional/lib/Magento/Mtf/Troubleshooting/HtaccessAnalyzer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected function configure()
7373
*/
7474
protected function execute(InputInterface $input, OutputInterface $output)
7575
{
76-
\PHPUnit_Util_Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
76+
\PHPUnit\Util\Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
7777
$output = $this->objectManager->create(
7878
\Magento\Mtf\Console\Output::class,
7979
['output' => $output]

‎dev/tests/functional/lib/Magento/Mtf/Troubleshooting/StorefrontAnalyzer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected function configure()
7777
*/
7878
protected function execute(InputInterface $input, OutputInterface $output)
7979
{
80-
\PHPUnit_Util_Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
80+
\PHPUnit\Util\Configuration::getInstance(MTF_PHPUNIT_FILE)->handlePHPConfiguration();
8181
$output = $this->objectManager->create(
8282
\Magento\Mtf\Console\Output::class,
8383
['output' => $output]

‎dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ protected function _processItem(& $items, & $rewrites, $filename, $location, $pa
209209
if ($reflectionClass->isAbstract()) {
210210
return;
211211
}
212-
$annotations = \PHPUnit_Util_Test::parseTestMethodAnnotations($className);
212+
$annotations = \PHPUnit\Util\Test::parseTestMethodAnnotations($className);
213213

214214
list(, $targetClassName) = explode($location . '/', $filename);
215215
$targetClassName = str_replace('.php', '', $targetClassName);

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertExportAdvancedPricing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function processAssert(
3737
$this->exportData = $export->getLatest();
3838
foreach ($products as $product) {
3939
$regexps = $this->prepareRegexpsForCheck($exportedFields, $product);
40-
\PHPUnit_Framework_Assert::assertTrue(
40+
\PHPUnit\Framework\Assert::assertTrue(
4141
$this->isProductDataExists($regexps),
4242
'A product with name ' . $product->getName() . ' was not found in exported file.'
4343
);

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportAdvancedPricing.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function processAssert(
5959

6060
$resultArrays = $this->getPreparePrices();
6161

62-
\PHPUnit_Framework_Assert::assertEquals(
62+
\PHPUnit\Framework\Assert::assertEquals(
6363
$resultArrays['pageData'],
6464
$resultArrays['csvData'],
6565
'Tier prices from page and csv are not match.'

0 commit comments

Comments
 (0)