Merge branch 'develop'

arissetyawan · Aug 4, 2014 · 4dc5041 · 4dc5041
2 parents fa5aeab + ea7c1b0
commit 4dc5041
Show file tree

Hide file tree

Showing 3 changed files with 329 additions and 304 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.5.0
+
+- Bumped minimum requirement to 5.4
+
 ## 3.4.4
 
 - Last release for PHP 5.3

diff --git a/composer.json b/composer.json
@@ -16,19 +16,19 @@
     }
   ],
   "require": {
-		"php": ">=5.3.0",
+		"php": ">=5.4.0",
     "anahkiasen/html-object": "~1.4",
-    "illuminate/config": "4.0.*",
-    "illuminate/container": "4.0.*",
-    "illuminate/http": "4.0.*",
-    "illuminate/routing": "4.0.*",
-    "illuminate/session": "4.0.*",
-    "illuminate/translation" :"4.0.*"
+    "illuminate/config": "~4.2",
+    "illuminate/container": "~4.2",
+    "illuminate/http": "~4.2",
+    "illuminate/routing": "~4.2",
+    "illuminate/session": "~4.2",
+    "illuminate/translation" :"~4.2"
   },
   "require-dev": {
 		"phpunit/phpunit": "~4.1.4",
     "mockery/mockery": "~0.9.1",
-    "illuminate/database": "4.0.*"
+    "illuminate/database": "~4.2"
   },
   "autoload": {
     "psr-4": {