mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-18 20:01:21 +02:00
Code Issues Releases Wiki Activity

Minify no longer tries to minify -min.js/.min.js files

Browse Source 
2.2 used empty string as a magical value meaning do not minify, but
in the refactoring `Minify::combineMinify` forgot to interpret this
value that way and instead inherited the default compressor for the type.

This eliminates `""` as a magical value, but for BC rewrites it to
`Minify::nullMinifier` in the sources.

Fixes #499
This commit is contained in:
Steve Clay
2016-02-26 11:16:16 -05:00
parent 0b466c0892
commit 7dbd2c87e4
8 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Minify/Source.php
View File

@@ -104,7 +104,7 @@ class Minify_Source implements Minify_SourceInterface {
$this->contentType = $spec['contentType'];
}
if (isset($spec['minifier'])) {
$this->minifier = $spec['minifier'];
$this->setMinifier($spec['minifier']);
}
if (isset($spec['minifyOptions'])) {
$this->minifyOptions = $spec['minifyOptions'];
@@ -130,8 +130,15 @@ class Minify_Source implements Minify_SourceInterface {
/**
* {@inheritdoc}
*/
public function setMinifier($minifier)
public function setMinifier($minifier = null)
{
if ($minifier === '') {
error_log(__METHOD__ . " cannot accept empty string. Use 'Minify::nullMinifier' or 'trim'.");
$minifier = 'Minify::nullMinifier';
}
if ($minifier !== null && !is_callable($minifier, true)) {
throw new \InvalidArgumentException('minifier must be null or a valid callable');
}
$this->minifier = $minifier;
}