Merge branch 'develop'

lesstif · Dec 31, 2015 · 917b6ca · 917b6ca
2 parents 406bf42 + 3832b40
commit 917b6ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,4 +1,10 @@
 
+# Requirements
+
+- PHP >= 5.4.9
+- [php JsonMapper](https://github.com/netresearch/jsonmapper)
+- [phpdotenv](https://github.com/vlucas/phpdotenv)
+
 # Installation
 
 1. Download and Install PHP Composer.
@@ -19,6 +25,9 @@
 	    }
 	}
 	```
+	**Note:**
+	If you are using **laravel 5.0 or 5.1**(this version dependent on phpdotenv 1.x), then use **"1.5.\*"** version instead.
+
 3. Then run Composer's install or update commands to complete installation. 
 
 	```sh

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "php": ">=5.4.0",
         "netresearch/jsonmapper": "~0.5",
         "monolog/monolog": "~1.12",
-        "vlucas/phpdotenv" : "~1.0",
+        "vlucas/phpdotenv": "~2.0",
         "mockery/mockery": "^0.9.4"
     },
     "require-dev": {