1
0
mirror of https://github.com/mrclay/minify.git synced 2025-08-16 02:54:33 +02:00

Auto-cast source lists to array so the user needn't make an array for one file/source.

This commit is contained in:
Steve Clay
2008-06-27 21:41:37 +00:00
parent 16079919fb
commit 9127fa750e
5 changed files with 8 additions and 7 deletions

View File

@@ -36,11 +36,11 @@ class Minify_Controller_Files extends Minify_Controller_Base {
*
* Controller options:
*
* 'files': (required) array of complete file paths
* 'files': (required) array of complete file paths, or a single path
*/
public function setupSources($options) {
// strip controller options
$files = $options['files'];
$files = (array)$options['files'];
unset($options['files']);
$sources = array();

View File

@@ -56,7 +56,7 @@ class Minify_Controller_Groups extends Minify_Controller_Base {
return $options;
}
$sources = array();
foreach ($groups[$pi] as $file) {
foreach ((array)$groups[$pi] as $file) {
if ($file instanceof Minify_Source) {
$sources[] = $file;
continue;

View File

@@ -32,6 +32,8 @@ class Minify_Controller_Page extends Minify_Controller_Base {
*
* 'minifyAll': should all CSS and Javascript blocks be individually
* minified? (default false)
*
* @todo Add 'file' option to read HTML file.
*/
public function setupSources($options) {
// strip controller options

View File

@@ -33,7 +33,8 @@ if (isset($_GET['f'])) {
// The Files controller can serve an array of files, but here we just
// need one.
Minify::serve('Files', array(
'files' => array(dirname(__FILE__) . '/../' . $filename)
// controller will cast a string to an array for you
'files' => dirname(__FILE__) . '/../' . $filename
));
exit();
}

View File

@@ -26,9 +26,7 @@ function test_Minify()
'headers' => array()
);
$output = Minify::serve('Files', array(
'files' => array(
$thisDir . '/_test_files/css/styles.css'
)
'files' => $thisDir . '/_test_files/css/styles.css' // controller casts to array
,'quiet' => true
,'lastModifiedTime' => $lastModified
,'encodeOutput' => false