jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368106 )
Change subject: Update silverpopXmlConnector ...................................................................... Update silverpopXmlConnector Get update to group member - https://github.com/eileenmcnaughton/omnimail-silverpop/commit/cd3933b8ee7b263d0472cc44d047b82f3ec4029c Change-Id: I87ba8b35ce65f79c13cec80d47129ae29b7ceb44 --- M composer/installed.json M wikimedia/omnimail-silverpop/src/Responses/Contact.php 2 files changed, 114 insertions(+), 110 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/composer/installed.json b/composer/installed.json index c7242bf..4a3c9b4 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1746,55 +1746,6 @@ ] }, { - "name": "wikimedia/omnimail-silverpop", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/eileenmcnaughton/omnimail-silverpop.git";, - "reference": "c48de4450ec495a8fd1cb26ba5e656876321e025" - }, - "require": { - "league/csv": "^8.0", - "mrmarkfrench/silverpop-php-connector": "dev-master", - "omnimail/omnimail": "dev-master", - "phpseclib/phpseclib": "~2.0" - }, - "require-dev": { - "guzzlehttp/guzzle": "*" - }, - "time": "2017-07-09T22:55:21+00:00", - "type": "library", - "installation-source": "source", - "autoload": { - "psr-4": { - "Omnimail\\Silverpop\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "Omnimail\\Silverpop\\Tests\\": "test/tests" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eileen McNaughton", - "email": "emcnaugh...@wikimedia.org" - } - ], - "description": "Silverpop plugin for Omnimail", - "keywords": [ - "delivery", - "email", - "mail", - "omnimail", - "silverpop" - ] - }, - { "name": "mrmarkfrench/silverpop-php-connector", "version": "dev-master", "version_normalized": "9999999-dev", @@ -1883,66 +1834,6 @@ ], "description": "Powerful command-line option toolkit", "homepage": "http://github.com/c9s/GetOptionKit"; - }, - { - "name": "symfony/polyfill-php54", - "version": "v1.3.0", - "version_normalized": "1.3.0.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php54.git";, - "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/90e085822963fdcc9d1c5b73deb3d2e5783b16a0";, - "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "time": "2016-11-14T01:06:16+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php54\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/";, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p...@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors"; - } - ], - "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", - "homepage": "https://symfony.com";, - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ] }, { "name": "wikimedia/donation-interface", @@ -2056,5 +1947,114 @@ "donations", "payments" ] + }, + { + "name": "symfony/polyfill-php54", + "version": "v1.3.0", + "version_normalized": "1.3.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php54.git";, + "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/90e085822963fdcc9d1c5b73deb3d2e5783b16a0";, + "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2016-11-14T01:06:16+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php54\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/";, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p...@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors"; + } + ], + "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", + "homepage": "https://symfony.com";, + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ] + }, + { + "name": "wikimedia/omnimail-silverpop", + "version": "dev-master", + "version_normalized": "9999999-dev", + "source": { + "type": "git", + "url": "https://github.com/eileenmcnaughton/omnimail-silverpop.git";, + "reference": "cd3933b8ee7b263d0472cc44d047b82f3ec4029c" + }, + "require": { + "league/csv": "^8.0", + "mrmarkfrench/silverpop-php-connector": "dev-master", + "omnimail/omnimail": "dev-master", + "phpseclib/phpseclib": "~2.0" + }, + "require-dev": { + "guzzlehttp/guzzle": "*" + }, + "time": "2017-07-09T22:55:21+00:00", + "type": "library", + "installation-source": "source", + "autoload": { + "psr-4": { + "Omnimail\\Silverpop\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "Omnimail\\Silverpop\\Tests\\": "test/tests" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eileen McNaughton", + "email": "emcnaugh...@wikimedia.org" + } + ], + "description": "Silverpop plugin for Omnimail", + "keywords": [ + "delivery", + "email", + "mail", + "omnimail", + "silverpop" + ] } ] diff --git a/wikimedia/omnimail-silverpop/src/Responses/Contact.php b/wikimedia/omnimail-silverpop/src/Responses/Contact.php index f073e4f..b2ae90a 100644 --- a/wikimedia/omnimail-silverpop/src/Responses/Contact.php +++ b/wikimedia/omnimail-silverpop/src/Responses/Contact.php @@ -82,7 +82,7 @@ * @return mixed */ public function getOptInSource() { - return $this->data['opt_in_details']; + return (string) $this->data['opt_in_details']; } /** @@ -136,6 +136,10 @@ $this->contactReference = $contactReference; } + public function getCustomData($key) { + return (string) $this->data[$key]; + } + /** * @var SilverpopConnector */ -- To view, visit https://gerrit.wikimedia.org/r/368106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I87ba8b35ce65f79c13cec80d47129ae29b7ceb44 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm/vendor Gerrit-Branch: master Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org> Gerrit-Reviewer: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
