merge magento/2.3-develop into magento-mpi/pr_2019_08_19

Author: magento-cicd2

dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php

@@ -9,9 +9,15 @@
  */
 namespace Magento\TestFramework\Workaround\Cleanup;
 
+use Magento\Framework\App\CacheInterface;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * Resets static properties of classes before each test run
+ */
 class StaticProperties
 {
     /**
@@ -42,6 +48,8 @@ class StaticProperties
         \Magento\Framework\Phrase::class,
     ];
 
+    private const CACHE_NAME = 'integration_test_static_properties';
+
     /**
      * Constructor
      */
@@ -67,6 +75,7 @@ public function __construct()
      *
      * @param \ReflectionClass $reflectionClass
      * @return bool
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     protected static function _isClassCleanable(\ReflectionClass $reflectionClass)
     {
@@ -88,6 +97,7 @@ protected static function _isClassCleanable(\ReflectionClass $reflectionClass)
      *
      * @param string $classFile
      * @return bool
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     protected static function _isClassInCleanableFolders($classFile)
     {
@@ -112,8 +122,11 @@ protected static function _isClassInCleanableFolders($classFile)
     protected static $classes = [];
 
     /**
+     * Create a reflection class from the provided class
+     *
      * @param string $class
      * @return \ReflectionClass
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     private static function getReflectionClass($class)
     {
@@ -125,7 +138,9 @@ private static function getReflectionClass($class)
 
     /**
      * Restore static variables (after running controller test case)
+     *
      * @TODO: refactor all code where objects are stored to static variables to use object manager instead
+     * phpcs:ignore Magento2.Functions.StaticFunction
      */
     public static function restoreStaticVariables()
     {
@@ -142,12 +157,27 @@ public static function restoreStaticVariables()
     /**
      * Backup static variables
      *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function backupStaticVariables()
     {
         if (count(self::$backupStaticVariables) > 0) {
             return;
         }
+
+        $objectManager = Bootstrap::getInstance()->getObjectManager();
+        $cache = $objectManager->get(CacheInterface::class);
+        $serializer = $objectManager->get(SerializerInterface::class);
+        $cachedProperties = $cache->load(self::CACHE_NAME);
+
+        if ($cachedProperties) {
+            self::$backupStaticVariables = $serializer->unserialize($cachedProperties);
+            return;
+        }
+
+        unset($cachedProperties, $objectManager);
+
         $classFiles = array_filter(
             Files::init()->getPhpFiles(
                 Files::INCLUDE_APP_CODE
@@ -156,12 +186,14 @@ public static function backupStaticVariables()
             ),
             function ($classFile) {
                 return StaticProperties::_isClassInCleanableFolders($classFile)
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 && strpos(file_get_contents($classFile), ' static ')  > 0;
             }
         );
         $namespacePattern = '/namespace [a-zA-Z0-9\\\\]+;/';
         $classPattern = '/\nclass [a-zA-Z0-9_]+/';
         foreach ($classFiles as $classFile) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $code = file_get_contents($classFile);
             preg_match($namespacePattern, $code, $namespace);
             preg_match($classPattern, $code, $class);
@@ -187,17 +219,16 @@ function ($classFile) {
                 }
             }
         }
+
+        $cache->save($serializer->serialize(self::$backupStaticVariables), self::CACHE_NAME);
     }
 
     /**
      * Handler for 'startTestSuite' event
-     *
      */
     public function startTestSuite()
     {
-        if (empty(self::$backupStaticVariables)) {
-            self::backupStaticVariables();
-        }
+        self::backupStaticVariables();
     }
 
     /**