Merge branch 'develop' into MQE-1963

Author: jilu1

.travis.yml

@@ -1,7 +1,5 @@
 language: php
 php:
-  - 7.0
-  - 7.1
   - 7.2
   - 7.3
 install: composer install --no-interaction --prefer-source

composer.json

@@ -9,7 +9,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0",
+        "php": "~7.2.0||~7.3.0",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-openssl": "*",

composer.lock

@@ -51,7 +51,7 @@
     $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
 
     defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
-    $env->setEnvironmentVariable('WAIT_TIMEOUT', 30);
+    $env->setEnvironmentVariable('WAIT_TIMEOUT', WAIT_TIMEOUT);
 
     try {
         new DateTimeZone(DEFAULT_TIMEZONE);

dev/tests/functional/standalone_bootstrap.php

@@ -29,6 +29,8 @@ modules:
             username: "%MAGENTO_ADMIN_USERNAME%"
             password: "%MAGENTO_ADMIN_PASSWORD%"
             pageload_timeout: "%WAIT_TIMEOUT%"
+            request_timeout: "%WAIT_TIMEOUT%"
+            connection_timeout: "%WAIT_TIMEOUT%"
             host: "%SELENIUM_HOST%"
             port: "%SELENIUM_PORT%"
             protocol: "%SELENIUM_PROTOCOL%"

etc/config/functional.suite.dist.yml

@@ -51,7 +51,7 @@
     $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
 
     defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
-    $env->setEnvironmentVariable('WAIT_TIMEOUT', 30);
+    $env->setEnvironmentVariable('WAIT_TIMEOUT', WAIT_TIMEOUT);
 
     try {
         new DateTimeZone(DEFAULT_TIMEZONE);