From a012984a7aa0a9b43a536f029a96ca15db54f6da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Jakes=CC=8C?= <jan@jakes.pro>
Date: Tue, 26 Nov 2019 16:23:54 +0100
Subject: [PATCH] Move array_column polyfill to MailPoetVendor namespace

[MAILPOET-2545]
---
 lib-3rd-party/ArrayColumn.php                                  | 2 +-
 lib/AutomaticEmails/AutomaticEmails.php                        | 2 +-
 lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php | 2 +-
 lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php    | 2 +-
 lib/Cron/Workers/Bounce.php                                    | 2 +-
 lib/Cron/Workers/SendingQueue/SendingQueue.php                 | 2 +-
 lib/Models/Newsletter.php                                      | 2 +-
 lib/Models/Subscriber.php                                      | 2 +-
 lib/Models/SubscriberCustomField.php                           | 2 +-
 lib/Newsletter/Links/Links.php                                 | 2 +-
 lib/Segments/SubscribersFinder.php                             | 2 +-
 lib/Subscribers/ImportExport/Export/Export.php                 | 2 +-
 lib/Subscribers/ImportExport/Import/Import.php                 | 2 +-
 lib/Tasks/Sending.php                                          | 2 +-
 lib/Tasks/Subscribers/BatchIterator.php                        | 2 +-
 lib/Util/Notices/UnauthorizedEmailInNewslettersNotice.php      | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib-3rd-party/ArrayColumn.php b/lib-3rd-party/ArrayColumn.php
