[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig, don't list php-queue as dep
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376717 )
Change subject: Update SmashPig, don't list php-queue as dep
..
Update SmashPig, don't list php-queue as dep
We're no longer touching PHPQueue directly, so just pull it in as
a sub-dependency of SmashPig. Also, SmashPig now depends on
PHPQueue 1.0, not dev-master.
Bug: T133556
Change-Id: Ia532c35573ea0a4ff1952017d70c458c74db5eec
---
M composer.json
M composer.lock
M tests/phpunit/Adapter/PayPal/PayPalApiTest.php
M tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
4 files changed, 21 insertions(+), 23 deletions(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index a1b664a..7c57ee8 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,6 @@
]
},
"require": {
- "coderkungfu/php-queue": "dev-master",
"minfraud/http": "^1.70",
"monolog/monolog": "~1.18.2",
"neitanod/forceutf8": "^2.0",
@@ -32,7 +31,7 @@
"zordius/lightncandy": "0.23",
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
"symfony/yaml": "^2.8",
- "wikimedia/smash-pig": "dev-master",
+ "wikimedia/smash-pig": "^0.5",
"addshore/psr-6-mediawiki-bagostuff-adapter": "0.1"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index f4230a3..1c505e4 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": "05fcadc833e6b0e4c9da1a7fc7aba690",
+"content-hash": "d144ba30cc189dd2d9aae73935b0a703",
"packages": [
{
"name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -133,16 +133,16 @@
},
{
"name": "coderkungfu/php-queue",
-"version": "dev-master",
+"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/CoderKungfu/php-queue.git;,
-"reference": "dd8412f105632d31cdd77933ec40a08640752c99"
+"reference": "a9baeb0ae3b05bbd0d2f9f56c8365ff63f64524a"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/CoderKungfu/php-queue/zipball/dd8412f105632d31cdd77933ec40a08640752c99;,
-"reference": "dd8412f105632d31cdd77933ec40a08640752c99",
+"url":
"https://api.github.com/repos/CoderKungfu/php-queue/zipball/a9baeb0ae3b05bbd0d2f9f56c8365ff63f64524a;,
+"reference": "a9baeb0ae3b05bbd0d2f9f56c8365ff63f64524a",
"shasum": ""
},
"require": {
@@ -152,10 +152,10 @@
},
"require-dev": {
"amazonwebservices/aws-sdk-for-php": "dev-master",
-"aws/aws-sdk-php": "dev-master",
+"aws/aws-sdk-php": ">=2.8",
"ext-memcache": "*",
"iron-io/iron_mq": "dev-master",
-"microsoft/windowsazure": "dev-master",
+"microsoft/windowsazure": ">=0.4.0",
"mrpoundsign/pheanstalk-5.3": "dev-master",
"predis/predis": "1.*"
},
@@ -198,7 +198,7 @@
"queue",
"transaction"
],
-"time": "2017-04-17T14:11:55+00:00"
+"time": "2017-09-08T03:14:59+00:00"
},
{
"name": "corneltek/getoptionkit",
@@ -981,15 +981,15 @@
},
{
"name": "wikimedia/smash-pig",
-"version": "dev-master",
+"version": "0.5.0",
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "b6c5430d0111ada50de31550b04a5e7c1d55c86e"
+"reference": "def9c6f3cfc8e3878aa74cf94ebb8287b08ac2cc"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
-"coderkungfu/php-queue": "dev-master",
+"coderkungfu/php-queue": "^1.0",
"corneltek/getoptionkit": "^2.5",
"php": ">=5.3.3",
"phpmailer/phpmailer": "^5.2",
@@ -1001,6 +1001,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9",
+"mediawiki/mediawiki-codesniffer": "0.11.0",
"phpunit/phpunit": "^4.8"
},
"type": "library",
@@ -1037,7 +1038,7 @@
"donations",
"payments"
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig, don't list php-queue as dep
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376717 )
Change subject: Update SmashPig, don't list php-queue as dep
..
Update SmashPig, don't list php-queue as dep
We're no longer touching PHPQueue directly, so just pull it in as
a sub-dependency of SmashPig
Change-Id: Ia532c35573ea0a4ff1952017d70c458c74db5eec
---
M composer.json
M composer.lock
2 files changed, 12 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/17/376717/1
diff --git a/composer.json b/composer.json
index a1b664a..09b0a32 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,6 @@
]
},
"require": {
- "coderkungfu/php-queue": "dev-master",
"minfraud/http": "^1.70",
"monolog/monolog": "~1.18.2",
"neitanod/forceutf8": "^2.0",
diff --git a/composer.lock b/composer.lock
index f4230a3..0a030fb 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": "05fcadc833e6b0e4c9da1a7fc7aba690",
+"content-hash": "533491f308da3131394c8a0bb56c23f6",
"packages": [
{
"name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -133,16 +133,16 @@
},
{
"name": "coderkungfu/php-queue",
-"version": "dev-master",
+"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/CoderKungfu/php-queue.git;,
-"reference": "dd8412f105632d31cdd77933ec40a08640752c99"
+"reference": "a9baeb0ae3b05bbd0d2f9f56c8365ff63f64524a"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/CoderKungfu/php-queue/zipball/dd8412f105632d31cdd77933ec40a08640752c99;,
-"reference": "dd8412f105632d31cdd77933ec40a08640752c99",
+"url":
"https://api.github.com/repos/CoderKungfu/php-queue/zipball/a9baeb0ae3b05bbd0d2f9f56c8365ff63f64524a;,
+"reference": "a9baeb0ae3b05bbd0d2f9f56c8365ff63f64524a",
"shasum": ""
},
"require": {
@@ -152,10 +152,10 @@
},
"require-dev": {
"amazonwebservices/aws-sdk-for-php": "dev-master",
-"aws/aws-sdk-php": "dev-master",
+"aws/aws-sdk-php": ">=2.8",
"ext-memcache": "*",
"iron-io/iron_mq": "dev-master",
-"microsoft/windowsazure": "dev-master",
+"microsoft/windowsazure": ">=0.4.0",
"mrpoundsign/pheanstalk-5.3": "dev-master",
"predis/predis": "1.*"
},
@@ -198,7 +198,7 @@
"queue",
"transaction"
],
-"time": "2017-04-17T14:11:55+00:00"
+"time": "2017-09-08T03:14:59+00:00"
},
{
"name": "corneltek/getoptionkit",
@@ -985,11 +985,11 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "b6c5430d0111ada50de31550b04a5e7c1d55c86e"
+"reference": "160d94fd939c5697fb3a7f35cd51cff8c8f68c33"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
-"coderkungfu/php-queue": "dev-master",
+"coderkungfu/php-queue": "^1.0",
"corneltek/getoptionkit": "^2.5",
"php": ">=5.3.3",
"phpmailer/phpmailer": "^5.2",
@@ -1001,6 +1001,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9",
+"mediawiki/mediawiki-codesniffer": "0.11.0",
"phpunit/phpunit": "^4.8"
},
"type": "library",
@@ -1037,7 +1038,7 @@
"donations",
"payments"
],
-"time": "2017-08-11T18:11:19+00:00"
+"time": "2017-09-08T13:40:53+00:00"
},
{
"name": "zordius/lightncandy",
@@ -1189,7 +1190,6 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
-"coderkungfu/php-queue": 20,
"amzn/login-and-pay-with-amazon-sdk-php": 20,
"wikimedia/smash-pig": 20
},
--
To view, visit https://gerrit.wikimedia.org/r/376717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia532c35573ea0a4ff1952017d70c458c74db5eec
Gerrit-PatchSet: 1
Gerrit-Project:
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig library
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373096 )
Change subject: Update SmashPig library
..
Update SmashPig library
Change-Id: I61dd5f802b2fe0b53df0af60d0398e67a6d82493
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index 667bb33..0f8b45e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -985,7 +985,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "55b029d530803e8b73ec290bbebf1319be8c6928"
+"reference": "b6c5430d0111ada50de31550b04a5e7c1d55c86e"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1037,7 +1037,7 @@
"donations",
"payments"
],
-"time": "2017-07-25T15:59:36+00:00"
+"time": "2017-08-11T18:11:19+00:00"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/373096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61dd5f802b2fe0b53df0af60d0398e67a6d82493
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig library
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373096 )
Change subject: Update SmashPig library
..
Update SmashPig library
Change-Id: I61dd5f802b2fe0b53df0af60d0398e67a6d82493
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/96/373096/1
diff --git a/composer.lock b/composer.lock
index 667bb33..0f8b45e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -985,7 +985,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "55b029d530803e8b73ec290bbebf1319be8c6928"
+"reference": "b6c5430d0111ada50de31550b04a5e7c1d55c86e"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1037,7 +1037,7 @@
"donations",
"payments"
],
-"time": "2017-07-25T15:59:36+00:00"
+"time": "2017-08-11T18:11:19+00:00"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/373096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61dd5f802b2fe0b53df0af60d0398e67a6d82493
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig library
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369665 )
Change subject: Update SmashPig library
..
Update SmashPig library
Change-Id: Idac59be8bfb0e112c228457b335a0aced793e92e
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index 8a7255c..667bb33 100644
--- a/composer.lock
+++ b/composer.lock
@@ -985,7 +985,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "756898ef42efd9e6ff316823e4b03b6a90c78589"
+"reference": "55b029d530803e8b73ec290bbebf1319be8c6928"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1037,7 +1037,7 @@
"donations",
"payments"
],
-"time": "2017-07-05 15:58:53"
+"time": "2017-07-25T15:59:36+00:00"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/369665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idac59be8bfb0e112c228457b335a0aced793e92e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Mepps
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig library
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/369665 )
Change subject: Update SmashPig library
..
Update SmashPig library
Change-Id: Idac59be8bfb0e112c228457b335a0aced793e92e
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/65/369665/1
diff --git a/composer.lock b/composer.lock
index 8a7255c..667bb33 100644
--- a/composer.lock
+++ b/composer.lock
@@ -985,7 +985,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "756898ef42efd9e6ff316823e4b03b6a90c78589"
+"reference": "55b029d530803e8b73ec290bbebf1319be8c6928"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1037,7 +1037,7 @@
"donations",
"payments"
],
-"time": "2017-07-05 15:58:53"
+"time": "2017-07-25T15:59:36+00:00"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/369665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idac59be8bfb0e112c228457b335a0aced793e92e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig, use SourceFields logic
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354566 )
Change subject: Update SmashPig, use SourceFields logic
..
Update SmashPig, use SourceFields logic
Also gets rid of buildHeaders, since we no longer have message headers.
This is a transitional patch, testing whether the SmashPig functions
give us the same values as the existing logic. Next steps are to
do away with DonationQueue entirely.
Bug: T95647
Change-Id: I7889c205a0dd2ef918e74e1632adc126b4e8d1c3
---
M DonationInterface.class.php
M composer.lock
M gateway_common/DonationQueue.php
M gateway_common/gateway.adapter.php
M tests/phpunit/Adapter/Adyen/AdyenTest.php
M tests/phpunit/Adapter/Amazon/AmazonTest.php
M tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
M tests/phpunit/DonationQueueTest.php
8 files changed, 92 insertions(+), 75 deletions(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DonationInterface.class.php b/DonationInterface.class.php
index 861fd62..fbb0713 100644
--- a/DonationInterface.class.php
+++ b/DonationInterface.class.php
@@ -93,10 +93,15 @@
* @return Configuration
*/
public static function initializeSmashPig( $view ) {
+ global $IP;
$spConfig = Configuration::createForView( $view );
// FIXME: should set a logger prefix here, but we've got a
chicken
// and egg problem with the Gateway constructor
Context::initWithLogger( $spConfig );
+ $context = Context::get();
+ $context->setSourceName( 'DonationInterface' );
+ $context->setSourceType( 'payments' );
+ $context->setVersionFromFile( "$IP/.version-stamp");
return $spConfig;
}
}
diff --git a/composer.lock b/composer.lock
index 563fb2e..ace867d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,6 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
"This file is @generated automatically"
],
-"hash": "286013b033c04aeb560c6d29c9d2462d",
"content-hash": "c77aa55a881981c2f2170a5894371bc0",
"packages": [
{
@@ -50,7 +49,7 @@
"cache",
"mediawiki"
],
-"time": "2017-02-16 14:33:59"
+"time": "2017-02-16T14:33:59+00:00"
},
{
"name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -89,7 +88,7 @@
"payment",
"payments"
],
-"time": "2016-02-17 00:53:20"
+"time": "2016-02-17T00:53:20+00:00"
},
{
"name": "clio/clio",
@@ -130,7 +129,7 @@
"console",
"daemon"
],
-"time": "2014-06-22 14:49:41"
+"time": "2014-06-22T14:49:41+00:00"
},
{
"name": "coderkungfu/php-queue",
@@ -202,6 +201,51 @@
"time": "2017-04-17 14:11:55"
},
{
+"name": "corneltek/getoptionkit",
+"version": "2.5.4",
+"source": {
+"type": "git",
+"url": "https://github.com/c9s/GetOptionKit.git;,
+"reference": "9eae6f4fa009655f9d0d0ccd04cdd9c0d39cbe80"
+},
+"dist": {
+"type": "zip",
+"url":
"https://api.github.com/repos/c9s/GetOptionKit/zipball/9eae6f4fa009655f9d0d0ccd04cdd9c0d39cbe80;,
+"reference": "9eae6f4fa009655f9d0d0ccd04cdd9c0d39cbe80",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.0"
+},
+"require-dev": {
+"satooshi/php-coveralls": "^1"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "2.5.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"GetOptionKit\\": "src/"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Yo-An Lin",
+"email": "cornelius.h...@gmail.com"
+}
+],
+"description": "Powerful command-line option toolkit",
+"homepage": "http://github.com/c9s/GetOptionKit;,
+"time": "2017-04-30T09:31:04+00:00"
+},
+{
"name": "ircmaxell/password-compat",
"version": "v1.0.4",
"source": {
@@ -241,7 +285,7 @@
"hashing",
"password"
],
-"time": "2014-11-20 16:49:30"
+
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig, use SourceFields logic
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354566 )
Change subject: Update SmashPig, use SourceFields logic
..
Update SmashPig, use SourceFields logic
Also gets rid of buildHeaders, since we no longer have message headers.
This is a transitional patch, testing whether the SmashPig functions
give us the same values as the existing logic. Next steps are to
do away with DonationQueue entirely.
Bug: T95647
Change-Id: I7889c205a0dd2ef918e74e1632adc126b4e8d1c3
---
M DonationInterface.class.php
M composer.lock
M gateway_common/DonationQueue.php
M gateway_common/gateway.adapter.php
4 files changed, 77 insertions(+), 69 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/66/354566/1
diff --git a/DonationInterface.class.php b/DonationInterface.class.php
index f3f3988..8baa45c 100644
--- a/DonationInterface.class.php
+++ b/DonationInterface.class.php
@@ -89,10 +89,15 @@
* @return Configuration
*/
public static function initializeSmashPig( $view ) {
+ global $IP;
$spConfig = Configuration::createForView( $view );
// FIXME: should set a logger prefix here, but we've got a
chicken
// and egg problem with the Gateway constructor
Context::initWithLogger( $spConfig );
+ $context = Context::get();
+ $context->setSourceName( 'DonationInterface' );
+ $context->setSourceType( 'payments' );
+ $context->setVersionFromFile( "$IP/.version-stamp");
return $spConfig;
}
}
diff --git a/composer.lock b/composer.lock
index 563fb2e..ace867d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,6 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
"This file is @generated automatically"
],
-"hash": "286013b033c04aeb560c6d29c9d2462d",
"content-hash": "c77aa55a881981c2f2170a5894371bc0",
"packages": [
{
@@ -50,7 +49,7 @@
"cache",
"mediawiki"
],
-"time": "2017-02-16 14:33:59"
+"time": "2017-02-16T14:33:59+00:00"
},
{
"name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -89,7 +88,7 @@
"payment",
"payments"
],
-"time": "2016-02-17 00:53:20"
+"time": "2016-02-17T00:53:20+00:00"
},
{
"name": "clio/clio",
@@ -130,7 +129,7 @@
"console",
"daemon"
],
-"time": "2014-06-22 14:49:41"
+"time": "2014-06-22T14:49:41+00:00"
},
{
"name": "coderkungfu/php-queue",
@@ -202,6 +201,51 @@
"time": "2017-04-17 14:11:55"
},
{
+"name": "corneltek/getoptionkit",
+"version": "2.5.4",
+"source": {
+"type": "git",
+"url": "https://github.com/c9s/GetOptionKit.git;,
+"reference": "9eae6f4fa009655f9d0d0ccd04cdd9c0d39cbe80"
+},
+"dist": {
+"type": "zip",
+"url":
"https://api.github.com/repos/c9s/GetOptionKit/zipball/9eae6f4fa009655f9d0d0ccd04cdd9c0d39cbe80;,
+"reference": "9eae6f4fa009655f9d0d0ccd04cdd9c0d39cbe80",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.0"
+},
+"require-dev": {
+"satooshi/php-coveralls": "^1"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "2.5.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"GetOptionKit\\": "src/"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Yo-An Lin",
+"email": "cornelius.h...@gmail.com"
+}
+],
+"description": "Powerful command-line option toolkit",
+"homepage": "http://github.com/c9s/GetOptionKit;,
+"time": "2017-04-30T09:31:04+00:00"
+},
+{
"name": "ircmaxell/password-compat",
"version": "v1.0.4",
"source": {
@@ -241,7 +285,7 @@
"hashing",
"password"
],
-"time": "2014-11-20 16:49:30"
+"time": "2014-11-20T16:49:30+00:00"
},
{
"name": "minfraud/http",
@@ -281,7 +325,7 @@
"maxmind",
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update smashpig lib
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348027 )
Change subject: Update smashpig lib
..
Update smashpig lib
This gets the patch to stop howling when people try iDEAL in unsupported
currencies. TODO: also show them a helpful error, instead of an empty list/
Bug: T161073
Change-Id: I985797c1a3320750356ae066dc4365d3e840de9b
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index 39567d5..705f7fa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "d1a135b94870ff263154c5dab084416eb318e05f"
+"reference": "ec6ea516530400dfb7bb02a72ef52318a40b7bb6"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-03-20 17:58:32"
+"time": "2017-04-10 22:28:50"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/348027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I985797c1a3320750356ae066dc4365d3e840de9b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update smashpig lib
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348027 )
Change subject: Update smashpig lib
..
Update smashpig lib
This gets the patch to stop howling when people try iDEAL in unsupported
currencies. TODO: also show them a helpful error, instead of an empty list/
Bug: T161073
Change-Id: I985797c1a3320750356ae066dc4365d3e840de9b
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/27/348027/1
diff --git a/composer.lock b/composer.lock
index 39567d5..705f7fa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "d1a135b94870ff263154c5dab084416eb318e05f"
+"reference": "ec6ea516530400dfb7bb02a72ef52318a40b7bb6"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-03-20 17:58:32"
+"time": "2017-04-10 22:28:50"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/348027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I985797c1a3320750356ae066dc4365d3e840de9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update smashpig
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345565 )
Change subject: Update smashpig
..
Update smashpig
get https default for iDEAL lookup
Change-Id: I73fdff4f627f326daeb9ca4fc5c973702b961b96
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index 617375c..4807e85 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "5abbd06ab629e218d7c1842443c0a0627c31d0c3"
+"reference": "40539770f2250e2af7f464aa604cc9dbc35e98be"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-03-23 17:11:20"
+"time": "2017-03-24 18:51:49"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/345565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73fdff4f627f326daeb9ca4fc5c973702b961b96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update smashpig
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345565 )
Change subject: Update smashpig
..
Update smashpig
get https default for iDEAL lookup
Change-Id: I73fdff4f627f326daeb9ca4fc5c973702b961b96
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/65/345565/1
diff --git a/composer.lock b/composer.lock
index 617375c..4807e85 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "5abbd06ab629e218d7c1842443c0a0627c31d0c3"
+"reference": "40539770f2250e2af7f464aa604cc9dbc35e98be"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-03-23 17:11:20"
+"time": "2017-03-24 18:51:49"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/345565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73fdff4f627f326daeb9ca4fc5c973702b961b96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344453 )
Change subject: Update SmashPig
..
Update SmashPig
Get the iDEAL availability hack
Change-Id: I1a3d2cbb5a3a9f917249c8bda3a28322efb9ee3f
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index 39567d5..617375c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "d1a135b94870ff263154c5dab084416eb318e05f"
+"reference": "5abbd06ab629e218d7c1842443c0a0627c31d0c3"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-03-20 17:58:32"
+"time": "2017-03-23 17:11:20"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/344453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a3d2cbb5a3a9f917249c8bda3a28322efb9ee3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/344453 )
Change subject: Update SmashPig
..
Update SmashPig
Get the iDEAL availability hack
Change-Id: I1a3d2cbb5a3a9f917249c8bda3a28322efb9ee3f
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/53/344453/1
diff --git a/composer.lock b/composer.lock
index 39567d5..617375c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "d1a135b94870ff263154c5dab084416eb318e05f"
+"reference": "5abbd06ab629e218d7c1842443c0a0627c31d0c3"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-03-20 17:58:32"
+"time": "2017-03-23 17:11:20"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/344453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a3d2cbb5a3a9f917249c8bda3a28322efb9ee3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update smashpig lib
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343699 )
Change subject: Update smashpig lib
..
Update smashpig lib
Get the memcache expiry workaround
Change-Id: I0ddc5f549d2bd60d1aa935b821b27082a3b1f6e4
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index bcc8efa..39567d5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "4625e68bd0fde15a2dc3ff646cc01bcd4325d8fc"
+"reference": "d1a135b94870ff263154c5dab084416eb318e05f"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-02-23 20:48:06"
+"time": "2017-03-20 17:58:32"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/343699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ddc5f549d2bd60d1aa935b821b27082a3b1f6e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update smashpig lib
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/343699 )
Change subject: Update smashpig lib
..
Update smashpig lib
Get the memcache expiry workaround
Change-Id: I0ddc5f549d2bd60d1aa935b821b27082a3b1f6e4
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/99/343699/1
diff --git a/composer.lock b/composer.lock
index bcc8efa..39567d5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "4625e68bd0fde15a2dc3ff646cc01bcd4325d8fc"
+"reference": "d1a135b94870ff263154c5dab084416eb318e05f"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-02-23 20:48:06"
+"time": "2017-03-20 17:58:32"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/343699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ddc5f549d2bd60d1aa935b821b27082a3b1f6e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig library
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339489 )
Change subject: Update SmashPig library
..
Update SmashPig library
Get some Ingenico error handling. Needed to tweak test mock to not
call original constructor.
Bug: T128692
Change-Id: Ica848b6dcec3ce215d0e76b95d403cea6a4bce01
---
M composer.lock
M tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
2 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Awight: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index c941554..bcc8efa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "d581a349e42a73ea7bf3166506262a7fb582b9e6"
+"reference": "4625e68bd0fde15a2dc3ff646cc01bcd4325d8fc"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-02-17 00:27:55"
+"time": "2017-02-23 20:48:06"
},
{
"name": "zordius/lightncandy",
diff --git
a/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
b/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
index bdd530a..b949f86 100644
--- a/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
@@ -37,7 +37,10 @@
$config = Configuration::createForView( 'ingenico' );
Context::initWithLogger( $config ); // gets torn down in parent
- $this->bankPaymentProvider = $this->getMock(
'\SmashPig\PaymentProviders\Ingenico\BankPaymentProvider' );
+ $this->bankPaymentProvider = $this->getMockBuilder(
+
'\SmashPig\PaymentProviders\Ingenico\BankPaymentProvider'
+ )->disableOriginalConstructor()->getMock();
+
$config->overrideObjectInstance( 'payment-provider/rtbt',
$this->bankPaymentProvider );
$this->bankPaymentProvider->method( 'getBankList' )
--
To view, visit https://gerrit.wikimedia.org/r/339489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica848b6dcec3ce215d0e76b95d403cea6a4bce01
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Eileen
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig library
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339489 )
Change subject: Update SmashPig library
..
Update SmashPig library
Get some Ingenico error handling
Change-Id: Ica848b6dcec3ce215d0e76b95d403cea6a4bce01
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/89/339489/1
diff --git a/composer.lock b/composer.lock
index c941554..bcc8efa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "d581a349e42a73ea7bf3166506262a7fb582b9e6"
+"reference": "4625e68bd0fde15a2dc3ff646cc01bcd4325d8fc"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-02-17 00:27:55"
+"time": "2017-02-23 20:48:06"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/339489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica848b6dcec3ce215d0e76b95d403cea6a4bce01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig lib & config usage
jenkins-bot has submitted this change and it was merged.
Change subject: Update SmashPig lib & config usage
..
Update SmashPig lib & config usage
Change-Id: I33d69bed8d069a11ead2f1093e9883d60601d49f
---
M composer.lock
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 6353e2b..ea09d7f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -887,7 +887,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "010270421ae87b43f59a7b43fc385aa52367d600"
+"reference": "8625a3502c2f7f48b6ed0e388d95b35a6398ad9f"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -938,7 +938,7 @@
"donations",
"payments"
],
-"time": "2016-09-07 23:18:54"
+"time": "2016-09-13 18:34:33"
},
{
"name": "zordius/lightncandy",
diff --git
a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
index 31a5f80..be5004b 100644
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
@@ -61,7 +61,7 @@
),
) );
- $config = new SmashPigDatabaseTestConfiguration();
+ $config = SmashPigDatabaseTestConfiguration::instance();
Context::init( $config );
$this->pendingDb = PendingDatabase::get();
--
To view, visit https://gerrit.wikimedia.org/r/310372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33d69bed8d069a11ead2f1093e9883d60601d49f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig lib & config usage
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/310372
Change subject: Update SmashPig lib & config usage
..
Update SmashPig lib & config usage
Change-Id: I33d69bed8d069a11ead2f1093e9883d60601d49f
---
M composer.lock
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/72/310372/1
diff --git a/composer.lock b/composer.lock
index 6353e2b..ea09d7f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -887,7 +887,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "010270421ae87b43f59a7b43fc385aa52367d600"
+"reference": "8625a3502c2f7f48b6ed0e388d95b35a6398ad9f"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -938,7 +938,7 @@
"donations",
"payments"
],
-"time": "2016-09-07 23:18:54"
+"time": "2016-09-13 18:34:33"
},
{
"name": "zordius/lightncandy",
diff --git
a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
index 31a5f80..be5004b 100644
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
@@ -61,7 +61,7 @@
),
) );
- $config = new SmashPigDatabaseTestConfiguration();
+ $config = SmashPigDatabaseTestConfiguration::instance();
Context::init( $config );
$this->pendingDb = PendingDatabase::get();
--
To view, visit https://gerrit.wikimedia.org/r/310372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33d69bed8d069a11ead2f1093e9883d60601d49f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Update SmashPig lib, use config shortcuts
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/306972
Change subject: Update SmashPig lib, use config shortcuts
..
Update SmashPig lib, use config shortcuts
Change-Id: I66bd33e1bb7db1c1de46be1390b819742b00fa99
---
M composer.lock
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
2 files changed, 7 insertions(+), 21 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/72/306972/1
diff --git a/composer.lock b/composer.lock
index b841b98..8ee7cc8 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"
],
-"hash": "c346a77e77f45dd18d0371568095d533",
+"hash": "c7b0cbb4c1483837267c05eeec427548",
"content-hash": "9d01d4c0875ec4774829b9b80d1ab4f0",
"packages": [
{
@@ -887,13 +887,13 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "42ef005f9ae9e98b449325267c1079284e09a6fd"
+"reference": "fd570e4ad72ae5b35f317346e53d753855957835"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
"coderkungfu/php-queue": "dev-master",
"fusesource/stomp-php": "^2.1.1",
-"php": "^5.3.3",
+"php": ">=5.3.3",
"phpmailer/phpmailer": "^5.2",
"predis/predis": "^1.1",
"symfony/event-dispatcher": "^2.1",
@@ -938,7 +938,7 @@
"donations",
"payments"
],
-"time": "2016-08-09 16:17:09"
+"time": "2016-08-22 17:15:23"
},
{
"name": "zordius/lightncandy",
diff --git
a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
index 794fab7..61fcda3 100644
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
@@ -17,9 +17,9 @@
*
*/
-use SmashPig\Core\Configuration;
use SmashPig\Core\Context;
use SmashPig\Core\DataStores\PendingDatabase;
+use SmashPig\Tests\SmashPigDatabaseTestConfiguration;
/**
* @covers GlobalCollectOrphanRectifier
@@ -61,25 +61,11 @@
),
) );
- // Configure a temporary database for the pending-db queue.
- $smashPigConfiguration = array(
- 'data-store' => array(
- 'pending-db' => array(
- 'class' => 'PDO',
- 'inst-args' => array( 'sqlite::memory:'
),
- ),
- ),
- );
- $config = new Configuration();
- $config->override( $smashPigConfiguration );
+ $config = new SmashPigDatabaseTestConfiguration();
Context::init( $config );
$this->pendingDb = PendingDatabase::get();
-
- // Create the schema.
- // FIXME: Reuse something from SmashPig\Tests
- $sql = file_get_contents( __DIR__ .
'/../../../../vendor/wikimedia/smash-pig/Schema/sqlite/001_CreatePendingTable.sqlite.sql'
);
- $this->pendingDb->getDatabase()->exec( $sql );
+ $this->pendingDb->createTable();
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/306972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I66bd33e1bb7db1c1de46be1390b819742b00fa99
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
