From 9127fa750e1fee34017b7c08c47128d205eaeb17 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Fri, 27 Jun 2008 21:41:37 +0000
Subject: [PATCH] Auto-cast source lists to array so the user needn't make an
 array for one file/source.

---
 lib/Minify/Controller/Files.php  | 4 ++--
 lib/Minify/Controller/Groups.php | 2 +-
 lib/Minify/Controller/Page.php   | 2 ++
 web/examples/3/m.php             | 3 ++-
 web/test/test_Minify.php         | 4 +---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/Minify/Controller/Files.php b/lib/Minify/Controller/Files.php
index 187274a..2be6668 100644
--- a/lib/Minify/Controller/Files.php
+++ b/lib/Minify/Controller/Files.php
@@ -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();
diff --git a/lib/Minify/Controller/Groups.php b/lib/Minify/Controller/Groups.php
index 2024230..38a3c67 100644
--- a/lib/Minify/Controller/Groups.php
+++ b/lib/Minify/Controller/Groups.php
@@ -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;
diff --git a/lib/Minify/Controller/Page.php b/lib/Minify/Controller/Page.php
index d0d0e9b..aa4ab91 100644
--- a/lib/Minify/Controller/Page.php
+++ b/lib/Minify/Controller/Page.php
@@ -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
diff --git a/web/examples/3/m.php b/web/examples/3/m.php
index 0bbcc66..a4c1fff 100644
--- a/web/examples/3/m.php
+++ b/web/examples/3/m.php
@@ -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();
     }
diff --git a/web/test/test_Minify.php b/web/test/test_Minify.php
index a7a46e1..fe8e004 100644
--- a/web/test/test_Minify.php
+++ b/web/test/test_Minify.php
@@ -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