Abstracts WP functions

lib/Cron/CronHelper.php

@@ -7,6 +7,7 @@ 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;
 
@@ -54,7 +55,7 @@ class CronHelper {
     );
     $result = self::queryCronUrl($url);
     if (is_wp_error($result)) return $result->get_error_message();
-    $response = wp_remote_retrieve_body($result);
+    $response = WPFunctions::wpRemoteRetrieveBody($result);
     return (!$validate_response) ?
       $response :
       $response === Daemon::PING_SUCCESS_RESPONSE;
@@ -67,7 +68,7 @@ class CronHelper {
       $data
     );
     $result = self::queryCronUrl($url);
-    return wp_remote_retrieve_body($result);
+    return WPFunctions::wpRemoteRetrieveBody($result);
   }
 
   static function queryCronUrl($url) {
@@ -80,7 +81,7 @@ class CronHelper {
         'user-agent' => 'MailPoet Cron'
       )
     );
-    return wp_remote_get($url, $args);
+    return WPFunctions::wpRemoteGet($url, $args);
   }
 
   static function getCronUrl($action, $data = false) {

lib/Mailer/Methods/AmazonSES.php

@@ -2,6 +2,7 @@
 namespace MailPoet\Mailer\Methods;
 
 use MailPoet\Mailer\Mailer;
+use MailPoet\WP\Functions as WPFunctions;
 
 if(!defined('ABSPATH')) exit;
 
@@ -51,7 +52,7 @@ class AmazonSES {
 
   function send($newsletter, $subscriber, $extra_params = array()) {
     try {
-      $result = wp_remote_post(
+      $result = WPFunctions::wpRemotePost(
         $this->url,
         $this->request($newsletter, $subscriber, $extra_params)
       );
@@ -61,8 +62,8 @@ class AmazonSES {
     if(is_wp_error($result)) {
       return Mailer::formatMailerConnectionErrorResult($result->get_error_message());
     }
-    if(wp_remote_retrieve_response_code($result) !== 200) {
+    if(WPFunctions::wpRemoteRetrieveResponseCode($result) !== 200) {
-      $response = simplexml_load_string(wp_remote_retrieve_body($result));
+      $response = simplexml_load_string(WPFunctions::wpRemoteRetrieveBody($result));
       $response = ($response) ?
         $response->Error->Message->__toString() :
         sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_AMAZONSES);

lib/Mailer/Methods/SendGrid.php

@@ -1,7 +1,9 @@
 <?php
+
 namespace MailPoet\Mailer\Methods;
 
 use MailPoet\Mailer\Mailer;
+use MailPoet\WP\Functions as WPFunctions;
 
 if(!defined('ABSPATH')) exit;
 
@@ -18,14 +20,14 @@ class SendGrid {
   }
 
   function send($newsletter, $subscriber, $extra_params = array()) {
-    $result = wp_remote_post(
+    $result = WPFunctions::wpRemotePost(
       $this->url,
       $this->request($newsletter, $subscriber, $extra_params)
     );
     if(is_wp_error($result)) {
       return Mailer::formatMailerConnectionErrorResult($result->get_error_message());
     }
-    if(wp_remote_retrieve_response_code($result) !== 200) {
+    if(WPFunctions::wpRemoteRetrieveResponseCode($result) !== 200) {
       $response = json_decode($result['body'], true);
       $response = (!empty($response['errors'][0])) ?
         $response['errors'][0] :

lib/Services/Bridge.php

@@ -5,6 +5,7 @@ namespace MailPoet\Services;
 use MailPoet\Mailer\Mailer;
 use MailPoet\Models\Setting;
 use MailPoet\Models\Subscriber;
+use MailPoet\WP\Functions as WPFunctions;
 
 if(!defined('ABSPATH')) exit;
 
@@ -55,8 +56,8 @@ class Bridge {
       'blocking' => true,
       'timeout' => 10
     );
-    $result = wp_remote_get(self::BRIDGE_URL, $params);
+    $result = WPFunctions::wpRemoteGet(self::BRIDGE_URL, $params);
-    return wp_remote_retrieve_response_code($result) === 200;
+    return WPFunctions::wpRemoteRetrieveResponseCode($result) === 200;
   }
 
   function initApi($api_key) {

lib/Services/Bridge/API.php

@@ -3,6 +3,7 @@
 namespace MailPoet\Services\Bridge;
 
 use MailPoet\WP\Hooks as WPHooks;
+use MailPoet\WP\Functions as WPFunctions;
 
 if(!defined('ABSPATH')) exit;
 
@@ -34,10 +35,10 @@ class API {
       array('site' => home_url())
     );
 
-    $code = wp_remote_retrieve_response_code($result);
+    $code = WPFunctions::wpRemoteRetrieveResponseCode($result);
     switch($code) {
       case 200:
-        $body = json_decode(wp_remote_retrieve_body($result), true);
+        $body = json_decode(WPFunctions::wpRemoteRetrieveBody($result), true);
         break;
       default:
         $body = null;
@@ -53,10 +54,10 @@ class API {
       array('site' => home_url())
     );
 
-    $code = wp_remote_retrieve_response_code($result);
+    $code = WPFunctions::wpRemoteRetrieveResponseCode($result);
     switch($code) {
       case 200:
-        if($body = wp_remote_retrieve_body($result)) {
+        if($body = WPFunctions::wpRemoteRetrieveBody($result)) {
           $body = json_decode($body, true);
         }
         break;
@@ -80,11 +81,11 @@ class API {
         'message' => $result->get_error_message()
       );
     }
-    $response_code = wp_remote_retrieve_response_code($result);
+    $response_code = WPFunctions::wpRemoteRetrieveResponseCode($result);
     if($response_code !== 201) {
-      $response = (wp_remote_retrieve_body($result)) ?
+      $response = (WPFunctions::wpRemoteRetrieveBody($result)) ?
-        wp_remote_retrieve_body($result) :
+        WPFunctions::wpRemoteRetrieveBody($result) :
-        wp_remote_retrieve_response_message($result);
+        WPFunctions::wpRemoteRetrieveResponseMessage($result);
       return array(
         'status' => self::SENDING_STATUS_SEND_ERROR,
         'message' => $response,
@@ -99,8 +100,8 @@ class API {
       $this->url_bounces,
       $emails
     );
-    if(wp_remote_retrieve_response_code($result) === 200) {
+    if(WPFunctions::wpRemoteRetrieveResponseCode($result) === 200) {
-      return json_decode(wp_remote_retrieve_body($result), true);
+      return json_decode(WPFunctions::wpRemoteRetrieveBody($result), true);
     }
     return false;
   }
@@ -111,7 +112,7 @@ class API {
       array('subscriber_count' => (int)$count),
       'PUT'
     );
-    return wp_remote_retrieve_response_code($result) === self::RESPONSE_CODE_STATS_SAVED;
+    return WPFunctions::wpRemoteRetrieveResponseCode($result) === self::RESPONSE_CODE_STATS_SAVED;
   }
 
   function setKey($api_key) {
@@ -137,6 +138,6 @@ class API {
       ),
       'body' => json_encode($body)
     );
-    return wp_remote_post($url, $params);
+    return WPFunctions::wpRemotePost($url, $params);
   }
 }

lib/Services/Release/API.php

@@ -1,6 +1,9 @@
 <?php
+
 namespace MailPoet\Services\Release;
 
+use MailPoet\WP\Functions as WPFunctions;
+
 if(!defined('ABSPATH')) exit;
 
 class API {
@@ -17,10 +20,10 @@ class API {
       $this->url_products . $plugin_name
     );
 
-    $code = wp_remote_retrieve_response_code($result);
+    $code = WPFunctions::wpRemoteRetrieveResponseCode($result);
     switch($code) {
       case 200:
-        if($body = wp_remote_retrieve_body($result)) {
+        if($body = WPFunctions::wpRemoteRetrieveBody($result)) {
           $body = json_decode($body);
         }
         break;
@@ -47,6 +50,6 @@ class API {
       'timeout' => 10,
       'httpversion' => '1.0'
     );
-    return wp_remote_get($url, $args);
+    return WPFunctions::wpRemoteGet($url, $args);
   }
 }

lib/WP/Functions.php

@@ -0,0 +1,32 @@
+<?php
+namespace MailPoet\WP;
+
+class Functions {
+  static function wpRemotePost() {
+    return self::callWithFallback('wp_remote_post', func_get_args());
+  }
+
+  static function wpRemoteGet() {
+    return self::callWithFallback('wp_remote_get', func_get_args());
+  }
+
+  static function wpRemoteRetrieveBody() {
+    return self::callWithFallback('wp_remote_retrieve_body', func_get_args());
+  }
+
+  static function wpRemoteRetrieveResponseCode() {
+    return self::callWithFallback('wp_remote_retrieve_response_code', func_get_args());
+  }
+
+  static function wpRemoteRetrieveResponseMessage() {
+    return self::callWithFallback('wp_remote_retrieve_response_message', func_get_args());
+  }
+
+  private static function callWithFallback($func, $args) {
+    $local_func = __NAMESPACE__ . '\\' . $func;
+    if(function_exists($local_func)) {
+      return call_user_func_array($local_func, $args);
+    }
+    return call_user_func_array($func, $args);
+  }
+}

tests/unit/Cron/CronHelperTest.php

@@ -147,7 +147,7 @@ class CronHelperTest extends \MailPoetTest {
       return $request_args;
     };
     add_filter('mailpoet_cron_request_args', $filter);
-    Mock::func('MailPoet\Cron', 'wp_remote_get', function($url, $args) {
+    Mock::func('MailPoet\WP', 'wp_remote_get', function($url, $args) {
       return $args;
     });
     expect(CronHelper::queryCronUrl('test'))->equals($request_args);

tests/unit/Services/BridgeTest.php

@@ -1,16 +1,17 @@
 <?php
+
 namespace MailPoet\Test\Services;
 
 use AspectMock\Test as Mock;
 use Codeception\Util\Stub;
-use MailPoet\Services\Bridge;
-use MailPoet\Services\Bridge\API;
 use MailPoet\Mailer\Mailer;
 use MailPoet\Models\Setting;
+use MailPoet\Services\Bridge;
+use MailPoet\Services\Bridge\API;
+use MailPoet\Services\Bridge\BridgeTestMockAPI as MockAPI;
+use MailPoet\WP\Hooks as WPHooks;
 
 require_once('BridgeTestMockAPI.php');
-use MailPoet\Services\Bridge\BridgeTestMockAPI as MockAPI;
-use MailPoet\WP\Hooks;
 
 class BridgeTest extends \MailPoetTest {
   function _before() {
@@ -255,7 +256,7 @@ class BridgeTest extends \MailPoetTest {
   }
 
   function testItAllowChangingRequestTimeout() {
-    $mock = Mock::func('MailPoet\Services\Bridge', 'wp_remote_post', true);
+    $mock = Mock::func('MailPoet\WP', 'wp_remote_post', true);
     $api = new API('test_key');
 
     // test default request value
@@ -267,10 +268,10 @@ class BridgeTest extends \MailPoetTest {
     $filter = function() use ($custom_request_value) {
       return $custom_request_value;
     };
-    Hooks::addFilter('mailpoet_bridge_api_request_timeout', $filter);
+    WPHooks::addFilter('mailpoet_bridge_api_request_timeout', $filter);
     $api->sendMessages('test');
     expect($mock->getCallsForMethod('wp_remote_post')[1][1]['timeout'])->equals($custom_request_value);
-    Hooks::removeFilter('mailpoet_bridge_api_request_timeout', $filter);
+    WPHooks::removeFilter('mailpoet_bridge_api_request_timeout', $filter);
   }
 
   private function setMailPoetSendingMethod() {