MQE-849: Upgrading MTF PHP version to 7.2

Author: okolesnyk

dev/tests/functional/bootstrap.php

@@ -9,7 +9,7 @@
 defined('MTF_TESTS_PATH') || define('MTF_TESTS_PATH', MTF_BP . '/tests/app/');
 defined('MTF_STATES_PATH') || define('MTF_STATES_PATH', MTF_BP . '/lib/Magento/Mtf/App/State/');
 
-//require_once __DIR__ . '/../../../app/bootstrap.php';
+require_once __DIR__ . '/../../../app/bootstrap.php';
 restore_error_handler();
 $vendorAutoload = __DIR__ . '/vendor/autoload.php';
 

dev/tests/functional/lib/Magento/Mtf/Util/ModuleResolver/SequenceSorter.php

@@ -22,7 +22,7 @@ class SequenceSorter implements SequenceSorterInterface
      */
     public function __construct()
     {
-//        $this->initObjectManager();
+        $this->initObjectManager();
     }
 
     /**
@@ -59,20 +59,20 @@ protected function getModuleSequence()
      */
     public function sort(array $paths)
     {
-//        $sortedPaths = [];
-//        $modules = array_keys($this->getModuleSequence());
-//        foreach ($modules as $module) {
-//            foreach ($paths as $key => $path) {
-//                $modulePath = realpath(MTF_TESTS_PATH . str_replace('_', DIRECTORY_SEPARATOR, $module));
-//                $path = realpath($path);
-//                if (strpos($path, $modulePath) !== false) {
-//                    $sortedPaths[] = $path;
-//                    unset($paths[$key]);
-//                }
-//            }
-//        }
-//        $sortedPaths = array_merge($sortedPaths, $paths);
+        $sortedPaths = [];
+        $modules = array_keys($this->getModuleSequence());
+        foreach ($modules as $module) {
+            foreach ($paths as $key => $path) {
+                $modulePath = realpath(MTF_TESTS_PATH . str_replace('_', DIRECTORY_SEPARATOR, $module));
+                $path = realpath($path);
+                if (strpos($path, $modulePath) !== false) {
+                    $sortedPaths[] = $path;
+                    unset($paths[$key]);
+                }
+            }
+        }
+        $sortedPaths = array_merge($sortedPaths, $paths);
 
-        return $paths;
+        return $sortedPaths;
     }
 }