Merge branch 'develop' into MQE-1074

# Conflicts:
#	composer.json
#	composer.lock

Author: aljcalandra

bin/blacklist.txt

@@ -4,7 +4,6 @@
 # THIS FILE CANNOT CONTAIN BLANK LINES                            #
 ###################################################################
 bin/blacklist.txt
-dev/tests/static/Magento/Sniffs/Annotations/Helper.php
-dev/tests/static/Magento/Sniffs/Annotations/RequireAnnotatedAttributesSniff.php
-dev/tests/static/Magento/Sniffs/Annotations/RequireAnnotatedMethodsSniff.php
+dev/tests/static/Magento/Sniffs/Commenting/FunctionCommentSniff.php
+dev/tests/static/Magento/Sniffs/Commenting/VariableCommentSniff.php
 dev/tests/verification/_generated

composer.json

@@ -22,7 +22,7 @@
         "vlucas/phpdotenv": "^2.4"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "1.5.3",
+        "squizlabs/php_codesniffer": "~3.2",
         "brainmaestro/composer-git-hooks": "^2.3",
         "sebastian/phpcpd": "~3.0 || ~4.0",
         "doctrine/cache": "<1.7.0",

dev/tests/_bootstrap.php

@@ -30,7 +30,7 @@
 // set mftf appplication context
 \Magento\FunctionalTestingFramework\Config\MftfApplicationConfig::create(
     true,
-    \Magento\FunctionalTestingFramework\Config\MftfApplicationConfig::GENERATION_PHASE,
+    \Magento\FunctionalTestingFramework\Config\MftfApplicationConfig::UNIT_TEST_PHASE,
     true,
     false
 );

dev/tests/functional/_bootstrap.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-define('PROJECT_ROOT', dirname(dirname(dirname(__DIR__))));
+defined('PROJECT_ROOT') || define('PROJECT_ROOT', dirname(dirname(dirname(__DIR__))));
 require_once realpath(PROJECT_ROOT . '/vendor/autoload.php');
 
 //Load constants from .env file
@@ -29,4 +29,13 @@
     foreach ($_ENV as $key => $var) {
         defined($key) || define($key, $var);
     }
+
+    defined('MAGENTO_CLI_COMMAND_PATH') || define(
+        'MAGENTO_CLI_COMMAND_PATH',
+        'dev/tests/acceptance/utils/command.php'
+    );
+    $env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PATH', MAGENTO_CLI_COMMAND_PATH);
+
+    defined('MAGENTO_CLI_COMMAND_PARAMETER') || define('MAGENTO_CLI_COMMAND_PARAMETER', 'command');
+    $env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PARAMETER', MAGENTO_CLI_COMMAND_PARAMETER);
 }