Skip to content
Snippets Groups Projects
Commit 0b0982fc authored by Ievgen Kolesov's avatar Ievgen Kolesov
Browse files

Merge remote-tracking branch 'origin/MAGETWO-59579' into pr-develop

parents 6619bdfb 4488d4c0
No related merge requests found
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
// @codingStandardsIgnoreFile
namespace Magento\Framework\Css\PreProcessor\Instruction; namespace Magento\Framework\Css\PreProcessor\Instruction;
use Magento\Framework\View\Asset\LocalInterface; use Magento\Framework\View\Asset\LocalInterface;
...@@ -22,7 +20,10 @@ class Import implements PreProcessorInterface ...@@ -22,7 +20,10 @@ class Import implements PreProcessorInterface
* Pattern of @import instruction * Pattern of @import instruction
*/ */
const REPLACE_PATTERN = const REPLACE_PATTERN =
'#@import\s+(\((?P<type>\w+)\)\s+)?[\'\"](?P<path>(?![/\\\]|\w:[/\\\])[^\"\']+)[\'\"]\s*?(?P<media>.*?);#'; '#@import(?!.*?\surl\(.*?)'
. '(?P<start>[\(\),\w\s]*?[\'\"])'
. '(?P<path>(?![/\\\]|\w*?:[/\\\])[^\"\']+)'
. '(?P<end>[\'\"][\s\w\(\)]*?);#';
/** /**
* @var \Magento\Framework\View\Asset\NotationResolver\Module * @var \Magento\Framework\View\Asset\NotationResolver\Module
...@@ -133,9 +134,9 @@ class Import implements PreProcessorInterface ...@@ -133,9 +134,9 @@ class Import implements PreProcessorInterface
$matchedFileId = $this->fixFileExtension($matchedContent['path'], $contentType); $matchedFileId = $this->fixFileExtension($matchedContent['path'], $contentType);
$this->recordRelatedFile($matchedFileId, $asset); $this->recordRelatedFile($matchedFileId, $asset);
$resolvedPath = $this->notationResolver->convertModuleNotationToPath($asset, $matchedFileId); $resolvedPath = $this->notationResolver->convertModuleNotationToPath($asset, $matchedFileId);
$typeString = empty($matchedContent['type']) ? '' : '(' . $matchedContent['type'] . ') '; $start = $matchedContent['start'];
$mediaString = empty($matchedContent['media']) ? '' : ' ' . trim($matchedContent['media']); $end = $matchedContent['end'];
return "@import {$typeString}'{$resolvedPath}'{$mediaString};"; return "@import{$start}{$resolvedPath}{$end};";
} }
/** /**
......
...@@ -39,7 +39,7 @@ class ImportTest extends \PHPUnit_Framework_TestCase ...@@ -39,7 +39,7 @@ class ImportTest extends \PHPUnit_Framework_TestCase
protected function setUp() protected function setUp()
{ {
$this->notationResolver = $this->getMock( $this->notationResolver = $this->getMock(
\Magento\Framework\View\Asset\NotationResolver\Module::class, [], [], '', false \Magento\Framework\View\Asset\NotationResolver\Module::class, [], [], '', false
); );
$this->asset = $this->getMock(\Magento\Framework\View\Asset\File::class, [], [], '', false); $this->asset = $this->getMock(\Magento\Framework\View\Asset\File::class, [], [], '', false);
...@@ -63,7 +63,11 @@ class ImportTest extends \PHPUnit_Framework_TestCase ...@@ -63,7 +63,11 @@ class ImportTest extends \PHPUnit_Framework_TestCase
public function testProcess($originalContent, $foundPath, $resolvedPath, $expectedContent) public function testProcess($originalContent, $foundPath, $resolvedPath, $expectedContent)
{ {
$chain = new \Magento\Framework\View\Asset\PreProcessor\Chain($this->asset, $originalContent, 'less', 'path'); $chain = new \Magento\Framework\View\Asset\PreProcessor\Chain($this->asset, $originalContent, 'less', 'path');
$this->notationResolver->expects($this->once()) $invoke = $this->once();
if (preg_match('/^(http:|https:|\/+)/', $foundPath)) {
$invoke = $this->never();
}
$this->notationResolver->expects($invoke)
->method('convertModuleNotationToPath') ->method('convertModuleNotationToPath')
->with($this->asset, $foundPath) ->with($this->asset, $foundPath)
->will($this->returnValue($resolvedPath)); ->will($this->returnValue($resolvedPath));
...@@ -78,50 +82,70 @@ class ImportTest extends \PHPUnit_Framework_TestCase ...@@ -78,50 +82,70 @@ class ImportTest extends \PHPUnit_Framework_TestCase
public function processDataProvider() public function processDataProvider()
{ {
return [ return [
'non-modular notation' => [ 'non-modular notation, no extension' => [
'@import (type) "some/file.css" media;', '@import (type) \'some/file\' media;',
'some/file.css', 'some/file.less',
'some/file.css', 'some/file.less',
"@import (type) 'some/file.css' media;", '@import (type) \'some/file.less\' media;',
], ],
'modular, with extension' => [ 'modular, with extension' => [
'@import (type) "Magento_Module::something.css" media;', '@import (type) "Magento_Module::something.css" media;',
'Magento_Module::something.css', 'Magento_Module::something.css',
'Magento_Module/something.css', 'Magento_Module/something.css',
"@import (type) 'Magento_Module/something.css' media;", '@import (type) "Magento_Module/something.css" media;',
],
'remote file import url()' => [
'@import (type) url("http://example.com/css/some.css") media;',
'http://example.com/css/some.css',
null,
'@import (type) url("http://example.com/css/some.css") media;',
],
'invalid path' => [
'@import (type) url("/example.com/css/some.css") media;',
'/example.com/css/some.css',
null,
'@import (type) url("/example.com/css/some.css") media;',
], ],
'modular, no extension' => [ 'modular, no extension' => [
'@import (type) "Magento_Module::something" media;', '@import (type) "Magento_Module::something" media;',
'Magento_Module::something.less', 'Magento_Module::something.less',
'Magento_Module/something.less', 'Magento_Module/something.less',
"@import (type) 'Magento_Module/something.less' media;", '@import (type) "Magento_Module/something.less" media;',
], ],
'no type' => [ 'no type' => [
'@import "Magento_Module::something.css" media;', '@import "Magento_Module::something.css" media;',
'Magento_Module::something.css', 'Magento_Module::something.css',
'Magento_Module/something.css', 'Magento_Module/something.css',
"@import 'Magento_Module/something.css' media;", '@import "Magento_Module/something.css" media;',
], ],
'no media' => [ 'no media' => [
'@import (type) "Magento_Module::something.css";', '@import (type) "Magento_Module::something.css";',
'Magento_Module::something.css', 'Magento_Module::something.css',
'Magento_Module/something.css', 'Magento_Module/something.css',
"@import (type) 'Magento_Module/something.css';", '@import (type) "Magento_Module/something.css";',
],
'with single line comment, replace' => [
'@import (type) "some/file" media;' . PHP_EOL
. '// @import (type) "unnecessary/file.css" media;',
'some/file.less',
'some/file.less',
'@import (type) "some/file.less" media;' . PHP_EOL,
], ],
'with single line comment' => [ 'with single line comment, no replace' => [
'@import (type) "some/file.css" media;' . PHP_EOL '@import (type) "some/file.less" media;' . PHP_EOL
. '// @import (type) "unnecessary/file.css" media;', . '// @import (type) "unnecessary/file" media;',
'some/file.css', 'some/file.less',
'some/file.css', 'some/file.less',
"@import (type) 'some/file.css' media;" . PHP_EOL, '@import (type) "some/file.less" media;' . PHP_EOL
. '// @import (type) "unnecessary/file" media;',
], ],
'with multi line comment' => [ 'with multi line comment' => [
'@import (type) "some/file.css" media;' . PHP_EOL '@import (type) "some/file" media;' . PHP_EOL
. '/* @import (type) "unnecessary/file.css" media;' . PHP_EOL . '/* @import (type) "unnecessary/file.css" media;' . PHP_EOL
. '@import (type) "another/unnecessary/file.css" media; */', . '@import (type) "another/unnecessary/file.css" media; */',
'some/file.css', 'some/file.less',
'some/file.css', 'some/file.less',
"@import (type) 'some/file.css' media;" . PHP_EOL, '@import (type) "some/file.less" media;' . PHP_EOL,
], ],
]; ];
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment