Merge branch 'develop' into MasterToDevelop-2.3.12

Author: KevinBKozan

composer.json

@@ -11,6 +11,7 @@
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
         "allure-framework/allure-codeception": "~1.3.0",
+        "ext-curl": "*",
         "codeception/codeception": "~2.3.4",
         "consolidation/robo": "^1.0.0",
         "epfremme/swagger-php": "^2.0",
@@ -30,6 +31,7 @@
         "goaop/framework": "2.2.0",
         "codacy/coverage": "^1.4",
         "phpmd/phpmd": "^2.6.0",
+        "phpunit/phpunit": "~6.5.0 || ~7.0.0",
         "rregeer/phpunit-coverage-check": "^0.1.4",
         "php-coveralls/php-coveralls": "^1.0",
         "symfony/stopwatch": "~3.4.6"

composer.lock

@@ -82,7 +82,8 @@
 
 $paths = [
     $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuite.xml',
-    $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteHooks.xml'
+    $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteHooks.xml',
+    $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteExtends.xml'
 ];
 
 // create and return the iterator for these file paths

dev/tests/_bootstrap.php

@@ -68,7 +68,7 @@ protected function processReturn(File $phpcsFile, $stackPtr, $commentStart)
                 $phpcsFile->addError($error, $return, 'MissingReturnType');
             } else {
                 // Support both a return type and a description.
-                $split = preg_match('`^((?:\|?(?:array\([^\)]*\)|[\\\\a-z0-9\[\]]+))*)( .*)?`i', $content, $returnParts);
+                preg_match('`^((?:\|?(?:array\([^\)]*\)|[\\\\a-z0-9\[\]]+))*)( .*)?`i', $content, $returnParts);
                 if (isset($returnParts[1]) === false) {
                     return;
                 }
@@ -78,7 +78,7 @@ protected function processReturn(File $phpcsFile, $stackPtr, $commentStart)
                 // Check return type (can be multiple, separated by '|').
                 $typeNames      = explode('|', $returnType);
                 $suggestedNames = array();
-                foreach ($typeNames as $i => $typeName) {
+                foreach ($typeNames as $typeName) {
                     $suggestedName = Common::suggestType($typeName);
                     if (in_array($suggestedName, $suggestedNames) === false) {
                         $suggestedNames[] = $suggestedName;

dev/tests/static/Magento/Sniffs/Commenting/FunctionCommentSniff.php

@@ -85,7 +85,7 @@ private function setMockTestAndSuiteParserOutput($testData, $suiteData)
         $property->setValue(null);
 
         // clear suite object handler value to inject parsed content
-        $property = new \ReflectionProperty(SuiteObjectHandler::class, 'SUITE_OBJECT_HANLDER_INSTANCE');
+        $property = new \ReflectionProperty(SuiteObjectHandler::class, 'instance');
         $property->setAccessible(true);
         $property->setValue(null);
 

dev/tests/unit/Magento/FunctionalTestFramework/Suite/Handlers/SuiteObjectHandlerTest.php

@@ -149,7 +149,7 @@ public function testGenerateEmptySuite()
      */
     private function setMockTestAndSuiteParserOutput($testData, $suiteData)
     {
-        $property = new \ReflectionProperty(SuiteGenerator::class, 'SUITE_GENERATOR_INSTANCE');
+        $property = new \ReflectionProperty(SuiteGenerator::class, 'instance');
         $property->setAccessible(true);
         $property->setValue(null);
 
@@ -159,7 +159,7 @@ private function setMockTestAndSuiteParserOutput($testData, $suiteData)
         $property->setValue(null);
 
         // clear suite object handler value to inject parsed content
-        $property = new \ReflectionProperty(SuiteObjectHandler::class, 'SUITE_OBJECT_HANLDER_INSTANCE');
+        $property = new \ReflectionProperty(SuiteObjectHandler::class, 'instance');
         $property->setAccessible(true);
         $property->setValue(null);