diff --git a/README.md b/README.md index e6362ed..8999a0d 100644 --- a/README.md +++ b/README.md @@ -26,13 +26,14 @@ Copy the `dev/config.dist.php` to `dev/config.php`, and edit the file to configu return [ 'username' => 'myMergeBot', // Your github username 'password' => 'somepass123', // Your github password - // The title that will be used for your PR's, %s being the branch names: + // The title that will be used for your PRs, the first %s being the + // branch to merge from, the second %s being the to branch to merge to. 'prTitle' => 'Make sure that %s is in %s!', // Message the PRBot uses for the pull request: 'prBody' => '![](https://heavyeditorial.files.wordpress.com/2012/08/thumbsup.gif)', 'github' => [ - // http://github.com/UserOrOrganisation/ProjectA - 'UserOrOrganisation' => [ + // http://github.com/SomeUserOrOrganisation/ProjectA + 'SomeUserOrOrganisation' => [ 'ProjectA' => [ // Merges back release/1.1 into release/1.2 'release/1.1' => 'release/1.2', @@ -40,8 +41,8 @@ return [ 'release/1.2' => 'develop', ], ], - // http://github.com/UserOrOrganisation/ProjectB - 'UserOrOrganisation' => [ + // http://github.com/AnotherUserOrOrganisation/ProjectB + 'AnotherUserOrOrganisation' => [ 'ProjectB' => [ // Merges back release/2.0 into develop 'release/2.0' => 'develop', diff --git a/composer.json b/composer.json index c5d8312..0becc90 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,8 @@ "name": "enrise/prbot", "description": "Automated pull requests for forgotten merge-backs", "require": { - "tan-tan-kanarek/github-php-client": "^1.0" + "tan-tan-kanarek/github-php-client": "^1.0", + "ext-curl": "*" }, "authors": [ { diff --git a/composer.lock b/composer.lock index 0c62a90..6c1b0fd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "44346c42a6b91133d2eeea85010c0ae8", - "content-hash": "b4ce4f6a33cd66e59b4a5e7ca954ff62", + "hash": "5afbeb5fe63200528fc78d89280cdfbe", + "content-hash": "521ce3d623715c35bac8fa642ca8078a", "packages": [ { "name": "tan-tan-kanarek/github-php-client", @@ -41,6 +41,8 @@ "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "ext-curl": "*" + }, "platform-dev": [] } diff --git a/src/run.php b/src/run.php index c3a90a8..24b032d 100644 --- a/src/run.php +++ b/src/run.php @@ -1,7 +1,7 @@