Merge branch '2.1' into 2.2

orchestral · Jul 5, 2014 · 10c42a2 · 10c42a2
2 parents 92b8f69 + fc91df9
commit 10c42a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -103,6 +103,8 @@ To see a working example of testbench including how to set your configuration, c
 
 ### Cannot redeclare crypt_random_string()
 
+> To avoid this, please use `"phpseclib/phpseclib": ">=0.3.7"` which already solve the issue, otherwise read the alternative solution below.
+
 Due to the requirement with Laravel Framework 4.1, we need to maintain a modified version of `phpseclib/phpseclib` for developing Laravel/PHP packages using workbench. In order to make this work please include the following code in both your `composer.json` file for `app` and `workbench`:
 
 ```json

diff --git a/composer.json b/composer.json
@@ -16,12 +16,6 @@
 			"Orchestra\\Testbench\\" : "src/Testbench/"
 		}
 	},
-	"repositories": [
-		{
-			"type": "vcs",
-			"url": "git://github.com/orchestral/phpseclib.git"
-		}
-	],
 	"require": {
 		"php": ">=5.4.0",
 		"laravel/framework": "4.2.*"