index e499d1ba66..01786b6c84 100644
--- a/lib-3rd-party/ArrayColumn.php
+++ b/lib-3rd-party/ArrayColumn.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MailPoet\Util;
+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()
diff --git a/lib/AutomaticEmails/AutomaticEmails.php b/lib/AutomaticEmails/AutomaticEmails.php
index 917a7942bd..588ed4dfc7 100644
--- a/lib/AutomaticEmails/AutomaticEmails.php
+++ b/lib/AutomaticEmails/AutomaticEmails.php
@@ -5,7 +5,7 @@ namespace MailPoet\AutomaticEmails;
 use MailPoet\WP\Functions as WPFunctions;
 use MailPoet\WP\Notice;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class AutomaticEmails {
   const FILTER_PREFIX = 'mailpoet_automatic_email_';
diff --git a/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php b/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php
index d5560dc428..d8f06cd193 100644
--- a/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php
+++ b/lib/AutomaticEmails/WooCommerce/Events/PurchasedInCategory.php
@@ -9,7 +9,7 @@ use MailPoet\Newsletter\Scheduler\AutomaticEmailScheduler;
 use MailPoet\WooCommerce\Helper as WCHelper;
 use MailPoet\WP\Functions as WPFunctions;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class PurchasedInCategory {
   const SLUG = 'woocommerce_product_purchased_in_category';
diff --git a/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php b/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php
index a578bac577..5f889b3d48 100644
--- a/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php
+++ b/lib/AutomaticEmails/WooCommerce/Events/PurchasedProduct.php
@@ -9,7 +9,7 @@ use MailPoet\Newsletter\Scheduler\AutomaticEmailScheduler;
 use MailPoet\WooCommerce\Helper as WCHelper;
 use MailPoet\WP\Functions as WPFunctions;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class PurchasedProduct {
   const SLUG = 'woocommerce_product_purchased';
diff --git a/lib/Cron/Workers/Bounce.php b/lib/Cron/Workers/Bounce.php
index 7360856230..21bbcba303 100644
--- a/lib/Cron/Workers/Bounce.php
+++ b/lib/Cron/Workers/Bounce.php
@@ -14,7 +14,7 @@ use MailPoet\Tasks\Bounce as BounceTask;
 use MailPoet\Tasks\Subscribers as TaskSubscribers;
 use MailPoet\Tasks\Subscribers\BatchIterator;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class Bounce extends SimpleWorker {
   const TASK_TYPE = 'bounce';
diff --git a/lib/Cron/Workers/SendingQueue/SendingQueue.php b/lib/Cron/Workers/SendingQueue/SendingQueue.php
index e2e82cb9ce..ec2dcd5719 100644
--- a/lib/Cron/Workers/SendingQueue/SendingQueue.php
+++ b/lib/Cron/Workers/SendingQueue/SendingQueue.php
@@ -20,7 +20,7 @@ use MailPoet\Tasks\Sending as SendingTask;
 use MailPoet\Tasks\Subscribers\BatchIterator;
 use MailPoet\WP\Functions as WPFunctions;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class SendingQueue {
   public $mailer_task;
diff --git a/lib/Models/Newsletter.php b/lib/Models/Newsletter.php
index 79354d2cce..7ad620e476 100644
--- a/lib/Models/Newsletter.php
+++ b/lib/Models/Newsletter.php
@@ -16,7 +16,7 @@ use MailPoet\Util\Security;
 use MailPoet\WooCommerce\Helper as WCHelper;
 use MailPoet\WP\Functions as WPFunctions;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 /**
  * @property int $id
diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php
index e7501c1d69..1e54378989 100644
--- a/lib/Models/Subscriber.php
+++ b/lib/Models/Subscriber.php
@@ -8,7 +8,7 @@ use MailPoet\Util\Helpers;
 use MailPoet\Util\Security;
 use MailPoet\WP\Functions as WPFunctions;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 /**
  * @property int $id
diff --git a/lib/Models/SubscriberCustomField.php b/lib/Models/SubscriberCustomField.php
index f3182c1d8b..7c3ab68f6c 100644
--- a/lib/Models/SubscriberCustomField.php
+++ b/lib/Models/SubscriberCustomField.php
@@ -4,7 +4,7 @@ namespace MailPoet\Models;
 
 use MailPoet\Util\Helpers;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 /**
  * @property int $subscriber_id
diff --git a/lib/Newsletter/Links/Links.php b/lib/Newsletter/Links/Links.php
index c74cb53953..72f248e52c 100644
--- a/lib/Newsletter/Links/Links.php
+++ b/lib/Newsletter/Links/Links.php
@@ -13,7 +13,7 @@ use MailPoet\Util\Helpers;
 use MailPoet\Util\pQuery\pQuery as DomParser;
 use MailPoet\Util\Security;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class Links {
   const DATA_TAG_CLICK = '[mailpoet_click_data]';
diff --git a/lib/Segments/SubscribersFinder.php b/lib/Segments/SubscribersFinder.php
index 2b0fc17822..922c6411b4 100644
--- a/lib/Segments/SubscribersFinder.php
+++ b/lib/Segments/SubscribersFinder.php
@@ -8,7 +8,7 @@ use MailPoet\Models\Segment;
 use MailPoet\Models\Subscriber;
 use MailPoet\WP\Functions as WPFunctions;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class SubscribersFinder {
 
diff --git a/lib/Subscribers/ImportExport/Export/Export.php b/lib/Subscribers/ImportExport/Export/Export.php
index 8904f19f3c..4780502cb0 100644
--- a/lib/Subscribers/ImportExport/Export/Export.php
+++ b/lib/Subscribers/ImportExport/Export/Export.php
@@ -9,7 +9,7 @@ use MailPoet\Util\Security;
 use MailPoet\Util\XLSXWriter;
 use MailPoet\WP\Functions as WPFunctions;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class Export {
   const SUBSCRIBER_BATCH_SIZE = 15000;
diff --git a/lib/Subscribers/ImportExport/Import/Import.php b/lib/Subscribers/ImportExport/Import/Import.php
index 303ed7ce46..697fc92b3b 100644
--- a/lib/Subscribers/ImportExport/Import/Import.php
+++ b/lib/Subscribers/ImportExport/Import/Import.php
@@ -14,7 +14,7 @@ use MailPoet\Subscribers\Source;
 use MailPoet\Util\Helpers;
 use MailPoet\Util\Security;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class Import {
   public $subscribers_data;
diff --git a/lib/Tasks/Sending.php b/lib/Tasks/Sending.php
index a4a0faedbd..b1e6286faa 100644
--- a/lib/Tasks/Sending.php
+++ b/lib/Tasks/Sending.php
@@ -8,7 +8,7 @@ use MailPoet\Models\ScheduledTaskSubscriber;
 use MailPoet\Models\SendingQueue;
 use MailPoet\WP\Functions as WPFunctions;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 /**
  * A facade class containing all necessary models to work with a sending queue
diff --git a/lib/Tasks/Subscribers/BatchIterator.php b/lib/Tasks/Subscribers/BatchIterator.php
index 417b48d2bd..f6832307c9 100644
--- a/lib/Tasks/Subscribers/BatchIterator.php
+++ b/lib/Tasks/Subscribers/BatchIterator.php
@@ -4,7 +4,7 @@ namespace MailPoet\Tasks\Subscribers;
 
 use MailPoet\Models\ScheduledTaskSubscriber;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class BatchIterator implements \Iterator, \Countable {
   private $task_id;
diff --git a/lib/Util/Notices/UnauthorizedEmailInNewslettersNotice.php b/lib/Util/Notices/UnauthorizedEmailInNewslettersNotice.php
index 619cc83ee5..e418a72a39 100644
--- a/lib/Util/Notices/UnauthorizedEmailInNewslettersNotice.php
+++ b/lib/Util/Notices/UnauthorizedEmailInNewslettersNotice.php
@@ -11,7 +11,7 @@ use MailPoet\Settings\SettingsController;
 use MailPoet\Util\Helpers;
 use MailPoet\WP\Functions as WPFunctions;
 
-use function MailPoet\Util\array_column;
+use function MailPoetVendor\array_column;
 
 class UnauthorizedEmailInNewslettersNotice {