Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/310915
Change subject: Update to new SmashPig Configuration static interface
......................................................................
Update to new SmashPig Configuration static interface
Change-Id: Ib1b2f97d910c42287cc7deb571531b36871180c1
---
M composer.lock
M sites/all/modules/queue2civicrm/queue2civicrm.info
A sites/all/modules/queue2civicrm/tests/data/config_queue_and_db.yaml
A
sites/all/modules/queue2civicrm/tests/includes/TestingSmashPigDbQueueConfiguration.php
M sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
M sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
M sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
M sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
M sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
9 files changed, 74 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/15/310915/1
diff --git a/composer.lock b/composer.lock
index c8a1cb4..1a9a57b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -44,7 +44,7 @@
"payment",
"payments"
],
- "time": "2016-02-17 00:44:20"
+ "time": "2016-02-17 00:53:20"
},
{
"name": "clio/clio",
@@ -249,7 +249,6 @@
"messaging",
"stomp"
],
- "abandoned": "stomp-php/stomp-php",
"time": "2013-02-23 17:34:44"
},
{
@@ -690,7 +689,7 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git";,
@@ -750,16 +749,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git";,
- "reference": "f20bea598906c990eebe3c70a63ca5ed18cdbc11"
+ "reference": "1d4ab8de2215e44e57fddc1e6b5d122546769e7d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/http-foundation/zipball/f20bea598906c990eebe3c70a63ca5ed18cdbc11";,
- "reference": "f20bea598906c990eebe3c70a63ca5ed18cdbc11",
+ "url":
"https://api.github.com/repos/symfony/http-foundation/zipball/1d4ab8de2215e44e57fddc1e6b5d122546769e7d";,
+ "reference": "1d4ab8de2215e44e57fddc1e6b5d122546769e7d",
"shasum": ""
},
"require": {
@@ -801,7 +800,7 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com";,
- "time": "2016-07-30 07:20:35"
+ "time": "2016-09-06 10:55:00"
},
{
"name": "symfony/polyfill-mbstring",
@@ -978,16 +977,16 @@
},
{
"name": "symfony/yaml",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git";,
- "reference": "0ceab136f43ed9d3e97b3eea32a7855dc50c121d"
+ "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/yaml/zipball/0ceab136f43ed9d3e97b3eea32a7855dc50c121d";,
- "reference": "0ceab136f43ed9d3e97b3eea32a7855dc50c121d",
+ "url":
"https://api.github.com/repos/symfony/yaml/zipball/e7540734bad981fe59f8ef14b6fc194ae9df8d9c";,
+ "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
"shasum": ""
},
"require": {
@@ -1023,20 +1022,20 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com";,
- "time": "2016-07-17 09:06:15"
+ "time": "2016-09-02 01:57:56"
},
{
"name": "twig/twig",
- "version": "v1.24.1",
+ "version": "v1.24.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git";,
- "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512"
+ "reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512";,
- "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512",
+ "url":
"https://api.github.com/repos/twigphp/Twig/zipball/33093f6e310e6976baeac7b14f3a6ec02f2d79b7";,
+ "reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7",
"shasum": ""
},
"require": {
@@ -1084,7 +1083,7 @@
"keywords": [
"templating"
],
- "time": "2016-05-30 09:11:59"
+ "time": "2016-09-01 17:50:53"
},
{
"name": "wikimedia/donation-interface",
@@ -1092,7 +1091,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
- "reference": "1e2fd3deade07d4663999496dd0aa79c27eb9d2d"
+ "reference": "9fa6e351ed42d7be7387b6fac8d2beb918cb9304"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1106,6 +1105,9 @@
"symfony/yaml": "^2.8",
"wikimedia/smash-pig": "dev-master",
"zordius/lightncandy": "0.23"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2"
},
"type": "library",
"autoload": {
@@ -1129,7 +1131,7 @@
"GPL-2.0"
],
"description": "Wikimedia Foundation payment processing library",
- "time": "2016-08-25 21:28:41"
+ "time": "2016-09-13 18:41:14"
},
{
"name": "wikimedia/smash-pig",
@@ -1137,7 +1139,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git";,
- "reference": "fd570e4ad72ae5b35f317346e53d753855957835"
+ "reference": "d2a8baf17b3755bb03a9bf40b12986510594b769"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1188,7 +1190,7 @@
"donations",
"payments"
],
- "time": "2016-08-22 17:15:23"
+ "time": "2016-09-13 18:36:55"
},
{
"name": "zordius/lightncandy",
diff --git a/sites/all/modules/queue2civicrm/queue2civicrm.info
b/sites/all/modules/queue2civicrm/queue2civicrm.info
index 8df0403..7649385 100644
--- a/sites/all/modules/queue2civicrm/queue2civicrm.info
+++ b/sites/all/modules/queue2civicrm/queue2civicrm.info
@@ -9,3 +9,4 @@
files[] = Stomp.php
files[] = tests/includes/Message.php
files[] = tests/includes/MessageSource.php
+files[] = tests/includes/TestingSmashPigDbQueueConfiguration.php
diff --git
a/sites/all/modules/queue2civicrm/tests/data/config_queue_and_db.yaml
b/sites/all/modules/queue2civicrm/tests/data/config_queue_and_db.yaml
new file mode 100644
index 0000000..5a1843e
--- /dev/null
+++ b/sites/all/modules/queue2civicrm/tests/data/config_queue_and_db.yaml
@@ -0,0 +1,27 @@
+default:
+ data-store:
+ test:
+ class: PHPQueue\Backend\PDO
+ constructor-parameters:
+ -
+ connection_string: 'sqlite::memory:'
+
+ damaged-db:
+ class: PDO
+ constructor-parameters:
+ - 'sqlite::memory:'
+
+ pending-db:
+ class: PDO
+ constructor-parameters:
+ - 'sqlite::memory:'
+
+ damaged-db:
+ class: PDO
+ constructor-parameters:
+ - 'sqlite::memory:'
+
+ fredge-db:
+ class: PDO
+ constructor-parameters:
+ - 'sqlite::memory:'
diff --git
a/sites/all/modules/queue2civicrm/tests/includes/TestingSmashPigDbQueueConfiguration.php
b/sites/all/modules/queue2civicrm/tests/includes/TestingSmashPigDbQueueConfiguration.php
new file mode 100644
index 0000000..c929760
--- /dev/null
+++
b/sites/all/modules/queue2civicrm/tests/includes/TestingSmashPigDbQueueConfiguration.php
@@ -0,0 +1,16 @@
+<?php
+
+use SmashPig\Core\DataStores\PendingDatabase;
+use SmashPig\Tests\TestingConfiguration;
+
+class TestingSmashPigDbQueueConfiguration {
+ public static function instance() {
+ $config = TestingConfiguration::loadConfigWithFileOverrides(
array(
+ __DIR__ . '/../data/config_queue_and_db.yaml',
+ ) );
+
+ PendingDatabase::get()->createTable();
+
+ return $config;
+ }
+}
diff --git
a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
b/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
index f7b968e..8718c79 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/AntifraudQueueTest.php
@@ -16,7 +16,7 @@
public function setUp() {
parent::setUp();
- $config = new QueueTestConfiguration();
+ $config = QueueTestConfiguration::instance();
Context::initWithLogger( $config );
$queue = BaseQueueConsumer::getQueue( 'test' );
$queue->createTable( 'test' );
diff --git
a/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
b/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
index c81a856..5005d6a 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
@@ -3,7 +3,6 @@
use SmashPig\Core\Context;
use SmashPig\Core\QueueConsumers\BaseQueueConsumer;
-use SmashPig\Tests\QueueTestConfiguration;
/**
* @group Queue2Civicrm
@@ -17,7 +16,7 @@
public function setUp() {
parent::setUp();
- $config = new QueueTestConfiguration();
+ $config = TestingSmashPigDbQueueConfiguration::instance();
Context::initWithLogger( $config );
$queue = BaseQueueConsumer::getQueue( 'test' );
$queue->createTable( 'test' );
diff --git
a/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
b/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
index 0400941..6e2e3f5 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
@@ -2,7 +2,6 @@
use queue2civicrm\fredge\PaymentsInitQueueConsumer;
use SmashPig\Core\Context;
use SmashPig\Core\QueueConsumers\BaseQueueConsumer;
-use SmashPig\Tests\QueueTestConfiguration;
/**
* @group Queue2Civicrm
@@ -16,7 +15,7 @@
public function setUp() {
parent::setUp();
- $config = new QueueTestConfiguration();
+ $config = TestingSmashPigDbQueueConfiguration::instance();
Context::initWithLogger( $config );
$queue = BaseQueueConsumer::getQueue( 'test' );
$queue->createTable( 'test' );
diff --git
a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
index 985160f..a822524 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
@@ -16,7 +16,8 @@
public function setUp() {
parent::setUp();
- Context::initWithLogger( new
SmashPigDatabaseTestConfiguration() );
+ $config = TestingSmashPigDbQueueConfiguration::instance();
+ Context::initWithLogger( $config );
$this->pendingDb = PendingDatabase::get();
$this->pendingDb->createTable();
}
diff --git a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
b/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
index fdf624e..44f8626 100644
--- a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
+++ b/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
@@ -18,7 +18,7 @@
self::$messages = array();
// Use the test configuration for SmashPig
- $config = new AmazonTestConfiguration();
+ $config = AmazonTestConfiguration::instance();
Context::initWithLogger( $config );
$dirs = array(
--
To view, visit https://gerrit.wikimedia.org/r/310915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1b2f97d910c42287cc7deb571531b36871180c1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
