Skip to content

Commit

Permalink
Remove the requirement to use phpseclib fork, as the problem is already
Browse files Browse the repository at this point in the history
solved on the upstream.

Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
crynobone committed Jul 5, 2014
1 parent d62fca4 commit fc91df9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,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
Expand Down
8 changes: 1 addition & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,13 @@
"Orchestra\\Testbench\\" : "src/Testbench/"
}
},
"repositories": [
{
"type": "vcs",
"url": "git://github.com/orchestral/phpseclib.git"
}
],
"require": {
"php": ">=5.3.3",
"laravel/framework": "4.1.*"
},
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
"dev-master": "2.3-dev"
}
},
"minimum-stability": "dev"
Expand Down

0 comments on commit fc91df9

Please sign in to comment.