Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add public keyword to methods

Browse Source 
[MAILPOET-2413]
This commit is contained in:
Amine Ben hammou
2019-12-26 12:56:49 +01:00
committed by wxa
parent ec409042d5
commit 43df66d162
823 changed files with 4440 additions and 4440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Subscribers/ImportExport/Export/DynamicSubscribersGetter.php
View File

@ -16,7 +16,7 @@ class DynamicSubscribersGetter extends SubscribersGetter {
/** @var WPFunctions */
private $wp;
function __construct($segments_ids, $batch_size, WPFunctions $wp = null) {
public function __construct($segments_ids, $batch_size, WPFunctions $wp = null) {
parent::__construct($segments_ids, $batch_size);
if ($wp == null) {
$wp = new WPFunctions;

24
lib/Subscribers/ImportExport/Export/Export.php
View File

@ -51,15 +51,15 @@ class Export {
$this->export_file_URL = $this->getExportFileURL($this->export_file);
}
static function getFilePrefix() {
public static function getFilePrefix() {
return 'MailPoet_export_';
}
static function getExportPath() {
public static function getExportPath() {
return Env::$temp_path;
}
function process() {
public function process() {
$processed_subscribers = 0;
$this->default_subscribers_getter->reset();
try {
@ -85,7 +85,7 @@ class Export {
];
}
function generateCSV() {
public function generateCSV() {
$processed_subscribers = 0;
$formatted_subscriber_fields = $this->formatted_subscriber_fields;
$CSV_file = fopen($this->export_file, 'w');
@ -121,7 +121,7 @@ class Export {
return $processed_subscribers;
}
function generateXLSX() {
public function generateXLSX() {
$processed_subscribers = 0;
$XLSX_writer = new XLSXWriter();
$XLSX_writer->setAuthor('MailPoet (www.mailpoet.com)');
@ -172,11 +172,11 @@ class Export {
return $processed_subscribers;
}
function writeXLSX($XLSX_writer, $segment, $data) {
public function writeXLSX($XLSX_writer, $segment, $data) {
return $XLSX_writer->writeSheetRow(ucwords($segment), $data);
}
function getSubscribers() {
public function getSubscribers() {
$subscribers = $this->default_subscribers_getter->get();
if ($subscribers === false) {
$subscribers = $this->dynamic_subscribers_getter->get();
@ -184,7 +184,7 @@ class Export {
return $subscribers;
}
function getExportFileURL($file) {
public function getExportFileURL($file) {
return sprintf(
'%s/%s',
Env::$temp_url,
@ -192,7 +192,7 @@ class Export {
);
}
function getExportFile($format) {
public function getExportFile($format) {
return sprintf(
$this->export_path . '/' . self::getFilePrefix() . '%s.%s',
Security::generateRandomString(15),
@ -200,7 +200,7 @@ class Export {
);
}
function getSubscriberCustomFields() {
public function getSubscriberCustomFields() {
return array_column(
CustomField::findArray(),
'name',
@ -208,7 +208,7 @@ class Export {
);
}
function formatSubscriberFields($subscriber_fields, $subscriber_custom_fields) {
public function formatSubscriberFields($subscriber_fields, $subscriber_custom_fields) {
$export_factory = new ImportExportFactory('export');
$translated_fields = $export_factory->getSubscriberFields();
return array_map(function($field) use (
@ -222,7 +222,7 @@ class Export {
}, $subscriber_fields);
}
function formatSubscriberData($subscriber) {
public function formatSubscriberData($subscriber) {
return array_map(function($field) use ($subscriber) {
return $subscriber[$field];
}, $this->subscriber_fields);

26
lib/Subscribers/ImportExport/Import/Import.php
View File

@ -53,7 +53,7 @@ class Import {
];
}
function validateImportData($data) {
public function validateImportData($data) {
$required_data_fields = [
'subscribers',
'columns',
@ -70,7 +70,7 @@ class Import {
}
}
function process() {
public function process() {
// validate data based on field validation rules
$subscribers_data = $this->validateSubscribersData($this->subscribers_data);
if (!$subscribers_data) {
@ -136,7 +136,7 @@ class Import {
];
}
function validateSubscribersData($subscribers_data) {
public function validateSubscribersData($subscribers_data) {
$invalid_records = [];
$validator = new ModelValidator();
foreach ($subscribers_data as $column => &$data) {
@ -182,7 +182,7 @@ class Import {
return $subscribers_data;
}
function transformSubscribersData($subscribers, $columns) {
public function transformSubscribersData($subscribers, $columns) {
$transformed_subscribers = [];
foreach ($columns as $column => $data) {
$transformed_subscribers[$column] = array_column($subscribers, $data['index']);
@ -190,7 +190,7 @@ class Import {
return $transformed_subscribers;
}
function splitSubscribersData($subscribers_data) {
public function splitSubscribersData($subscribers_data) {
// $subscribers_data is an two-dimensional associative array
// of all subscribers being imported: [field => [value1, value2], field => [value1, value2], ...]
$temp_existing_subscribers = [];
@ -238,7 +238,7 @@ class Import {
];
}
function deleteExistingTrashedSubscribers($subscribers_data) {
public function deleteExistingTrashedSubscribers($subscribers_data) {
$existing_trashed_records = array_filter(
array_map(function($subscriber_emails) {
return Subscriber::selectMany(['id'])
@ -257,7 +257,7 @@ class Import {
}
}
function addMissingRequiredFields($subscribers) {
public function addMissingRequiredFields($subscribers) {
$subscribers_count = count($subscribers['data'][key($subscribers['data'])]);
foreach (array_keys($this->required_subscribers_fields) as $required_field) {
if (in_array($required_field, $subscribers['fields'])) continue;
@ -308,7 +308,7 @@ class Import {
return $subscribers_data;
}
function getSubscribersFields($subscribers_fields) {
public function getSubscribersFields($subscribers_fields) {
return array_values(
array_filter(
array_map(function($field) {
@ -318,7 +318,7 @@ class Import {
);
}
function getCustomSubscribersFields($subscribers_fields) {
public function getCustomSubscribersFields($subscribers_fields) {
return array_values(
array_filter(
array_map(function($field) {
@ -328,7 +328,7 @@ class Import {
);
}
function createOrUpdateSubscribers(
public function createOrUpdateSubscribers(
$action,
$subscribers_data,
$subscribers_custom_fields = false
@ -378,7 +378,7 @@ class Import {
return $created_or_updated_subscribers;
}
function createOrUpdateCustomFields(
public function createOrUpdateCustomFields(
$action,
$created_or_updated_subscribers,
$subscribers_data,
@ -418,11 +418,11 @@ class Import {
}
}
function synchronizeWPUsers($wp_users) {
public function synchronizeWPUsers($wp_users) {
return array_walk($wp_users, '\MailPoet\Segments\WP::synchronizeUser');
}
function addSubscribersToSegments($subscribers_ids, $segments_ids) {
public function addSubscribersToSegments($subscribers_ids, $segments_ids) {
foreach (array_chunk($subscribers_ids, self::DB_QUERY_CHUNK_SIZE) as $subscriber_ids_chunk) {
SubscriberSegment::subscribeManyToSegments(
$subscriber_ids_chunk, $segments_ids

12
lib/Subscribers/ImportExport/Import/MailChimp.php
View File

@ -13,7 +13,7 @@ class MailChimp {
private $lists_url;
const API_KEY_REGEX = '/[a-zA-Z0-9]{32}-[a-zA-Z0-9]{2,4}$/';
function __construct($api_key) {
public function __construct($api_key) {
$this->api_key = $this->getAPIKey($api_key);
$this->max_post_size = Helpers::getMaxPostSize('bytes');
$this->data_center = $this->getDataCenter($this->api_key);
@ -21,7 +21,7 @@ class MailChimp {
$this->export_url = 'https://%s.api.mailchimp.com/export/1.0/list/?apikey=%s&id=%s';
}
function getLists() {
public function getLists() {
if (!$this->api_key || !$this->data_center) {
return $this->throwException('API');
}
@ -59,7 +59,7 @@ class MailChimp {
return $lists;
}
function getSubscribers($lists = []) {
public function getSubscribers($lists = []) {
if (!$this->api_key || !$this->data_center) {
return $this->throwException('API');
}
@ -122,17 +122,17 @@ class MailChimp {
];
}
function getDataCenter($api_key) {
public function getDataCenter($api_key) {
if (!$api_key) return false;
$api_key_parts = explode('-', $api_key);
return end($api_key_parts);
}
function getAPIKey($api_key) {
public function getAPIKey($api_key) {
return (preg_match(self::API_KEY_REGEX, $api_key)) ? $api_key : false;
}
function throwException($error) {
public function throwException($error) {
$errorMessage = WPFunctions::get()->__('Unknown MailChimp error.', 'mailpoet');
switch ($error) {
case 'API':

16
lib/Subscribers/ImportExport/ImportExportFactory.php
View File

@ -15,12 +15,12 @@ class ImportExportFactory {
private $wp;
function __construct($action = null) {
public function __construct($action = null) {
$this->action = $action;
$this->wp = new WPFunctions;
}
function getSegments() {
public function getSegments() {
if ($this->action === self::IMPORT_ACTION) {
$segments = Segment::getSegmentsForImport();
} else {
@ -42,7 +42,7 @@ class ImportExportFactory {
}, $segments);
}
function getSubscriberFields() {
public function getSubscriberFields() {
$fields = [
'email' => WPFunctions::get()->__('Email', 'mailpoet'),
'first_name' => WPFunctions::get()->__('First name', 'mailpoet'),
@ -61,7 +61,7 @@ class ImportExportFactory {
return $fields;
}
function formatSubscriberFields($subscriber_fields) {
public function formatSubscriberFields($subscriber_fields) {
return array_map(function($field_id, $field_name) {
return [
'id' => $field_id,
@ -72,11 +72,11 @@ class ImportExportFactory {
}, array_keys($subscriber_fields), $subscriber_fields);
}
function getSubscriberCustomFields() {
public function getSubscriberCustomFields() {
return CustomField::findArray();
}
function formatSubscriberCustomFields($subscriber_custom_fields) {
public function formatSubscriberCustomFields($subscriber_custom_fields) {
return array_map(function($field) {
return [
'id' => $field['id'],
@ -88,7 +88,7 @@ class ImportExportFactory {
}, $subscriber_custom_fields);
}
function formatFieldsForSelect2(
public function formatFieldsForSelect2(
$subscriber_fields,
$subscriber_custom_fields) {
$actions = ($this->action === 'import') ?
@ -133,7 +133,7 @@ class ImportExportFactory {
return $select2Fields;
}
function bootstrap() {
public function bootstrap() {
$subscriber_fields = $this->getSubscriberFields();
$subscriber_custom_fields = $this->getSubscriberCustomFields();
$data['segments'] = json_encode($this->getSegments());

2
lib/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporter.php
View File

@ -10,7 +10,7 @@ class NewsletterClicksExporter {
const LIMIT = 100;
function export($email, $page = 1) {
public function export($email, $page = 1) {
$data = $this->exportSubscriber(Subscriber::findOne(trim($email)), $page);
return [
'data' => $data,

2
lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php
View File

@ -12,7 +12,7 @@ class NewslettersExporter {
const LIMIT = 100;
function export($email, $page = 1) {
public function export($email, $page = 1) {
$data = $this->exportSubscriber(Subscriber::findOne(trim($email)), $page);
return [
'data' => $data,

2
lib/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporter.php
View File

@ -7,7 +7,7 @@ use MailPoet\WP\Functions as WPFunctions;
class SegmentsExporter {
function export($email) {
public function export($email) {
return [
'data' => $this->exportSubscriber(Subscriber::findOne(trim($email))),
'done' => true,

2
lib/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporter.php
View File

@ -9,7 +9,7 @@ use MailPoet\WP\Functions as WPFunctions;
class SubscriberExporter {
function export($email) {
public function export($email) {
return [
'data' => $this->exportSubscriber(Subscriber::findOne(trim($email))),
'done' => true,