Skip to content

Commit 0a99c85

Browse files
committed
MAGETWO-93305: Broken upgrade to 2.3 due to changed data type for minify_exclude
- adding trim
1 parent 9ec8a6c commit 0a99c85

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lib/internal/Magento/Framework/View/Asset/Minification.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,13 @@ private function getMinificationExcludeValues($key)
164164
$configValues = $this->scopeConfig->getValue($key, $this->scope) ?? [];
165165
//compatibility fix for type change from new line separated string values to array
166166
if (!is_array($configValues)) {
167-
$configValues = explode("\n", $configValues);
167+
$configValuesFromString = [];
168+
foreach (explode("\n", $configValues) as $exclude) {
169+
if (trim($exclude) != '') {
170+
$configValuesFromString[] = trim($exclude);
171+
}
172+
}
173+
$configValues = $configValuesFromString;
168174
}
169175
return array_values($configValues);
170176
}

lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,9 @@ public function testGetExcludesTinyMceAsString(string $value, array $expectedVal
245245
public function getExcludesTinyMceAsStringDataProvider()
246246
{
247247
return [
248-
["/tiny_mce/\n/tiny_mce2/", ['/tiny_mce/', '/tiny_mce2/']],
248+
["/tiny_mce/ \n /tiny_mce2/", ['/tiny_mce/', '/tiny_mce2/']],
249249
['/tiny_mce/', ['/tiny_mce/']],
250+
[' /tiny_mce/', ['/tiny_mce/']],
250251
];
251252
}
252253
}

0 commit comments

Comments
 (0)