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

User polyfill for array_column

Browse Source 
[MAILPOET-1618]
This commit is contained in:
Pavel Dohnal
2018-11-26 16:40:59 +01:00
parent 012dc25a5b
commit a9f3eeeb0d
12 changed files with 95 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -40,6 +40,9 @@
"phpcompatibility/php-compatibility": "^9.0"
},
"autoload": {
"files": [
"lib/Util/ArrayColumn.php"
],
"psr-4": {
"MailPoet\\": "lib/",
"Sudzy\\": "lib/Util/Sudzy"

2
lib/Cron/Workers/Bounce.php
View File

@ -11,7 +11,7 @@ use MailPoet\Tasks\Subscribers\BatchIterator;
use MailPoet\Models\Subscriber;
use MailPoet\Services\Bridge;
use MailPoet\Services\Bridge\API;
use MailPoet\Util\Helpers;
use function MailPoet\Util\array_column;
if(!defined('ABSPATH')) exit;

1
lib/Models/Newsletter.php
View File

@ -6,6 +6,7 @@ use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Util\Helpers;
use MailPoet\Util\Security;
use MailPoet\WP\Emoji;
use function MailPoet\Util\array_column;
if(!defined('ABSPATH')) exit;

4
lib/Models/Subscriber.php
View File

@ -1,12 +1,12 @@
<?php
namespace MailPoet\Models;
use MailPoet\Mailer\Mailer;
use MailPoet\Newsletter\Scheduler\Scheduler;
use MailPoet\Subscribers\ConfirmationEmailMailer;
use MailPoet\Subscribers\NewSubscriberNotificationMailer;
use MailPoet\Subscribers\Source;
use MailPoet\Util\Helpers;
use MailPoet\Subscription;
use function MailPoet\Util\array_column;
if(!defined('ABSPATH')) exit;

1
lib/Segments/SubscribersFinder.php
View File

@ -7,6 +7,7 @@ use MailPoet\Models\ScheduledTaskSubscriber;
use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber;
use MailPoet\WP\Hooks;
use function MailPoet\Util\array_column;
class SubscribersFinder {

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

@ -4,11 +4,8 @@ namespace MailPoet\Subscribers\ImportExport\Export;
use MailPoet\Config\Env;
use MailPoet\Models\CustomField;
use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberSegment;
use MailPoet\Subscribers\ImportExport\ImportExportFactory;
use MailPoet\Util\Helpers;
use function MailPoet\Util\array_column;
use MailPoet\Util\Security;
use MailPoet\Util\XLSXWriter;

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

@ -11,6 +11,7 @@ use MailPoet\Models\SubscriberSegment;
use MailPoet\Subscribers\ImportExport\ImportExportFactory;
use MailPoet\Subscribers\Source;
use MailPoet\Util\Helpers;
use function MailPoet\Util\array_column;
class Import {
public $subscribers_data;

2
lib/Tasks/Sending.php
View File

@ -6,7 +6,7 @@ use Carbon\Carbon;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\ScheduledTaskSubscriber;
use MailPoet\Models\SendingQueue;
use MailPoet\Util\Helpers;
use function MailPoet\Util\array_column;
use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit;

2
lib/Tasks/Subscribers/BatchIterator.php
View File

@ -2,7 +2,7 @@
namespace MailPoet\Tasks\Subscribers;
use MailPoet\Models\ScheduledTaskSubscriber;
use MailPoet\Util\Helpers;
use function MailPoet\Util\array_column;
if(!defined('ABSPATH')) exit;

79
lib/Util/ArrayColumn.php Normal file
View File

@ -0,0 +1,79 @@
<?php
namespace MailPoet\Util;
/*
* Using func_get_args() in order to check for proper number of parameters and trigger errors exactly as the built-in array_column()
* does in PHP 5.5.
* @author Ben Ramsey (http://benramsey.com)
*/
function array_column($input = null, $column_key = null, $index_key = null) {
if(!empty(\array_column([['id' => '4']], 'id'))) {
return \array_column($input, $column_key, $index_key);
}
$argc = func_num_args();
$params = func_get_args();
if($argc < 2) {
trigger_error("array_column() expects at least 2 parameters, {$argc} given", E_USER_WARNING);
return null;
}
if(!is_array($params[0])) {
trigger_error(
'array_column() expects parameter 1 to be array, ' . gettype($params[0]) . ' given',
E_USER_WARNING
);
return null;
}
if(!is_int($params[1])
&& !is_float($params[1])
&& !is_string($params[1])
&& $params[1] !== null
&& !(is_object($params[1]) && method_exists($params[1], '__toString'))
) {
trigger_error('array_column(): The column key should be either a string or an integer', E_USER_WARNING);
return false;
}
if(isset($params[2])
&& !is_int($params[2])
&& !is_float($params[2])
&& !is_string($params[2])
&& !(is_object($params[2]) && method_exists($params[2], '__toString'))
) {
trigger_error('array_column(): The index key should be either a string or an integer', E_USER_WARNING);
return false;
}
$params_input = $params[0];
$params_column_key = ($params[1] !== null) ? (string)$params[1] : null;
$params_index_key = null;
if(isset($params[2])) {
if(is_float($params[2]) || is_int($params[2])) {
$params_index_key = (int)$params[2];
} else {
$params_index_key = (string)$params[2];
}
}
$result_array = [];
foreach($params_input as $row) {
$key = $value = null;
$key_set = $value_set = false;
if($params_index_key !== null && array_key_exists($params_index_key, $row)) {
$key_set = true;
$key = (string)$row[$params_index_key];
}
if($params_column_key === null) {
$value_set = true;
$value = $row;
} elseif(is_array($row) && array_key_exists($params_column_key, $row)) {
$value_set = true;
$value = $row[$params_column_key];
}
if($value_set) {
if($key_set) {
$result_array[$key] = $value;
} else {
$result_array[] = $value;
}
}
}
return $result_array;
}

1
tests/integration/Cron/Workers/BounceTest.php
View File

@ -9,7 +9,6 @@ use MailPoet\Models\ScheduledTaskSubscriber;
use MailPoet\Models\Setting;
use MailPoet\Models\Subscriber;
use MailPoet\Services\Bridge\API;
use MailPoet\Util\Helpers;
require_once('BounceTestMockAPI.php');
use MailPoet\Cron\Workers\Bounce\BounceTestMockAPI as MockAPI;

1
tests/integration/Subscribers/ImportExport/Import/ImportTest.php
View File

@ -7,7 +7,6 @@ use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberCustomField;
use MailPoet\Models\SubscriberSegment;
use MailPoet\Subscribers\ImportExport\Import\Import;
use MailPoet\Util\Helpers;
class ImportTest extends \MailPoetTest {
function _before() {