Skip to content

Commit cde5a19

Browse files
author
Sergey Kovalenko
committed
MAGETWO-57294: Porting L2 build optimizations to 2.0.x
1 parent b2cceb7 commit cde5a19

File tree

6 files changed

+65
-40
lines changed

6 files changed

+65
-40
lines changed

‎.php_cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ return Symfony\CS\Config\Config::create()
3333
'extra_empty_lines',
3434
'include',
3535
'join_function',
36-
'multiline_array_trailing_comma',
3736
'namespace_no_leading_whitespace',
3837
'new_with_braces',
3938
'object_operator',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ protected function _rollbackTransaction()
113113
$this->_getConnection()->rollbackTransparentTransaction();
114114
$this->_isTransactionActive = false;
115115
$this->_eventManager->fireEvent('rollbackTransaction');
116+
$this->_getConnection()->closeConnection();
116117
}
117118
}
118119

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ protected function endClass($name)
296296
protected function doEndClass()
297297
{
298298
foreach ($this->tests as $name => $data) {
299-
$check = $data['failure'] == 0 ? ' [x] ' : ' [ ] ';
299+
$check = $data['failure'] == 0 ? ' - [x] ' : ' - [ ] ';
300300
$this->write(
301301
"\n" . $check . $name . ($data['failure'] + $data['success'] ==
302302
0 ? ' (skipped)' : '') . ($data['time'] > 1 ? ' - ' . number_format(

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

Lines changed: 62 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class StaticProperties
3333
* @var array
3434
*/
3535
protected static $_classesToSkip = [
36-
'Mage',
3736
'Magento\Framework\App\ObjectManager',
3837
'Magento\TestFramework\Helper\Bootstrap',
3938
'Magento\TestFramework\Event\Magento',
@@ -43,6 +42,11 @@ class StaticProperties
4342
'Magento\Framework\Phrase',
4443
];
4544

45+
/**
46+
* @var \ReflectionClass[]
47+
*/
48+
static protected $classes = [];
49+
4650
/**
4751
* Constructor
4852
*/
@@ -74,9 +78,9 @@ protected static function _isClassCleanable(\ReflectionClass $reflectionClass)
7478
// do not process blacklisted classes from integration framework
7579
foreach (self::$_classesToSkip as $notCleanableClass) {
7680
if ($reflectionClass->getName() == $notCleanableClass || is_subclass_of(
77-
$reflectionClass->getName(),
78-
$notCleanableClass
79-
)
81+
$reflectionClass->getName(),
82+
$notCleanableClass
83+
)
8084
) {
8185
return false;
8286
}
@@ -107,6 +111,18 @@ protected static function _isClassInCleanableFolders($classFile)
107111
return false; // File is not in an "include" directory
108112
}
109113

114+
/**
115+
* @param string $class
116+
* @return \ReflectionClass
117+
*/
118+
private static function getReflectionClass($class)
119+
{
120+
if (!isset(self::$classes[$class])) {
121+
self::$classes[$class] = new \ReflectionClass($class);
122+
}
123+
124+
return self::$classes[$class];
125+
}
110126

111127
/**
112128
* Restore static variables (after running controller test case)
@@ -115,7 +131,7 @@ protected static function _isClassInCleanableFolders($classFile)
115131
public static function restoreStaticVariables()
116132
{
117133
foreach (array_keys(self::$backupStaticVariables) as $class) {
118-
$reflectionClass = new \ReflectionClass($class);
134+
$reflectionClass = self::getReflectionClass($class);
119135
$staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
120136
foreach ($staticProperties as $staticProperty) {
121137
$staticProperty->setAccessible(true);
@@ -130,43 +146,52 @@ public static function restoreStaticVariables()
130146
*/
131147
public static function backupStaticVariables()
132148
{
133-
$classFiles = Files::init()->getPhpFiles(
134-
Files::INCLUDE_APP_CODE
135-
| Files::INCLUDE_LIBS
136-
| Files::INCLUDE_TESTS
149+
if (count(self::$backupStaticVariables) > 0) {
150+
return;
151+
}
152+
153+
$classFiles = array_filter(
154+
Files::init()->getPhpFiles(
155+
Files::INCLUDE_APP_CODE
156+
| Files::INCLUDE_LIBS
157+
| Files::INCLUDE_TESTS
158+
),
159+
function ($classFile) {
160+
return StaticProperties::_isClassInCleanableFolders($classFile)
161+
&& strpos(file_get_contents($classFile), ' static ') > 0;
162+
}
137163
);
164+
138165
$namespacePattern = '/namespace [a-zA-Z0-9\\\\]+;/';
139166
$classPattern = '/\nclass [a-zA-Z0-9_]+/';
167+
140168
foreach ($classFiles as $classFile) {
141-
if (self::_isClassInCleanableFolders($classFile)) {
142-
$file = @fopen($classFile, 'r');
143-
$code = fread($file, 4096);
144-
preg_match($namespacePattern, $code, $namespace);
145-
preg_match($classPattern, $code, $class);
146-
if (!isset($namespace[0]) || !isset($class[0])) {
147-
fclose($file);
148-
continue;
149-
}
150-
// trim namespace and class name
151-
$namespace = substr($namespace[0], 10, strlen($namespace[0]) - 11);
152-
$class = substr($class[0], 7, strlen($class[0]) - 7);
153-
$className = $namespace . '\\' . $class;
154-
155-
try {
156-
$reflectionClass = new \ReflectionClass($className);
157-
} catch (\Exception $e) {
158-
fclose($file);
159-
continue;
160-
}
161-
if (self::_isClassCleanable($reflectionClass)) {
162-
$staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
163-
foreach ($staticProperties as $staticProperty) {
164-
$staticProperty->setAccessible(true);
165-
$value = $staticProperty->getValue();
166-
self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
167-
}
169+
$code = file_get_contents($classFile);
170+
preg_match($namespacePattern, $code, $namespace);
171+
preg_match($classPattern, $code, $class);
172+
173+
if (!isset($namespace[0]) || !isset($class[0])) {
174+
continue;
175+
}
176+
177+
// trim namespace and class name
178+
$namespace = substr($namespace[0], 10, strlen($namespace[0]) - 11);
179+
$class = substr($class[0], 7, strlen($class[0]) - 7);
180+
$className = $namespace . '\\' . $class;
181+
182+
try {
183+
$reflectionClass = self::getReflectionClass($className);
184+
} catch (\Exception $e) {
185+
continue;
186+
}
187+
188+
if (self::_isClassCleanable($reflectionClass)) {
189+
$staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
190+
foreach ($staticProperties as $staticProperty) {
191+
$staticProperty->setAccessible(true);
192+
$value = $staticProperty->getValue();
193+
self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
168194
}
169-
fclose($file);
170195
}
171196
}
172197
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public function setUp()
3333
*/
3434
public function testSetSaveHandler($deploymentConfigHandler, $iniHandler)
3535
{
36+
$this->markTestSkipped('MAGETWO-56529');
3637
// Set expected session.save_handler config
3738
if ($deploymentConfigHandler) {
3839
if ($deploymentConfigHandler !== 'files') {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ protected function tearDown()
3838

3939
/**
4040
* @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
41-
* @magentoAppIsolation disabled
4241
*/
4342
public function testSaveActionQueueTemplateAndVerifySuccessMessage()
4443
{

0 commit comments

Comments
 (0)