Merge pull request #290 from magento-south/MAGETWO-57294

Story:
- MAGETWO-57294: Porting L2 build optimizations to 2.0.x

Author: MomotenkoNatalia

.php_cs

@@ -33,7 +33,6 @@ return Symfony\CS\Config\Config::create()
         'extra_empty_lines',
         'include',
         'join_function',
-        'multiline_array_trailing_comma',
         'namespace_no_leading_whitespace',
         'new_with_braces',
         'object_operator',

dev/tests/integration/framework/Magento/TestFramework/Event/Transaction.php

@@ -113,6 +113,7 @@ protected function _rollbackTransaction()
             $this->_getConnection()->rollbackTransparentTransaction();
             $this->_isTransactionActive = false;
             $this->_eventManager->fireEvent('rollbackTransaction');
+            $this->_getConnection()->closeConnection();
         }
     }
 

dev/tests/integration/framework/Magento/TestFramework/Listener/ExtededTestdox.php

@@ -296,7 +296,7 @@ protected function endClass($name)
     protected function doEndClass()
     {
         foreach ($this->tests as $name => $data) {
-            $check = $data['failure'] == 0 ? ' [x] ' : ' [ ] ';
+            $check = $data['failure'] == 0 ? ' - [x] ' : ' - [ ] ';
             $this->write(
                 "\n" . $check . $name . ($data['failure'] + $data['success'] ==
                 0 ? ' (skipped)' : '') . ($data['time'] > 1 ? ' - ' . number_format(

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

@@ -33,7 +33,6 @@ class StaticProperties
      * @var array
      */
     protected static $_classesToSkip = [
-        'Mage',
         'Magento\Framework\App\ObjectManager',
         'Magento\TestFramework\Helper\Bootstrap',
         'Magento\TestFramework\Event\Magento',
@@ -43,6 +42,11 @@ class StaticProperties
         'Magento\Framework\Phrase',
     ];
 
+    /**
+     * @var \ReflectionClass[]
+     */
+    static protected $classes = [];
+
     /**
      * Constructor
      */
@@ -73,10 +77,11 @@ protected static function _isClassCleanable(\ReflectionClass $reflectionClass)
     {
         // do not process blacklisted classes from integration framework
         foreach (self::$_classesToSkip as $notCleanableClass) {
-            if ($reflectionClass->getName() == $notCleanableClass || is_subclass_of(
-                $reflectionClass->getName(),
-                $notCleanableClass
-            )
+            if ($reflectionClass->getName() == $notCleanableClass ||
+                is_subclass_of(
+                    $reflectionClass->getName(),
+                    $notCleanableClass
+                )
             ) {
                 return false;
             }
@@ -107,6 +112,18 @@ protected static function _isClassInCleanableFolders($classFile)
         return false; // File is not in an "include" directory
     }
 
+    /**
+     * @param string $class
+     * @return \ReflectionClass
+     */
+    private static function getReflectionClass($class)
+    {
+        if (!isset(self::$classes[$class])) {
+            self::$classes[$class] = new \ReflectionClass($class);
+        }
+
+        return self::$classes[$class];
+    }
 
     /**
      * Restore static variables (after running controller test case)
@@ -115,7 +132,7 @@ protected static function _isClassInCleanableFolders($classFile)
     public static function restoreStaticVariables()
     {
         foreach (array_keys(self::$backupStaticVariables) as $class) {
-            $reflectionClass = new \ReflectionClass($class);
+            $reflectionClass = self::getReflectionClass($class);
             $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
             foreach ($staticProperties as $staticProperty) {
                 $staticProperty->setAccessible(true);
@@ -130,43 +147,52 @@ public static function restoreStaticVariables()
      */
     public static function backupStaticVariables()
     {
-        $classFiles = Files::init()->getPhpFiles(
-            Files::INCLUDE_APP_CODE
-            | Files::INCLUDE_LIBS
-            | Files::INCLUDE_TESTS
+        if (count(self::$backupStaticVariables) > 0) {
+            return;
+        }
+
+        $classFiles = array_filter(
+            Files::init()->getPhpFiles(
+                Files::INCLUDE_APP_CODE
+                | Files::INCLUDE_LIBS
+                | Files::INCLUDE_TESTS
+            ),
+            function ($classFile) {
+                return StaticProperties::_isClassInCleanableFolders($classFile)
+                && strpos(file_get_contents($classFile), ' static ') > 0;
+            }
         );
+
         $namespacePattern = '/namespace [a-zA-Z0-9\\\\]+;/';
         $classPattern = '/\nclass [a-zA-Z0-9_]+/';
+
         foreach ($classFiles as $classFile) {
-            if (self::_isClassInCleanableFolders($classFile)) {
-                $file = @fopen($classFile, 'r');
-                $code = fread($file, 4096);
-                preg_match($namespacePattern, $code, $namespace);
-                preg_match($classPattern, $code, $class);
-                if (!isset($namespace[0]) || !isset($class[0])) {
-                    fclose($file);
-                    continue;
-                }
-                // trim namespace and class name
-                $namespace = substr($namespace[0], 10, strlen($namespace[0]) - 11);
-                $class = substr($class[0], 7, strlen($class[0]) - 7);
-                $className = $namespace . '\\' . $class;
-
-                try {
-                    $reflectionClass = new \ReflectionClass($className);
-                } catch (\Exception $e) {
-                    fclose($file);
-                    continue;
-                }
-                if (self::_isClassCleanable($reflectionClass)) {
-                    $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
-                    foreach ($staticProperties as $staticProperty) {
-                        $staticProperty->setAccessible(true);
-                        $value = $staticProperty->getValue();
-                        self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
-                    }
+            $code = file_get_contents($classFile);
+            preg_match($namespacePattern, $code, $namespace);
+            preg_match($classPattern, $code, $class);
+
+            if (!isset($namespace[0]) || !isset($class[0])) {
+                continue;
+            }
+
+            // trim namespace and class name
+            $namespace = substr($namespace[0], 10, strlen($namespace[0]) - 11);
+            $class = substr($class[0], 7, strlen($class[0]) - 7);
+            $className = $namespace . '\\' . $class;
+
+            try {
+                $reflectionClass = self::getReflectionClass($className);
+            } catch (\Exception $e) {
+                continue;
+            }
+
+            if (self::_isClassCleanable($reflectionClass)) {
+                $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
+                foreach ($staticProperties as $staticProperty) {
+                    $staticProperty->setAccessible(true);
+                    $value = $staticProperty->getValue();
+                    self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
                 }
-                fclose($file);
             }
         }
     }

dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php

@@ -33,6 +33,7 @@ public function setUp()
      */
     public function testSetSaveHandler($deploymentConfigHandler, $iniHandler)
     {
+        $this->markTestSkipped('MAGETWO-56529');
         // Set expected session.save_handler config
         if ($deploymentConfigHandler) {
             if ($deploymentConfigHandler !== 'files') {

dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php

@@ -38,7 +38,6 @@ protected function tearDown()
 
     /**
      * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
-     * @magentoAppIsolation disabled
      */
     public function testSaveActionQueueTemplateAndVerifySuccessMessage()
     {

dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Domain/VirtualTest.php

@@ -87,10 +87,4 @@ public function testGetPhysicalTheme()
             )->getPhysicalTheme()->getId()
         );
     }
-
-    protected function tearDown()
-    {
-        unset($this->_physicalThemeId);
-        unset($this->_virtualThemeId);
-    }
 }