[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add drush via composer.

2017-08-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/369593 )

Change subject: Add drush via composer.
..


Add drush via composer.

I discussed upgrading drush with Casey & he felt we were
better to switch to drush via composer - this commit adds it in

Bug: 171435

Change-Id: I6c821ff467ff891fb0c6e3d94046e237079123a6
---
M composer.json
M composer.lock
2 files changed, 987 insertions(+), 290 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/composer.json b/composer.json
index 17283df..7633929 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,8 @@
 "phpseclib/phpseclib":  "~2.0",
 "predis/predis": "1.*",
 "twig/twig": "1.*",
-"wikimedia/composer-merge-plugin": "^1.4"
+"wikimedia/composer-merge-plugin": "^1.4",
+"drush/drush": "^8.1"
 },
 "repositories": [
   {
diff --git a/composer.lock b/composer.lock
index b6be6ff..d15ed38 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "31353eb88ccf3548983207723255bb5f",
+"content-hash": "b27331ac0c4835d866123ea5c6b2f833",
 "packages": [
 {
 "name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -252,6 +252,105 @@
 "time": "2014-05-19T10:25:02+00:00"
 },
 {
+"name": "consolidation/annotated-command",
+"version": "1.4.1",
+"source": {
+"type": "git",
+"url": 
"https://github.com/consolidation/annotated-command.git;,
+"reference": "c2dc2464e1edf0498bf97a99f34cac5805d00946"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/consolidation/annotated-command/zipball/c2dc2464e1edf0498bf97a99f34cac5805d00946;,
+"reference": "c2dc2464e1edf0498bf97a99f34cac5805d00946",
+"shasum": ""
+},
+"require": {
+"php": ">=5.4.0",
+"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+"psr/log": "~1.0",
+"symfony/console": "~2.5|~3.0",
+"symfony/event-dispatcher": "~2.5|~3.0",
+"symfony/finder": "~2.5|~3.0"
+},
+"require-dev": {
+"consolidation/output-formatters": "~1",
+"phpunit/phpunit": "4.*",
+"satooshi/php-coveralls": "^1.0",
+"squizlabs/php_codesniffer": "2.*"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"Consolidation\\AnnotatedCommand\\": "src"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Greg Anderson",
+"email": "greg.1.ander...@greenknowe.org"
+}
+],
+"description": "Initialize Symfony Console commands from annotated 
command class methods.",
+"time": "2016-09-13T21:37:50+00:00"
+},
+{
+"name": "consolidation/output-formatters",
+"version": "1.1.0",
+"source": {
+"type": "git",
+"url": 
"https://github.com/consolidation/output-formatters.git;,
+"reference": "aadb1ed2deb72bc1351bb6f3b3ddd328222e9261"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/consolidation/output-formatters/zipball/aadb1ed2deb72bc1351bb6f3b3ddd328222e9261;,
+"reference": "aadb1ed2deb72bc1351bb6f3b3ddd328222e9261",
+"shasum": ""
+},
+"require": {
+"php": ">=5.4.0",
+"symfony/console": "~2.5|~3.0"
+},
+"require-dev": {
+"phpunit/phpunit": "4.*",
+"satooshi/php-coveralls": "^1.0",
+"squizlabs/php_codesniffer": "2.*"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"Consolidation\\OutputFormatters\\": "src"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add drush via composer.

2017-08-01 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369593 )

Change subject: Add drush via composer.
..

Add drush via composer.

I discussed upgrading drush with Casey & he felt we were
better to switch to drush via composer - this commit adds it in

Change-Id: I6c821ff467ff891fb0c6e3d94046e237079123a6
---
M composer.json
M composer.lock
2 files changed, 987 insertions(+), 290 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/93/369593/1

diff --git a/composer.json b/composer.json
index 17283df..7633929 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,8 @@
 "phpseclib/phpseclib":  "~2.0",
 "predis/predis": "1.*",
 "twig/twig": "1.*",
-"wikimedia/composer-merge-plugin": "^1.4"
+"wikimedia/composer-merge-plugin": "^1.4",
+"drush/drush": "^8.1"
 },
 "repositories": [
   {
diff --git a/composer.lock b/composer.lock
index b6be6ff..d15ed38 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "31353eb88ccf3548983207723255bb5f",
+"content-hash": "b27331ac0c4835d866123ea5c6b2f833",
 "packages": [
 {
 "name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -252,6 +252,105 @@
 "time": "2014-05-19T10:25:02+00:00"
 },
 {
+"name": "consolidation/annotated-command",
+"version": "1.4.1",
+"source": {
+"type": "git",
+"url": 
"https://github.com/consolidation/annotated-command.git;,
+"reference": "c2dc2464e1edf0498bf97a99f34cac5805d00946"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/consolidation/annotated-command/zipball/c2dc2464e1edf0498bf97a99f34cac5805d00946;,
+"reference": "c2dc2464e1edf0498bf97a99f34cac5805d00946",
+"shasum": ""
+},
+"require": {
+"php": ">=5.4.0",
+"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+"psr/log": "~1.0",
+"symfony/console": "~2.5|~3.0",
+"symfony/event-dispatcher": "~2.5|~3.0",
+"symfony/finder": "~2.5|~3.0"
+},
+"require-dev": {
+"consolidation/output-formatters": "~1",
+"phpunit/phpunit": "4.*",
+"satooshi/php-coveralls": "^1.0",
+"squizlabs/php_codesniffer": "2.*"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"Consolidation\\AnnotatedCommand\\": "src"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Greg Anderson",
+"email": "greg.1.ander...@greenknowe.org"
+}
+],
+"description": "Initialize Symfony Console commands from annotated 
command class methods.",
+"time": "2016-09-13T21:37:50+00:00"
+},
+{
+"name": "consolidation/output-formatters",
+"version": "1.1.0",
+"source": {
+"type": "git",
+"url": 
"https://github.com/consolidation/output-formatters.git;,
+"reference": "aadb1ed2deb72bc1351bb6f3b3ddd328222e9261"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/consolidation/output-formatters/zipball/aadb1ed2deb72bc1351bb6f3b3ddd328222e9261;,
+"reference": "aadb1ed2deb72bc1351bb6f3b3ddd328222e9261",
+"shasum": ""
+},
+"require": {
+"php": ">=5.4.0",
+"symfony/console": "~2.5|~3.0"
+},
+"require-dev": {
+"phpunit/phpunit": "4.*",
+"satooshi/php-coveralls": "^1.0",
+"squizlabs/php_codesniffer": "2.*"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"Consolidation\\OutputFormatters\\": "src"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+