Mepps has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374852 )
Change subject: Update composer and fix currency rates
......................................................................
Update composer and fix currency rates
Change-Id: I86fc3dfe832518099bfa77add4d6ec9e5770d1cf
---
M composer.lock
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 104 insertions(+), 82 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/52/374852/1
diff --git a/composer.lock b/composer.lock
index 362d96a..ceaf2c9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -88,7 +88,7 @@
"payment",
"payments"
],
- "time": "2016-02-17T00:44:20+00:00"
+ "time": "2016-02-17 00:53:20"
},
{
"name": "clio/clio",
@@ -198,7 +198,7 @@
"queue",
"transaction"
],
- "time": "2017-04-17T14:11:55+00:00"
+ "time": "2017-04-17 14:11:55"
},
{
"name": "cogpowered/finediff",
@@ -518,16 +518,16 @@
},
{
"name": "league/csv",
- "version": "8.2.1",
+ "version": "8.2.2",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/csv.git";,
- "reference": "43fd8b022815a0758d85e925dd92a43fe0d41bb4"
+ "reference": "fa8bc05f64eb6c66b96edfaf60648f022ecb5f55"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/thephpleague/csv/zipball/43fd8b022815a0758d85e925dd92a43fe0d41bb4";,
- "reference": "43fd8b022815a0758d85e925dd92a43fe0d41bb4",
+ "url":
"https://api.github.com/repos/thephpleague/csv/zipball/fa8bc05f64eb6c66b96edfaf60648f022ecb5f55";,
+ "reference": "fa8bc05f64eb6c66b96edfaf60648f022ecb5f55",
"shasum": ""
},
"require": {
@@ -571,7 +571,7 @@
"read",
"write"
],
- "time": "2017-02-23T08:25:03+00:00"
+ "time": "2017-07-12T07:18:20+00:00"
},
{
"name": "minfraud/http",
@@ -733,20 +733,20 @@
"keywords": [
"Silverpop"
],
- "time": "2017-07-24T07:31:30+00:00"
+ "time": "2017-07-24 07:31:30"
},
{
"name": "neitanod/forceutf8",
- "version": "v2.0",
+ "version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/neitanod/forceutf8.git";,
- "reference": "2c1b21e00ed16b2b083ae4e27901cb5f2856db90"
+ "reference": "47c883ab2739e7938a8bb0bfd1c29d48c88858de"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/neitanod/forceutf8/zipball/2c1b21e00ed16b2b083ae4e27901cb5f2856db90";,
- "reference": "2c1b21e00ed16b2b083ae4e27901cb5f2856db90",
+ "url":
"https://api.github.com/repos/neitanod/forceutf8/zipball/47c883ab2739e7938a8bb0bfd1c29d48c88858de";,
+ "reference": "47c883ab2739e7938a8bb0bfd1c29d48c88858de",
"shasum": ""
},
"require": {
@@ -767,7 +767,7 @@
],
"description": "PHP Class Encoding featuring popular
Encoding::toUTF8() function --formerly known as forceUTF8()-- that fixes mixed
encoded strings.",
"homepage": "https://github.com/neitanod/forceutf8";,
- "time": "2015-05-07T16:37:23+00:00"
+ "time": "2017-05-22T18:50:57+00:00"
},
{
"name": "omnimail/omnimail",
@@ -839,7 +839,7 @@
"sendgrid",
"sendinblue"
],
- "time": "2017-05-15T13:50:56+00:00"
+ "time": "2017-05-15 13:50:56"
},
{
"name": "paragonie/random_compat",
@@ -997,24 +997,41 @@
},
{
"name": "phpmailer/phpmailer",
- "version": "v5.2.22",
+ "version": "v5.2.25",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git";,
- "reference": "b18cb98131bd83103ccb26a888fdfe3177b8a663"
+ "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/b18cb98131bd83103ccb26a888fdfe3177b8a663";,
- "reference": "b18cb98131bd83103ccb26a888fdfe3177b8a663",
+ "url":
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2baf20b01690fba8cf720c1ebcf9b988eda50915";,
+ "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915",
"shasum": ""
},
"require": {
+ "ext-ctype": "*",
"php": ">=5.0.0"
},
"require-dev": {
- "phpdocumentor/phpdocumentor": "*",
- "phpunit/phpunit": "4.7.*"
+ "doctrine/annotations": "1.2.*",
+ "jms/serializer": "0.16.*",
+ "phpdocumentor/phpdocumentor": "2.*",
+ "phpunit/phpunit": "4.8.*",
+ "symfony/debug": "2.8.*",
+ "symfony/filesystem": "2.8.*",
+ "symfony/translation": "2.8.*",
+ "symfony/yaml": "2.8.*",
+ "zendframework/zend-cache": "2.5.1",
+ "zendframework/zend-config": "2.5.1",
+ "zendframework/zend-eventmanager": "2.5.1",
+ "zendframework/zend-filter": "2.5.1",
+ "zendframework/zend-i18n": "2.5.1",
+ "zendframework/zend-json": "2.5.1",
+ "zendframework/zend-math": "2.5.1",
+ "zendframework/zend-serializer": "2.5.*",
+ "zendframework/zend-servicemanager": "2.5.*",
+ "zendframework/zend-stdlib": "2.5.1"
},
"suggest": {
"league/oauth2-google": "Needed for Google XOAUTH2
authentication"
@@ -1053,7 +1070,7 @@
}
],
"description": "PHPMailer is a full-featured email creation and
transfer class for PHP",
- "time": "2017-01-09T09:33:47+00:00"
+ "time": "2017-08-28T11:12:07+00:00"
},
{
"name": "phpseclib/phpseclib",
@@ -1342,7 +1359,7 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.26",
+ "version": "v2.8.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git";,
@@ -1402,16 +1419,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v2.8.16",
+ "version": "v2.8.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git";,
- "reference": "464cdde6757a40701d758112cc7ff2c6adf6e82f"
+ "reference": "fc4942ad82af83ac8301b68d0c9b1bbcc95a84c6"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/http-foundation/zipball/464cdde6757a40701d758112cc7ff2c6adf6e82f";,
- "reference": "464cdde6757a40701d758112cc7ff2c6adf6e82f",
+ "url":
"https://api.github.com/repos/symfony/http-foundation/zipball/fc4942ad82af83ac8301b68d0c9b1bbcc95a84c6";,
+ "reference": "fc4942ad82af83ac8301b68d0c9b1bbcc95a84c6",
"shasum": ""
},
"require": {
@@ -1453,20 +1470,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com";,
- "time": "2017-01-08T20:43:03+00:00"
+ "time": "2017-08-10T07:04:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.4.0",
+ "version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git";,
- "reference": "f29dca382a6485c3cbe6379f0c61230167681937"
+ "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937";,
- "reference": "f29dca382a6485c3cbe6379f0c61230167681937",
+ "url":
"https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803";,
+ "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
"shasum": ""
},
"require": {
@@ -1478,7 +1495,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
@@ -1512,20 +1529,20 @@
"portable",
"shim"
],
- "time": "2017-06-09T14:24:12+00:00"
+ "time": "2017-06-14T15:44:48+00:00"
},
{
"name": "symfony/polyfill-php54",
- "version": "v1.3.0",
+ "version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php54.git";,
- "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0"
+ "reference": "b7763422a5334c914ef0298ed21b253d25913a6e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/polyfill-php54/zipball/90e085822963fdcc9d1c5b73deb3d2e5783b16a0";,
- "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0",
+ "url":
"https://api.github.com/repos/symfony/polyfill-php54/zipball/b7763422a5334c914ef0298ed21b253d25913a6e";,
+ "reference": "b7763422a5334c914ef0298ed21b253d25913a6e",
"shasum": ""
},
"require": {
@@ -1534,7 +1551,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
@@ -1570,20 +1587,20 @@
"portable",
"shim"
],
- "time": "2016-11-14T01:06:16+00:00"
+ "time": "2017-06-14T15:44:48+00:00"
},
{
"name": "symfony/polyfill-php55",
- "version": "v1.3.0",
+ "version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git";,
- "reference": "03e3f0350bca2220e3623a0e340eef194405fc67"
+ "reference": "29b1381d66f16e0581aab0b9f678ccf073288f68"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/polyfill-php55/zipball/03e3f0350bca2220e3623a0e340eef194405fc67";,
- "reference": "03e3f0350bca2220e3623a0e340eef194405fc67",
+ "url":
"https://api.github.com/repos/symfony/polyfill-php55/zipball/29b1381d66f16e0581aab0b9f678ccf073288f68";,
+ "reference": "29b1381d66f16e0581aab0b9f678ccf073288f68",
"shasum": ""
},
"require": {
@@ -1593,7 +1610,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
@@ -1626,11 +1643,11 @@
"portable",
"shim"
],
- "time": "2016-11-14T01:06:16+00:00"
+ "time": "2017-06-14T15:44:48+00:00"
},
{
"name": "symfony/yaml",
- "version": "v2.8.26",
+ "version": "v2.8.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git";,
@@ -1679,34 +1696,38 @@
},
{
"name": "twig/twig",
- "version": "v1.31.0",
+ "version": "v1.34.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git";,
- "reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7"
+ "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/twigphp/Twig/zipball/ddc9e3e20ee9c0b6908f401ac8353635b750eca7";,
- "reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7",
+ "url":
"https://api.github.com/repos/twigphp/Twig/zipball/f878bab48edb66ad9c6ed626bf817f60c6c096ee";,
+ "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee",
"shasum": ""
},
"require": {
- "php": ">=5.2.7"
+ "php": ">=5.3.3"
},
"require-dev": {
+ "psr/container": "^1.0",
"symfony/debug": "~2.7",
- "symfony/phpunit-bridge": "~3.2"
+ "symfony/phpunit-bridge": "~3.3@dev"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.31-dev"
+ "dev-master": "1.34-dev"
}
},
"autoload": {
"psr-0": {
"Twig_": "lib/"
+ },
+ "psr-4": {
+ "Twig\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/";,
@@ -1736,20 +1757,20 @@
"keywords": [
"templating"
],
- "time": "2017-01-11T19:36:15+00:00"
+ "time": "2017-07-04T13:19:31+00:00"
},
{
"name": "wikimedia/composer-merge-plugin",
- "version": "v1.4.0",
+ "version": "v1.4.1",
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/composer-merge-plugin.git";,
- "reference": "ca453f9f13d8b05f86f20ea10be992a782e6f78c"
+ "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/ca453f9f13d8b05f86f20ea10be992a782e6f78c";,
- "reference": "ca453f9f13d8b05f86f20ea10be992a782e6f78c",
+ "url":
"https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/81c6ac72a24a67383419c7eb9aa2b3437f2ab100";,
+ "reference": "81c6ac72a24a67383419c7eb9aa2b3437f2ab100",
"shasum": ""
},
"require": {
@@ -1785,7 +1806,7 @@
}
],
"description": "Composer plugin to merge multiple composer.json
files",
- "time": "2017-03-13T16:52:55+00:00"
+ "time": "2017-04-25T02:31:25+00:00"
},
{
"name": "wikimedia/donation-interface",
@@ -1793,7 +1814,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
- "reference": "de827ca5d01b688c01b328810f7e323841fe2abb"
+ "reference": "5f3ac4a9d563fb6f6a414ebfbbaf38345262ec5d"
},
"require": {
"addshore/psr-6-mediawiki-bagostuff-adapter": "0.1",
@@ -1834,7 +1855,7 @@
"GPL-2.0"
],
"description": "Wikimedia Foundation payment processing library",
- "time": "2017-08-14T07:04:04+00:00"
+ "time": "2017-08-29 18:02:56"
},
{
"name": "wikimedia/omnimail-silverpop",
@@ -1881,7 +1902,7 @@
"omnimail",
"silverpop"
],
- "time": "2017-07-27T02:53:46+00:00"
+ "time": "2017-07-27 02:53:46"
},
{
"name": "wikimedia/smash-pig",
@@ -1941,7 +1962,7 @@
"donations",
"payments"
],
- "time": "2017-08-28T16:03:45+00:00"
+ "time": "2017-08-28 16:03:45"
},
{
"name": "zordius/lightncandy",
@@ -2278,22 +2299,22 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "3.2.0",
+ "version": "3.2.2",
"source": {
"type": "git",
"url":
"https://github.com/phpDocumentor/ReflectionDocBlock.git";,
- "reference": "46f7e8bb075036c92695b15a1ddb6971c751e585"
+ "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/46f7e8bb075036c92695b15a1ddb6971c751e585";,
- "reference": "46f7e8bb075036c92695b15a1ddb6971c751e585",
+ "url":
"https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157";,
+ "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157",
"shasum": ""
},
"require": {
"php": ">=5.5",
"phpdocumentor/reflection-common": "^1.0@dev",
- "phpdocumentor/type-resolver": "^0.4.0",
+ "phpdocumentor/type-resolver": "^0.3.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
@@ -2319,20 +2340,20 @@
}
],
"description": "With this component, a library can provide support
for annotations via DocBlocks or otherwise retrieve information that is
embedded in a DocBlock.",
- "time": "2017-07-15T11:38:20+00:00"
+ "time": "2017-08-08T06:39:58+00:00"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "0.4.0",
+ "version": "0.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git";,
- "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+ "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7";,
- "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+ "url":
"https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773";,
+ "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773",
"shasum": ""
},
"require": {
@@ -2366,31 +2387,31 @@
"email": "[email protected]"
}
],
- "time": "2017-07-14T14:27:02+00:00"
+ "time": "2017-06-03T08:32:36+00:00"
},
{
"name": "phpspec/prophecy",
- "version": "v1.6.2",
+ "version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git";,
- "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
+ "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb";,
- "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
+ "url":
"https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073";,
+ "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
- "sebastian/comparator": "^1.1",
- "sebastian/recursion-context": "^1.0|^2.0"
+ "sebastian/comparator": "^1.1|^2.0",
+ "sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
- "phpspec/phpspec": "^2.0",
+ "phpspec/phpspec": "^2.5|^3.2",
"phpunit/phpunit": "^4.8 || ^5.6.5"
},
"type": "library",
@@ -2429,7 +2450,7 @@
"spy",
"stub"
],
- "time": "2016-11-21T14:58:47+00:00"
+ "time": "2017-03-02T20:05:34+00:00"
},
{
"name": "phpunit/php-code-coverage",
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 631a4ad..8b8fdc5 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -1,6 +1,7 @@
<?php
use SmashPig\Core\UtcDate;
+use SmashPig\PaymentData\ReferenceData\CurrencyRates;
require_once 'recurring.inc';
require_once 'tracking.inc';
--
To view, visit https://gerrit.wikimedia.org/r/374852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86fc3dfe832518099bfa77add4d6ec9e5770d1cf
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Mepps <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
