mirror_php/minify
1
0
Fork 0
mirror of https://github.com/matthiasmullie/minify.git synced 2025-02-21 15:03:09 +01:00
Code Issues Packages Releases Wiki Activity

Remove whitespace around + and &

Browse Source 
Fixes #259
This commit is contained in:
Matthias Mullie 2018-11-26 22:57:05 +01:00
parent 107ed7bc85
commit bb864e00cd
2 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/CSS.php
View File

@ -307,6 +307,7 @@ class CSS extends Minify
*/
$this->extractStrings();
$this->stripComments();
$this->extractCalcs();
$css = $this->replace($css);
$css = $this->stripWhitespace($css);
@ -585,11 +586,7 @@ class CSS extends Minify
// `5px - 0px` is valid, but `5px - 0` is not
// `10px * 0` is valid (equates to 0), and so is `10 * 0px`, but
// `10 * 0` is invalid
// best to just leave `calc()`s alone, even if they could be optimized
// (which is a whole other undertaking, where units & order of
// operations all need to be considered...)
$calcs = $this->findCalcs($content);
$content = str_replace($calcs, array_keys($calcs), $content);
// we've extracted calcs earlier, so we don't need to worry about this
// reusable bits of code throughout these regexes:
// before & after are used to make sure we don't match lose unintended
@ -626,9 +623,6 @@ class CSS extends Minify
$content = preg_replace('/flex:([0-9]+\s[0-9]+\s)0([;\}])/', 'flex:${1}0%${2}', $content);
$content = preg_replace('/flex-basis:0([;\}])/', 'flex-basis:0%${1}', $content);
// restore `calc()` expressions
$content = str_replace(array_keys($calcs), $calcs, $content);
return $content;
}
@ -674,8 +668,8 @@ class CSS extends Minify
// remove whitespace around meta characters
// inspired by stackoverflow.com/questions/15195750/minify-compress-css-with-regex
$content = preg_replace('/\s*([\*$~^|]?+=|[{};,>~]|!important\b)\s*/', '$1', $content);
$content = preg_replace('/([\[(:])\s+/', '$1', $content);
$content = preg_replace('/\s+([\]\)])/', '$1', $content);
$content = preg_replace('/([\[(:>\+])\s+/', '$1', $content);
$content = preg_replace('/\s+([\]\)>\+])/', '$1', $content);
$content = preg_replace('/\s+(:)(?![^\}]*\{)/', '$1', $content);
// whitespace around + and - can only be stripped inside some pseudo-
@ -692,18 +686,13 @@ class CSS extends Minify
}
/**
* Find all `calc()` occurrences.
*
* @param string $content The CSS content to find `calc()`s in.
*
* @return string[]
* Replace all `calc()` occurrences.
*/
protected function findCalcs($content)
protected function extractCalcs()
{
$results = array();
preg_match_all('/calc(\(.+?)(?=$|;|calc\()/', $content, $matches, PREG_SET_ORDER);
foreach ($matches as $match) {
// PHP only supports $this inside anonymous functions since 5.4
$minifier = $this;
$callback = function ($match) use ($minifier) {
$length = strlen($match[1]);
$expr = '';
$opened = 0;
@ -717,11 +706,17 @@ class CSS extends Minify
break;
}
}
$rest = str_replace($expr, '', $match[1]);
$expr = trim(substr($expr, 1, -1));
$results['calc('.count($results).')'] = 'calc'.$expr;
}
$count = count($minifier->extracted);
$placeholder = 'calc('.$count.')';
$minifier->extracted[$placeholder] = 'calc('.$expr.')';
return $results;
return $placeholder.$rest;
};
$this->registerPattern('/calc(\(.+?)(?=$|;|calc\()/', $callback);
}
/**

22
tests/css/CSSTest.php
View File

@ -742,6 +742,28 @@ body{font-family:sans-serif}',
'@import url(http://minify.dev/?a=1&b=some/*lala*/thing);p{color:red}body{font-family:sans-serif}',
);
// https://github.com/matthiasmullie/minify/issues/259
$tests[] = array(
'#layout-newsletter-change .unsubscribe :checked + label .circle, #layout-newsletter-change .pause : checked + label .circle { color: white }',
'#layout-newsletter-change .unsubscribe :checked+label .circle,#layout-newsletter-change .pause :checked+label .circle{color:white}',
);
$tests[] = array(
'input + label{color:white}',
'input+label{color:white}',
);
$tests[] = array(
'input +label{color:white}',
'input+label{color:white}',
);
$tests[] = array(
'input+ label{color:white}',
'input+label{color:white}',
);
$tests[] = array(
'div{width:calc(100px + 100px)}',
'div{width:calc(100px + 100px)}',
);
return $tests;
}