Added Util::readConfigFile() method to enable easier configration s…

…haring between different workflows; e.g. command-line and server.
peteboere · Jun 11, 2014 · 6bea9c1 · 6bea9c1
1 parent c14837f
commit 6bea9c1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/lib/CssCrush/Util.php b/lib/CssCrush/Util.php
@@ -222,6 +222,12 @@ public static function parseIni($path, $sections = false)
         return $result;
     }
 
+    public static function readConfigFile($path)
+    {
+        require_once $path;
+        return Options::filter(get_defined_vars());
+    }
+
     /*
      * Encode integer to Base64 VLQ.
      */

diff --git a/lib/functions.php b/lib/functions.php
@@ -90,7 +90,7 @@ function csscrush_string($string, $options = array()) {
 
     Crush::$process = new CssCrush\Process($options, array('type' => 'filter', 'data' => $string));
 
-    return Crush::$process->compile()->__toString();
+    return Crush::$process->compile();
 }
 
 

diff --git a/tests/unit/CssCrush/OptionsTest.php b/tests/unit/CssCrush/OptionsTest.php
@@ -42,8 +42,8 @@ public function testBoilerplate()
             'newlines' => 'unix',
         ));
 
-        $this->assertContains(' * ' . csscrush_version(), $result);
-        $this->assertContains(" * Line breaks\n * preserved\n *", $result);
+        $this->assertContains(' * ' . csscrush_version(), (string) $result);
+        $this->assertContains(" * Line breaks\n * preserved\n *", (string) $result);
     }
 
     public function testFormatters()

diff --git a/tests/unit/CssCrush/UtilTest.php b/tests/unit/CssCrush/UtilTest.php
@@ -89,4 +89,20 @@ public function testFilePutContents()
         $test_file = sys_get_temp_dir() . '/' . str_replace('\\', '_', __CLASS__);
         $this->assertTrue(Util::filePutContents($test_file, 'Hello Mum'));
     }
+
+    public function testReadConfigFile()
+    {
+        $contents = <<<'NOW_DOC'
+<?php
+
+$enable = array('svg', 'px2em');
+$boilerplate = true;
+$unrecognised_option = true;
+
+NOW_DOC;
+
+        $options = Util::readConfigFile(temp_file($contents));
+        $this->assertArrayHasKey('enable', $options);
+        $this->assertArrayNotHasKey('unrecognised_option', $options);
+    }
 }