Merge pull request #146 from skyverge/4.4

Nau mai 4.4.0 ✌️

Author: ChaseWiseman

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wc-plugin-framework",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "title": "WooCommerce Plugin Framework",
   "author": "SkyVerge Team",
   "homepage": "https://github.com/skyverge/wc-plugin-framework#readme",

tests/unit/helper.php

@@ -532,8 +532,6 @@ public function test_get_order_line_items() {
 		$expected_item->product = $this->get_wc_product_mock();
 		$expected_item->item = $this->get_wc_item_data();
 
-		p\redefine( 'SV_WC_Plugin_Compatibility::is_wc_version_gte_2_4', function() { return true; } );
-
 		$this->getMockBuilder( 'WC_Order_Item_Meta_Mock' )
 			->setMethods( [ 'get_formatted'] )
 			->setMockClassName( 'WC_Order_Item_Meta' )

woocommerce/api/class-sv-wc-api-base.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+defined( 'ABSPATH' ) or exit;
 
 if ( ! class_exists( 'SV_WC_API_Base' ) ) :
 
@@ -96,6 +96,11 @@ protected function perform_request( $request ) {
 
 		$start_time = microtime( true );
 
+		// If this API requires TLS v1.2, force it
+		if ( $this->require_tls_1_2() ) {
+			add_action( 'http_api_curl', array( $this, 'set_tls_1_2_request' ), 10, 3 );
+		}
+
 		// perform the request
 		$response = $this->do_remote_request( $this->get_request_uri(), $this->get_request_args() );
 
@@ -664,6 +669,47 @@ protected function set_response_handler( $handler ) {
 	}
 
 
+	/**
+	 * Maybe force TLS v1.2 requests.
+	 *
+	 * @since 4.4.0
+	 */
+	public function set_tls_1_2_request( $handle, $r, $url ) {
+
+		if ( ! SV_WC_Helper::str_starts_with( $url, 'https://' ) ) {
+			return;
+		}
+
+		$versions     = curl_version();
+		$curl_version = $versions['version'];
+
+		// Get the SSL details
+		list( $ssl_type, $ssl_version ) = explode( '/', $versions['ssl_version'] );
+
+		$ssl_version = substr( $ssl_version, 0, -1 );
+
+		// If cURL and/or OpenSSL aren't up to the challenge, bail
+		if ( ! version_compare( $curl_version, '7.34.0', '>=' ) || ( 'OpenSSL' === $ssl_type && ! version_compare( $ssl_version, '1.0.1', '>=' ) ) ) {
+			return;
+		}
+
+		curl_setopt( $handle, CURLOPT_SSLVERSION, 6 );
+	}
+
+
+	/**
+	 * Determine if TLS v1.2 is required for API requests.
+	 *
+	 * Subclasses should override this to return true if TLS v1.2 is required.
+	 *
+	 * @since 4.4.0
+	 * @return bool
+	 */
+	protected function require_tls_1_2() {
+		return false;
+	}
+
+
 }
 
 endif;

woocommerce/api/class-sv-wc-api-exception.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+defined( 'ABSPATH' ) or exit;
 
 if ( ! class_exists( 'SV_WC_API_Exception' ) ) :
 

woocommerce/api/class-sv-wc-api-json-response.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+defined( 'ABSPATH' ) or exit;
 
 if ( ! interface_exists( 'SV_WC_API_Request' ) ) :
 

woocommerce/api/class-sv-wc-api-rest-request.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+defined( 'ABSPATH' ) or exit;
 
 if ( ! interface_exists( 'SV_WC_API_Response' ) ) :
 

woocommerce/api/interface-sv-wc-api-request.php

@@ -1,5 +1,11 @@
 *** SkyVerge WooCommerce Plugin Framework Changelog ***
 
+2016.06.01 - version 4.4.0
+ * Feature - Allow bundled framework and plugin translations to be easily overridden
+ * Tweak - Allow plugins extending SV_WC_API_Base to declare TLS v1.2 as a requirement for requests
+ * Misc - Added support for WooCommerce 2.6
+ * Misc - Removed support for WooCommerce 2.3
+
 2016.04.18 - version 4.3.0
  * Feature - Revamped admin payment token editor
  * Feature - Prevent deleting subscription payment methods

woocommerce/api/interface-sv-wc-api-response.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+defined( 'ABSPATH' ) or exit;
 
 if ( ! class_exists( 'SV_WC_Admin_Notice_Handler' ) ) :
 
@@ -125,7 +125,7 @@ public function should_display_notice( $message_id, $params = array() ) {
 		if ( ! current_user_can( 'manage_woocommerce' ) ) {
 			return false;
 		}
-		
+
 		$params = wp_parse_args( $params, array(
 			'dismissible'             => true,
 			'always_show_on_settings' => true,