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

Move WPHooks methods to WPFunctions

Browse Source
This commit is contained in:
Amine Ben hammou
2019-01-28 19:00:19 +01:00
parent d452cfcae7
commit 8b602bd947
49 changed files with 354 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Cron/CronHelper.php
View File

@@ -6,7 +6,6 @@ use MailPoet\Models\Setting;
use MailPoet\Router\Endpoints\CronDaemon as CronDaemonEndpoint;
use MailPoet\Router\Router;
use MailPoet\Util\Security;
use MailPoet\WP\Hooks as WPHooks;
use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit;
@@ -130,7 +129,10 @@ class CronHelper {
}
static function queryCronUrl($url, $wp = null) {
$args = WPHooks::applyFilters(
if(is_null($wp)) {
$wp = new WPFunctions();
}
$args = $wp->applyFilters(
'mailpoet_cron_request_args',
array(
'blocking' => true,
@@ -139,19 +141,19 @@ class CronHelper {
'user-agent' => 'MailPoet Cron'
)
);
if(is_null($wp)) {
$wp = new WPFunctions();
}
return $wp->wpRemotePost($url, $args);
}
static function getCronUrl($action, $data = false) {
static function getCronUrl($action, $data = false, $wp = null) {
if(is_null($wp)) {
$wp = new WPFunctions();
}
$url = Router::buildRequest(
CronDaemonEndpoint::ENDPOINT,
$action,
$data
);
$custom_cron_url = WPHooks::applyFilters('mailpoet_cron_request_url', $url);
$custom_cron_url = $wp->applyFilters('mailpoet_cron_request_url', $url);
return ($custom_cron_url === $url) ?
str_replace(home_url(), self::getSiteUrl(), $url) :
$custom_cron_url;

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

@@ -15,7 +15,7 @@ use MailPoet\Models\Subscriber as SubscriberModel;
use MailPoet\Segments\SubscribersFinder;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Tasks\Subscribers\BatchIterator;
use MailPoet\WP\Hooks as WPHooks;
use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit;
@@ -39,7 +39,8 @@ class SendingQueue {
$this->mailer_task = ($mailer_task) ? $mailer_task : new MailerTask();
$this->newsletter_task = ($newsletter_task) ? $newsletter_task : new NewsletterTask();
$this->timer = ($timer) ? $timer : microtime(true);
$this->batch_size = WPHooks::applyFilters('mailpoet_cron_worker_sending_queue_batch_size', self::BATCH_SIZE);
$wp = new WPFunctions;
$this->batch_size = $wp->applyFilters('mailpoet_cron_worker_sending_queue_batch_size', self::BATCH_SIZE);
}
function process() {

14
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

@@ -13,7 +13,7 @@ use MailPoet\Models\Setting;
use MailPoet\Newsletter\Links\Links as NewsletterLinks;
use MailPoet\Newsletter\Renderer\PostProcess\OpenTracking;
use MailPoet\Util\Helpers;
use MailPoet\WP\Hooks;
use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit;
@@ -21,8 +21,14 @@ class Newsletter {
public $tracking_enabled;
public $tracking_image_inserted;
function __construct() {
private $wp;
function __construct(WPFunctions $wp = null) {
$this->tracking_enabled = (boolean)Setting::getValue('tracking.enabled');
if($wp == null) {
$wp = new WPFunctions;
}
$this->wp = $wp;
}
function getNewsletterFromQueue($queue) {
@@ -66,7 +72,7 @@ class Newsletter {
$this->tracking_image_inserted = OpenTracking::addTrackingImage();
// render newsletter
$rendered_newsletter = $newsletter->render();
$rendered_newsletter = Hooks::applyFilters(
$rendered_newsletter = $this->wp->applyFilters(
'mailpoet_sending_newsletter_render_after',
$rendered_newsletter,
$newsletter
@@ -76,7 +82,7 @@ class Newsletter {
} else {
// render newsletter
$rendered_newsletter = $newsletter->render();
$rendered_newsletter = Hooks::applyFilters(
$rendered_newsletter = $this->wp->applyFilters(
'mailpoet_sending_newsletter_render_after',
$rendered_newsletter,
$newsletter