Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377684 )
Change subject: Update Omnimail
......................................................................
Update Omnimail
Change-Id: I375ef21ca7952bc29516064f4b90f06aa9bb24bc
---
M composer/installed.json
M wikimedia/omnimail-silverpop/src/Requests/ExportListRequest.php
M wikimedia/omnimail-silverpop/src/Requests/SilverpopBaseRequest.php
M wikimedia/omnimail-silverpop/src/Responses/BaseResponse.php
M wikimedia/omnimail-silverpop/src/Responses/GroupMembersResponse.php
5 files changed, 156 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor
refs/changes/84/377684/1
diff --git a/composer/installed.json b/composer/installed.json
index 318094c..2e30e19 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1276,55 +1276,6 @@
"homepage": "http://github.com/c9s/GetOptionKit";
},
{
- "name": "wikimedia/omnimail-silverpop",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "source": {
- "type": "git",
- "url":
"https://github.com/eileenmcnaughton/omnimail-silverpop.git";,
- "reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
- },
- "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-27T02:53:46+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": "wikimedia/smash-pig",
"version": "dev-master",
"version_normalized": "9999999-dev",
@@ -2018,5 +1969,114 @@
"GPL-2.0"
],
"description": "Wikimedia Foundation payment processing library"
+ },
+ {
+ "name": "symfony/polyfill-php54",
+ "version": "v1.5.0",
+ "version_normalized": "1.5.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php54.git";,
+ "reference": "b7763422a5334c914ef0298ed21b253d25913a6e"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/symfony/polyfill-php54/zipball/b7763422a5334c914ef0298ed21b253d25913a6e";,
+ "reference": "b7763422a5334c914ef0298ed21b253d25913a6e",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2017-06-14T15:44:48+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.5-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": "45eaa193c3353bcceb27bb2676da08598fd57686"
+ },
+ "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-09-12T23:04:53+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/Requests/ExportListRequest.php
b/wikimedia/omnimail-silverpop/src/Requests/ExportListRequest.php
index ffb87fb..9cf56f7 100644
--- a/wikimedia/omnimail-silverpop/src/Requests/ExportListRequest.php
+++ b/wikimedia/omnimail-silverpop/src/Requests/ExportListRequest.php
@@ -123,6 +123,7 @@
$response = new GroupMembersResponse(array());
$response->setRetrievalParameters($this->getRetrievalParameters());
$response->setSilverpop($this->silverPop);
+ $response->setOffset($this->getOffset());
return $response;
}
diff --git a/wikimedia/omnimail-silverpop/src/Requests/SilverpopBaseRequest.php
b/wikimedia/omnimail-silverpop/src/Requests/SilverpopBaseRequest.php
index 0d63bde..2253b84 100644
--- a/wikimedia/omnimail-silverpop/src/Requests/SilverpopBaseRequest.php
+++ b/wikimedia/omnimail-silverpop/src/Requests/SilverpopBaseRequest.php
@@ -65,6 +65,28 @@
protected $developerMode;
/**
+ * Offset from start of csv file.
+ *
+ * @var int
+ */
+ protected $offset = 0;
+
+
+ /**
+ * @return int
+ */
+ public function getOffset() {
+ return $this->offset;
+ }
+
+ /**
+ * @param int $offset
+ */
+ public function setOffset($offset) {
+ $this->offset = $offset;
+ }
+
+ /**
* @return bool
*/
public function isDeveloperMode() {
diff --git a/wikimedia/omnimail-silverpop/src/Responses/BaseResponse.php
b/wikimedia/omnimail-silverpop/src/Responses/BaseResponse.php
index 49ac378..de76fbc 100644
--- a/wikimedia/omnimail-silverpop/src/Responses/BaseResponse.php
+++ b/wikimedia/omnimail-silverpop/src/Responses/BaseResponse.php
@@ -38,6 +38,28 @@
*/
protected $endPoint;
+
+ /**
+ * Offset from start of csv file.
+ *
+ * @var int
+ */
+ protected $offset = 0;
+
+ /**
+ * @return int
+ */
+ public function getOffset() {
+ return $this->offset;
+ }
+
+ /**
+ * @param int $offset
+ */
+ public function setOffset($offset) {
+ $this->offset = $offset;
+ }
+
/**
* @return string
*/
diff --git
a/wikimedia/omnimail-silverpop/src/Responses/GroupMembersResponse.php
b/wikimedia/omnimail-silverpop/src/Responses/GroupMembersResponse.php
index 0d4b7bd..62be118 100644
--- a/wikimedia/omnimail-silverpop/src/Responses/GroupMembersResponse.php
+++ b/wikimedia/omnimail-silverpop/src/Responses/GroupMembersResponse.php
@@ -119,6 +119,7 @@
$filterOutRow = function ($row, $rowIndex) {
return $rowIndex != 0;
};
+ $this->reader->setOffset($this->getOffset());
$this->reader->addFilter($filterOutRow);
$formatFunction = function ($row) {
@@ -179,6 +180,7 @@
public function setCsvReader() {
$csvFile = $this->downloadCsv();
$this->reader = Reader::createFromPath($csvFile);
+ $this->reader->setOffset($this->getOffset());
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/377684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I375ef21ca7952bc29516064f4b90f06aa9bb24bc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/vendor
Gerrit-Branch: master
Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
