Skip to content

Commit

Permalink
Merge pull request #1131 from morozov/2.0
Browse files Browse the repository at this point in the history
Merge branch 'master' into 2.0
  • Loading branch information
morozov committed Dec 26, 2019
2 parents 393635c + bc13d06 commit 75f032f
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 22 deletions.
3 changes: 3 additions & 0 deletions composer.json
Expand Up @@ -29,6 +29,9 @@
"php": "^7.2",
"symfony/yaml": "^2.8"
},
"conflict": {
"corneltek/getoptionkit": ">=2.4.0"
},
"require-dev": {
"php-vcr/php-vcr": "^1.4",
"phpunit/phpunit": "^7.5",
Expand Down
16 changes: 8 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified phpbrew
Binary file not shown.
26 changes: 13 additions & 13 deletions phpbrew.asc
@@ -1,17 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJeAxTDAAoJEDdOra9UOumVLScP/2yZpwQfyUP0HRQVd1hVud7P
qjm8Qoz7JdLJbO3oeOAWHPn9QKoNrxaqP1b14diO6liB3lyzMXrblVFA7yqCeZdh
Wc/EQMKbq3d9EZkUM3dHae/YukVA2fenmPkhoP4IREoU3PL8X+X4KDzbc+6XoNsG
+5o3/DvrFIlivHlK0LzKKKOEdUMVEhEqZX2dPttA+D6+Rlrlb3/k7focmhOkC2uo
zRpHMg6PuSRFlBkqIrErg//TL4n33yM8/G7nIq9ljMdWtso5Bs3u1CTkjVuBezR1
A1vwK3cp/G5jKZTCzsvpKLtZPygra8Rl5cLZrLjmJkNGtTaG2dw0KOVaJZBUoLn7
v9CT60LbUuQTSkw541bleDRCNdNG/uYU1nKmS29BXtPA9bGRJXxH5B69TspcwT7S
blWkPfspt1GVOJr1acZ6azYm5xgLf4vDyZ8Wb65u8bbqlLFIntYw4TBjZdOgXNzt
2S1Gxy4L6gGvZv4O4LuLb8cO6jU+tro1/qUXigjDcYLVCyjPCpyF9aW4A70vOvhu
62/kOpgtgvmyMKF/xkPk51pZ4enSHhHA25n+jy8pRKE9om7IVzwh4qt1qMuUevla
N+H9tCS5oRKywEpjs1Y+nuzspTk/vdvxF3nfwr4qid0qxeyP6Jh1ogFzcIuXIvjP
z2phyCnn1pm17DoDfgzs
=v1Nk
iQIcBAABAgAGBQJeBBVrAAoJEDdOra9UOumVOu8QAJo+lTb885rMmxFtvAHTEqXX
k7ylIvWK+jq94EFvbJyMJMchCOGolWs8qr+tKStQ6k2ePUIUmPFj2iBicDhwmbJS
Abro6rCjqizTUC2E5wcXADBchWzhTIg/rBexfZ04nJ7K8DFmMiSp69MYI67S9lE+
Py7B+p3mFK2xnzz0yeXgWrsU6Ks2fPuC5FrbSDR0Tn2OqRib7ZWld/xaiuUbKG/c
WdBXBulY2AHIFb3lEpkwxPBUy/rzl7ltKQBzPbKVLSQLsx9DZX8+7zPzbOxSe3Yf
6ZEXnXfDs7lrs/Xxj0qZ1oJZu+yakpWq/XiMAKRouqNN6PGFhD1WUa9c/ZZPJsfW
nXIqT/PAQKPYPf4R4dOtd88Mgdu/FCJOzzCOUJ6KyTuw3yyRLiQSF9YaMunOQVdj
Xrd/vHbRQfOPUyO2B6DFzGaKzv8zY3HFNCPPHNyt5DCSRyuxUF72SOaUyWb0TlSo
PECHmLVf30X+myXOAHI1WAWkbg63+NqfiD/3HffXypClr8xm/av4rNC9SWILOY2c
eRxCiRuoPCD3lE/iz8OnIUj6bWcjX8ZlyPsZ+LVtNOGJ+eAIb6DjO9P/H3gghmF9
0UXaLO9UOB76SvzTujRhUUmw/ifKk9PDczcUv2gvTwovOhbeNC+k4+JLOLd5SdK9
YFxE+pHLw2TpoGH27137
=aVZv
-----END PGP SIGNATURE-----
2 changes: 1 addition & 1 deletion src/Console.php
Expand Up @@ -14,7 +14,7 @@
class Console extends Application
{
const NAME = 'phpbrew';
const VERSION = '1.25.0';
const VERSION = '1.25.1';

public function options($opts)
{
Expand Down

0 comments on commit 75f032f

Please sign in to comment.