Merge pull request #10 from fire015/v1.5

V1.5
fire015 · May 29, 2014 · 06b373e · 06b373e
2 parents 9a3d8b9 + 7fc3060
commit 06b373e
Show file tree

Hide file tree

Showing 7 changed files with 286 additions and 255 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,10 @@
 language: php
+
 php:
   - 5.5
   - 5.4
   - 5.3
-  - hhvm
+  - hhvm
+
+before_script:
+  - composer install
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 Change Log
 ==========
+### 29/05/2014 - 1.5
+* Reduced some internal complexity
+* Fixed gzip compression
+* Unit tests now running against all options
+* Removed `setOptions` method, must be passed into the `load` method
 
 ### 11/03/2014 - 1.4
 * Now using Composer

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ The easiest way to install Flintstone is via [composer](http://getcomposer.org/)
 ```json
 {
     "require": {
-        "fire015/flintstone": "*"
+        "fire015/flintstone": "1.*"
     }
 }
 ```

diff --git a/src/Flintstone/Flintstone.php b/src/Flintstone/Flintstone.php
@@ -14,7 +14,7 @@ class Flintstone {
 	 * @access public
 	 * @var string
 	 */
-	const VERSION = '1.4';
+	const VERSION = '1.5';
 
 	/**
 	 * Static instance
@@ -36,7 +36,7 @@ public static function load($database, $options = array()) {
 
 		return self::$instance[$database];
 	}
-	
+
 	/**
 	 * Unload a database
 	 * @param string $database the database name
-Original file line number
+Diff line change
@@ Expand Up @@
     ```json
     {
         "require": {
-            "fire015/flintstone": "*"
+            "fire015/flintstone": "1.*"
         }
     }
     ```
@@ Expand Down @@