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

Use native array_column

Browse Source 
[MAILPOET-3173]
This commit is contained in:
Pavel Dohnal
2020-10-08 14:47:16 +02:00
committed by Veljko V
parent 8ad0be73a2
commit 9e8ccd2c17
23 changed files with 0 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -48,7 +48,6 @@
],
"files": [
"lib/exceptions.php",
"lib-3rd-party/ArrayColumn.php",
"vendor-prefixed/symfony/polyfill-ctype/bootstrap.php",
"vendor-prefixed/symfony/polyfill-iconv/bootstrap.php",
"vendor-prefixed/symfony/polyfill-mbstring/bootstrap.php",

80
lib-3rd-party/ArrayColumn.php vendored
View File

@ -1,80 +0,0 @@
<?php
namespace MailPoetVendor;
/*
* 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) {
$argc = func_num_args();
$params = func_get_args();
if (!empty(\array_column([['id' => '4']], 'id'))) {
return \array_column($input, $column_key, $index_key);
}
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;
}

2
lib/API/JSON/ResponseBuilders/NewslettersResponseBuilder.php
View File

@ -11,8 +11,6 @@ use MailPoet\Newsletter\Statistics\NewsletterStatisticsRepository;
use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoetVendor\Doctrine\ORM\EntityManager;
use function MailPoetVendor\array_column;
class NewslettersResponseBuilder {
const DATE_FORMAT = 'Y-m-d H:i:s';

2
lib/AutomaticEmails/AutomaticEmails.php
View File

@ -5,8 +5,6 @@ namespace MailPoet\AutomaticEmails;
use MailPoet\WP\Functions as WPFunctions;
use MailPoet\WP\Notice;
use function MailPoetVendor\array_column;
class AutomaticEmails {
const FILTER_PREFIX = 'mailpoet_automatic_email_';

2
lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php
View File

@ -9,8 +9,6 @@ use MailPoet\Newsletter\Scheduler\AutomaticEmailScheduler;
use MailPoet\WooCommerce\Helper as WCHelper;
use MailPoet\WP\Functions as WPFunctions;
use function MailPoetVendor\array_column;
class PurchasedInCategory {
const SLUG = 'woocommerce_product_purchased_in_category';

2
lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php
View File

@ -9,8 +9,6 @@ use MailPoet\Newsletter\Scheduler\AutomaticEmailScheduler;
use MailPoet\WooCommerce\Helper as WCHelper;
use MailPoet\WP\Functions as WPFunctions;
use function MailPoetVendor\array_column;
class PurchasedProduct {
const SLUG = 'woocommerce_product_purchased';
/**

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

@ -13,8 +13,6 @@ use MailPoet\Tasks\Bounce as BounceTask;
use MailPoet\Tasks\Subscribers as TaskSubscribers;
use MailPoet\Tasks\Subscribers\BatchIterator;
use function MailPoetVendor\array_column;
class Bounce extends SimpleWorker {
const TASK_TYPE = 'bounce';
const BATCH_SIZE = 100;

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

@ -23,8 +23,6 @@ use MailPoet\Tasks\Subscribers\BatchIterator;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
use function MailPoetVendor\array_column;
class SendingQueue {
public $mailerTask;
public $newsletterTask;

2
lib/Form/Block/Segment.php
View File

@ -6,8 +6,6 @@ use MailPoet\Form\BlockWrapperRenderer;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\WP\Functions as WPFunctions;
use function MailPoetVendor\array_column;
class Segment {
/** @var BlockRendererHelper */

2
lib/Listing/ListingRepository.php
View File

@ -6,8 +6,6 @@ use MailPoet\Util\Helpers;
use MailPoetVendor\Doctrine\ORM\EntityManager;
use MailPoetVendor\Doctrine\ORM\QueryBuilder;
use function MailPoetVendor\array_column;
abstract class ListingRepository {
/** @var QueryBuilder */
protected $queryBuilder;

2
lib/Models/Newsletter.php
View File

@ -11,8 +11,6 @@ use MailPoet\Util\Helpers;
use MailPoet\Util\Security;
use MailPoet\WP\Functions as WPFunctions;
use function MailPoetVendor\array_column;
/**
* @property int $id
* @property int $parentId

2
lib/Models/Subscriber.php
View File

@ -8,8 +8,6 @@ use MailPoet\Util\Helpers;
use MailPoet\Util\Security;
use MailPoet\WP\Functions as WPFunctions;
use function MailPoetVendor\array_column;
/**
* @property int $id
* @property string $email

2
lib/Models/SubscriberCustomField.php
View File

@ -4,8 +4,6 @@ namespace MailPoet\Models;
use MailPoet\Util\Helpers;
use function MailPoetVendor\array_column;
/**
* @property int $subscriberId
* @property int $customFieldId

2
lib/Newsletter/Links/Links.php
View File

@ -13,8 +13,6 @@ use MailPoet\Util\Helpers;
use MailPoet\Util\pQuery\pQuery as DomParser;
use MailPoet\Util\Security;
use function MailPoetVendor\array_column;
class Links {
const DATA_TAG_CLICK = '[mailpoet_click_data]';
const DATA_TAG_OPEN = '[mailpoet_open_data]';

2
lib/Newsletter/NewslettersRepository.php
View File

@ -28,8 +28,6 @@ use MailPoetVendor\Doctrine\DBAL\Connection;
use MailPoetVendor\Doctrine\ORM\EntityManager;
use MailPoetVendor\Doctrine\ORM\Query\Expr\Join;
use function MailPoetVendor\array_column;
/**
* @extends Repository<NewsletterEntity>
*/

2
lib/NewsletterTemplates/NewsletterTemplatesRepository.php
View File

@ -6,8 +6,6 @@ use MailPoet\Doctrine\Repository;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterTemplateEntity;
use function MailPoetVendor\array_column;
/**
* @extends Repository<NewsletterTemplateEntity>
*/

2
lib/Segments/SegmentSubscribersRepository.php
View File

@ -13,8 +13,6 @@ use MailPoetVendor\Doctrine\DBAL\Driver\Statement;
use MailPoetVendor\Doctrine\DBAL\Query\QueryBuilder;
use MailPoetVendor\Doctrine\ORM\EntityManager;
use function MailPoetVendor\array_column;
class SegmentSubscribersRepository {
/** @var EntityManager */
private $entityManager;

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

@ -9,8 +9,6 @@ use MailPoet\Util\Security;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\XLSXWriter;
use function MailPoetVendor\array_column;
class Export {
const SUBSCRIBER_BATCH_SIZE = 15000;

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

@ -16,8 +16,6 @@ use MailPoet\Util\Security;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
use function MailPoetVendor\array_column;
class Import {
public $subscribersData;
public $segmentsIds;

2
lib/Subscribers/Statistics/SubscriberStatisticsRepository.php
View File

@ -12,8 +12,6 @@ use MailPoet\Newsletter\Statistics\WooCommerceRevenue;
use MailPoet\WooCommerce\Helper as WCHelper;
use MailPoetVendor\Doctrine\ORM\EntityManager;
use function MailPoetVendor\array_column;
/**
* @extends Repository<SubscriberEntity>
*/

2
lib/Subscribers/SubscriberListingRepository.php
View File

@ -15,8 +15,6 @@ use MailPoetVendor\Doctrine\ORM\EntityManager;
use MailPoetVendor\Doctrine\ORM\Query\Expr\Join;
use MailPoetVendor\Doctrine\ORM\QueryBuilder;
use function MailPoetVendor\array_column;
class SubscriberListingRepository extends ListingRepository {
const DEFAULT_SORT_BY = 'createdAt';

2
lib/Tasks/Sending.php
View File

@ -9,8 +9,6 @@ use MailPoet\Util\Helpers;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
use function MailPoetVendor\array_column;
/**
* A facade class containing all necessary models to work with a sending queue
* @property string|null $status

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

@ -4,8 +4,6 @@ namespace MailPoet\Tasks\Subscribers;
use MailPoet\Models\ScheduledTaskSubscriber;
use function MailPoetVendor\array_column;
class BatchIterator implements \Iterator, \Countable {
private $taskId;
private $batchSize;