Skip to content

Commit 0b0982f

Browse files
eug123eug123
committed
Merge remote-tracking branch 'origin/MAGETWO-59579' into pr-develop
2 parents 6619bdf + 4488d4c commit 0b0982f

File tree

2 files changed

+52
-27
lines changed

2 files changed

+52
-27
lines changed

‎lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Framework\Css\PreProcessor\Instruction;
108

119
use Magento\Framework\View\Asset\LocalInterface;
@@ -22,7 +20,10 @@ class Import implements PreProcessorInterface
2220
* Pattern of @import instruction
2321
*/
2422
const REPLACE_PATTERN =
25-
'#@import\s+(\((?P<type>\w+)\)\s+)?[\'\"](?P<path>(?![/\\\]|\w:[/\\\])[^\"\']+)[\'\"]\s*?(?P<media>.*?);#';
23+
'#@import(?!.*?\surl\(.*?)'
24+
. '(?P<start>[\(\),\w\s]*?[\'\"])'
25+
. '(?P<path>(?![/\\\]|\w*?:[/\\\])[^\"\']+)'
26+
. '(?P<end>[\'\"][\s\w\(\)]*?);#';
2627

2728
/**
2829
* @var \Magento\Framework\View\Asset\NotationResolver\Module
@@ -133,9 +134,9 @@ protected function replace(array $matchedContent, LocalInterface $asset, $conten
133134
$matchedFileId = $this->fixFileExtension($matchedContent['path'], $contentType);
134135
$this->recordRelatedFile($matchedFileId, $asset);
135136
$resolvedPath = $this->notationResolver->convertModuleNotationToPath($asset, $matchedFileId);
136-
$typeString = empty($matchedContent['type']) ? '' : '(' . $matchedContent['type'] . ') ';
137-
$mediaString = empty($matchedContent['media']) ? '' : ' ' . trim($matchedContent['media']);
138-
return "@import {$typeString}'{$resolvedPath}'{$mediaString};";
137+
$start = $matchedContent['start'];
138+
$end = $matchedContent['end'];
139+
return "@import{$start}{$resolvedPath}{$end};";
139140
}
140141

141142
/**

‎lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Instruction/ImportTest.php

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ImportTest extends \PHPUnit_Framework_TestCase
3939
protected function setUp()
4040
{
4141

42-
$this->notationResolver = $this->getMock(
42+
$this->notationResolver = $this->getMock(
4343
\Magento\Framework\View\Asset\NotationResolver\Module::class, [], [], '', false
4444
);
4545
$this->asset = $this->getMock(\Magento\Framework\View\Asset\File::class, [], [], '', false);
@@ -63,7 +63,11 @@ protected function setUp()
6363
public function testProcess($originalContent, $foundPath, $resolvedPath, $expectedContent)
6464
{
6565
$chain = new \Magento\Framework\View\Asset\PreProcessor\Chain($this->asset, $originalContent, 'less', 'path');
66-
$this->notationResolver->expects($this->once())
66+
$invoke = $this->once();
67+
if (preg_match('/^(http:|https:|\/+)/', $foundPath)) {
68+
$invoke = $this->never();
69+
}
70+
$this->notationResolver->expects($invoke)
6771
->method('convertModuleNotationToPath')
6872
->with($this->asset, $foundPath)
6973
->will($this->returnValue($resolvedPath));
@@ -78,50 +82,70 @@ public function testProcess($originalContent, $foundPath, $resolvedPath, $expect
7882
public function processDataProvider()
7983
{
8084
return [
81-
'non-modular notation' => [
82-
'@import (type) "some/file.css" media;',
83-
'some/file.css',
84-
'some/file.css',
85-
"@import (type) 'some/file.css' media;",
85+
'non-modular notation, no extension' => [
86+
'@import (type) \'some/file\' media;',
87+
'some/file.less',
88+
'some/file.less',
89+
'@import (type) \'some/file.less\' media;',
8690
],
8791
'modular, with extension' => [
8892
'@import (type) "Magento_Module::something.css" media;',
8993
'Magento_Module::something.css',
9094
'Magento_Module/something.css',
91-
"@import (type) 'Magento_Module/something.css' media;",
95+
'@import (type) "Magento_Module/something.css" media;',
96+
],
97+
'remote file import url()' => [
98+
'@import (type) url("http://example.com/css/some.css") media;',
99+
'http://example.com/css/some.css',
100+
null,
101+
'@import (type) url("http://example.com/css/some.css") media;',
102+
],
103+
'invalid path' => [
104+
'@import (type) url("/example.com/css/some.css") media;',
105+
'/example.com/css/some.css',
106+
null,
107+
'@import (type) url("/example.com/css/some.css") media;',
92108
],
93109
'modular, no extension' => [
94110
'@import (type) "Magento_Module::something" media;',
95111
'Magento_Module::something.less',
96112
'Magento_Module/something.less',
97-
"@import (type) 'Magento_Module/something.less' media;",
113+
'@import (type) "Magento_Module/something.less" media;',
98114
],
99115
'no type' => [
100116
'@import "Magento_Module::something.css" media;',
101117
'Magento_Module::something.css',
102118
'Magento_Module/something.css',
103-
"@import 'Magento_Module/something.css' media;",
119+
'@import "Magento_Module/something.css" media;',
104120
],
105121
'no media' => [
106122
'@import (type) "Magento_Module::something.css";',
107123
'Magento_Module::something.css',
108124
'Magento_Module/something.css',
109-
"@import (type) 'Magento_Module/something.css';",
125+
'@import (type) "Magento_Module/something.css";',
126+
],
127+
'with single line comment, replace' => [
128+
'@import (type) "some/file" media;' . PHP_EOL
129+
. '// @import (type) "unnecessary/file.css" media;',
130+
'some/file.less',
131+
'some/file.less',
132+
'@import (type) "some/file.less" media;' . PHP_EOL,
110133
],
111-
'with single line comment' => [
112-
'@import (type) "some/file.css" media;' . PHP_EOL
113-
. '// @import (type) "unnecessary/file.css" media;',
114-
'some/file.css',
115-
'some/file.css',
116-
"@import (type) 'some/file.css' media;" . PHP_EOL,
134+
'with single line comment, no replace' => [
135+
'@import (type) "some/file.less" media;' . PHP_EOL
136+
. '// @import (type) "unnecessary/file" media;',
137+
'some/file.less',
138+
'some/file.less',
139+
'@import (type) "some/file.less" media;' . PHP_EOL
140+
. '// @import (type) "unnecessary/file" media;',
117141
],
118142
'with multi line comment' => [
119-
'@import (type) "some/file.css" media;' . PHP_EOL
143+
'@import (type) "some/file" media;' . PHP_EOL
120144
. '/* @import (type) "unnecessary/file.css" media;' . PHP_EOL
121145
. '@import (type) "another/unnecessary/file.css" media; */',
122-
'some/file.css',
123-
'some/file.css',
124-
"@import (type) 'some/file.css' media;" . PHP_EOL,
146+
'some/file.less',
147+
'some/file.less',
148+
'@import (type) "some/file.less" media;' . PHP_EOL,
125149
],
126150
];
127151
}

0 commit comments

Comments
 (0)