mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-15 10:34:02 +02:00
Code Issues Releases Wiki Activity

Allow sources to have null contentType if serve is given one

Browse Source
This commit is contained in:
Steve Clay
2015-09-29 13:18:10 -04:00
parent a566536f80
commit 12e7a8d0dd
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Minify.php
View File

@@ -652,9 +652,24 @@ class Minify {
$type = null;
foreach ($this->sources as $source) {
$sourceType = $source->getContentType();
if (!empty($options['contentType'])) {
// just verify sources have null content type or match the options
if ($sourceType !== null && $sourceType !== $options['contentType']) {
// TODO better logging
Minify_Logger::log('ContentType mismatch');
$this->sources = array();
return $options;
}
continue;
}
if ($type === null) {
$type = $source->getContentType();
} elseif ($source->getContentType() !== $type) {
$type = $sourceType;
} elseif ($sourceType !== $type) {
// TODO better logging
Minify_Logger::log('ContentType mismatch');
@@ -663,10 +678,13 @@ class Minify {
return $options;
}
}
if (empty($options['contentType'])) {
if (null === $type) {
$type = 'text/plain';
}
$options['contentType'] = $type;
}
// last modified is needed for caching, even if setExpires is set
if (!isset($options['lastModifiedTime'])) {

2
lib/Minify/SourceInterface.php
View File

@@ -47,7 +47,7 @@ interface Minify_SourceInterface {
/**
* Get the content type
*
* @return string
* @return string|null
*/
public function getContentType();