Skip to content

Commit

Permalink
Merge pull request #611 from godaddy-wordpress/release/5.11.8
Browse files Browse the repository at this point in the history
Release: v5.11.8
  • Loading branch information
itambek-godaddy committed Aug 23, 2023
2 parents 0e17743 + 9b9fb18 commit 31b23e2
Show file tree
Hide file tree
Showing 130 changed files with 432 additions and 332 deletions.
2 changes: 1 addition & 1 deletion composer.json
@@ -1,7 +1,7 @@
{
"name": "skyverge/wc-plugin-framework",
"description": "The official SkyVerge WooCommerce plugin framework",
"version": "5.11.7",
"version": "5.11.8",
"license": "GPL-3.0",
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "wc-plugin-framework",
"version": "5.11.7",
"version": "5.11.8",
"title": "WooCommerce Plugin Framework",
"author": "SkyVerge Team",
"homepage": "https://github.com/skyverge/wc-plugin-framework#readme",
Expand Down
Expand Up @@ -2,7 +2,7 @@

namespace SkyVerge\WooCommerce\GatewayTestPlugin;

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;

defined( 'ABSPATH' ) or exit;

Expand Down
Expand Up @@ -2,7 +2,7 @@

namespace SkyVerge\WooCommerce\GatewayTestPlugin;

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;

defined( 'ABSPATH' ) or exit;

Expand Down
@@ -1,7 +1,7 @@
<?php
namespace SkyVerge\WooCommerce\GatewayTestPlugin;

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;

defined( 'ABSPATH' ) or exit;

Expand Down
2 changes: 1 addition & 1 deletion tests/_support/plugins/test-plugin/includes/API.php
@@ -1,7 +1,7 @@
<?php
namespace SkyVerge\WooCommerce\TestPlugin;

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;

defined( 'ABSPATH' ) or exit;

Expand Down
2 changes: 1 addition & 1 deletion tests/_support/plugins/test-plugin/includes/Gateway.php
@@ -1,7 +1,7 @@
<?php
namespace SkyVerge\WooCommerce\TestPlugin;

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;

defined( 'ABSPATH' ) or exit;

Expand Down
2 changes: 1 addition & 1 deletion tests/_support/plugins/test-plugin/includes/Plugin.php
@@ -1,7 +1,7 @@
<?php
namespace SkyVerge\WooCommerce\TestPlugin;

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;

defined( 'ABSPATH' ) or exit;

Expand Down
10 changes: 5 additions & 5 deletions tests/integration/API/CacheableAPIBaseTest.php
@@ -1,10 +1,10 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\API\Abstract_Cacheable_API_Base;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\API\Traits\Cacheable_Request_Trait;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_API_JSON_Request;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_API_Request;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\API\Abstract_Cacheable_API_Base;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\API\Traits\Cacheable_Request_Trait;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_API_JSON_Request;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_API_Request;

if ( ! defined( 'ABSPATH' ) ) {
define( 'ABSPATH', true );
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/DependenciesTest.php
Expand Up @@ -3,7 +3,7 @@
/**
* Tests for the SV_WC_Plugin_Dependencies class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Plugin_Dependencies
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Plugin_Dependencies
*/
class DependenciesTest extends \Codeception\TestCase\WPTestCase {

Expand Down Expand Up @@ -31,7 +31,7 @@ protected function _after() {


/**
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Plugin_Dependencies::get_active_scripts_optimization_plugins()
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Plugin_Dependencies::get_active_scripts_optimization_plugins()
*/
public function test_get_active_scripts_optimization_plugins() {

Expand All @@ -40,7 +40,7 @@ public function test_get_active_scripts_optimization_plugins() {


/**
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Plugin_Dependencies::is_scripts_optimization_plugin_active()
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Plugin_Dependencies::is_scripts_optimization_plugin_active()
*/
public function test_is_scripts_optimization_plugin_active() {

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/HelperTest.php
@@ -1,11 +1,11 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;

/**
* Tests for the helper class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Plugin_Compatibility
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Plugin_Compatibility
*/
class HelperTest extends \Codeception\TestCase\WPTestCase {

Expand Down
6 changes: 3 additions & 3 deletions tests/integration/PluginTest.php
Expand Up @@ -3,7 +3,7 @@
/**
* Tests for the base plugin class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Plugin
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Plugin
*/
class PluginTest extends \Codeception\TestCase\WPTestCase {

Expand Down Expand Up @@ -152,7 +152,7 @@ public function test_get_framework_assets_path() {
*/
public function test_get_dependency_handler() {

$this->assertInstanceOf( '\SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Plugin_Dependencies', $this->get_plugin()->get_dependency_handler() );
$this->assertInstanceOf( '\SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Plugin_Dependencies', $this->get_plugin()->get_dependency_handler() );
}


Expand All @@ -161,7 +161,7 @@ public function test_get_dependency_handler() {
*/
public function test_get_lifecycle_handler() {

$this->assertInstanceOf( '\SkyVerge\WooCommerce\PluginFramework\v5_11_7\Plugin\Lifecycle', $this->get_plugin()->get_lifecycle_handler() );
$this->assertInstanceOf( '\SkyVerge\WooCommerce\PluginFramework\v5_11_8\Plugin\Lifecycle', $this->get_plugin()->get_lifecycle_handler() );
}


Expand Down
10 changes: 5 additions & 5 deletions tests/integration/REST_API/Controllers/SettingsTest.php
@@ -1,14 +1,14 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7\REST_API\Controllers\Settings;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\Settings_API\Abstract_Settings;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\Settings_API\Setting;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\Settings_API\Control;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\REST_API\Controllers\Settings;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\Settings_API\Abstract_Settings;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\Settings_API\Setting;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\Settings_API\Control;

/**
* Tests for the Settings class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\REST_API\Controllers\Settings
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\REST_API\Controllers\Settings
*/
class SettingsTest extends \Codeception\TestCase\WPTestCase {

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/REST_API/RESTAPITest.php
@@ -1,13 +1,13 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\Settings_API\Abstract_Settings;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Helper;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\Settings_API\Abstract_Settings;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Helper;

/**
* Tests for the REST_API class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\REST_API
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\REST_API
*/
class RESTAPITest extends \Codeception\TestCase\WPTestCase {

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/SV_WC_Payment_Gateway_Helper_Test.php
@@ -1,11 +1,11 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Helper;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Helper;

/**
* Tests for the Payment Gateway Helper class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Helper
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Helper
*/
class SV_WC_Payment_Gateway_Helper_Test extends \Codeception\TestCase\WPTestCase {

Expand Down
12 changes: 6 additions & 6 deletions tests/integration/Settings_API/AbstractSettingsTest.php
@@ -1,15 +1,15 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\Settings_API\Abstract_Settings;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\Settings_API\Setting;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\Settings_API\Control;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Plugin_Exception;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\Settings_API\Abstract_Settings;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\Settings_API\Setting;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\Settings_API\Control;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Plugin_Exception;

/**
* Tests for the Abstract_Settings class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\Settings_API\Abstract_Settings
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\Settings_API\Abstract_Settings
*/
class AbstractSettingsTest extends \Codeception\TestCase\WPTestCase {

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/Settings_API/SettingTest.php
@@ -1,7 +1,7 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7\Settings_API\Setting;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Plugin_Exception;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\Settings_API\Setting;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Plugin_Exception;

class SettingTest extends \Codeception\TestCase\WPTestCase {

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/payment-gateway/GatewayPluginTest.php
Expand Up @@ -3,7 +3,7 @@
/**
* Tests for the gateway plugin class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Plugin
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Plugin
*/
class GatewayPluginTest extends \Codeception\TestCase\WPTestCase {

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/payment-gateway/MyPaymentMethodsTest.php
@@ -1,12 +1,12 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_My_Payment_Methods;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Plugin;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_My_Payment_Methods;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Plugin;

/**
* Tests for the SV_WC_Payment_Gateway_My_Payment_Methods class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_My_Payment_Methods
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_My_Payment_Methods
*/
class MyPaymentMethodsTest extends \Codeception\TestCase\WPTestCase {

Expand Down Expand Up @@ -116,7 +116,7 @@ public function test_render_js() {
$payment_methods->render_js();

$this->assertStringContainsString( 'function load_gateway_test_plugin_payment_methods_handler', $wc_queued_js );
$this->assertStringContainsString( 'window.jQuery( document.body ).on( \'sv_wc_payment_methods_handler_v5_11_7_loaded\', load_gateway_test_plugin_payment_methods_handler );', $wc_queued_js );
$this->assertStringContainsString( 'window.jQuery( document.body ).on( \'sv_wc_payment_methods_handler_v5_11_8_loaded\', load_gateway_test_plugin_payment_methods_handler );', $wc_queued_js );
}


Expand Down
6 changes: 3 additions & 3 deletions tests/integration/payment-gateway/PaymentFormTest.php
@@ -1,11 +1,11 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Payment_Form;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Payment_Form;

/**
* Tests for the SV_WC_Payment_Gateway_Payment_Form class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Payment_Form
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Payment_Form
*/
class PaymentFormTest extends \Codeception\TestCase\WPTestCase {

Expand Down Expand Up @@ -90,7 +90,7 @@ public function test_render_js() {
$this->get_plugin()->get_gateway()->get_payment_form_instance()->render_js();

$this->assertStringContainsString( 'function load_test_gateway_payment_form_handler', $wc_queued_js );
$this->assertStringContainsString( 'window.jQuery( document.body ).on( \'sv_wc_payment_form_handler_v5_11_7_loaded\', load_test_gateway_payment_form_handler );', $wc_queued_js );
$this->assertStringContainsString( 'window.jQuery( document.body ).on( \'sv_wc_payment_form_handler_v5_11_8_loaded\', load_test_gateway_payment_form_handler );', $wc_queued_js );
}


Expand Down
@@ -1,11 +1,11 @@
<?php

use \SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use \SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;

/**
* Tests for the payment token object
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Payment_Token
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Payment_Token
*/
class SV_WC_Payment_Gateway_Payment_Token_Test extends \Codeception\TestCase\WPTestCase {

Expand Down
@@ -1,11 +1,11 @@
<?php

use \SkyVerge\WooCommerce\PluginFramework\v5_11_7 as Framework;
use \SkyVerge\WooCommerce\PluginFramework\v5_11_8 as Framework;

/**
* Tests for the payment tokens handler object
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Payment_Tokens_Handler
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Payment_Tokens_Handler
*/
class SV_WC_Payment_Gateway_Payment_Tokens_Handler_Test extends \Codeception\TestCase\WPTestCase {

Expand Down
@@ -1,13 +1,13 @@
<?php

use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Plugin;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Apple_Pay;
use SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Apple_Pay_Frontend;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Plugin;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Apple_Pay;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Apple_Pay_Frontend;

/**
* Tests for the SV_WC_Payment_Gateway_Apple_Pay_Frontend class.
*
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_7\SV_WC_Payment_Gateway_Apple_Pay_Frontend
* @see \SkyVerge\WooCommerce\PluginFramework\v5_11_8\SV_WC_Payment_Gateway_Apple_Pay_Frontend
*/
class ApplePayFrontendTest extends \Codeception\TestCase\WPTestCase {

Expand Down Expand Up @@ -106,7 +106,7 @@ public function test_enqueue_js_handler() {
$method->invokeArgs( $frontend_instance, [[]] );

$this->assertStringContainsString( 'function load_test_gateway_apple_pay_handler', $wc_queued_js );
$this->assertStringContainsString( 'window.jQuery( document.body ).on( \'sv_wc_apple_pay_handler_v5_11_7_loaded\', load_test_gateway_apple_pay_handler );', $wc_queued_js );
$this->assertStringContainsString( 'window.jQuery( document.body ).on( \'sv_wc_apple_pay_handler_v5_11_8_loaded\', load_test_gateway_apple_pay_handler );', $wc_queued_js );
}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/API/CacheableRequestTraitTest.php
Expand Up @@ -2,7 +2,7 @@

namespace API;

use SkyVerge\WooCommerce\PluginFramework\v5_11_7\API\Traits\Cacheable_Request_Trait;
use SkyVerge\WooCommerce\PluginFramework\v5_11_8\API\Traits\Cacheable_Request_Trait;

if ( ! defined( 'ABSPATH' ) ) {
define( 'ABSPATH', true );
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/CountryHelperTest.php
Expand Up @@ -19,7 +19,7 @@ protected function _after() {
}

/**
* Tests \SkyVerge\WooCommerce\PluginFramework\v5_11_7\Country_Helper::convert_alpha_country_code()
* Tests \SkyVerge\WooCommerce\PluginFramework\v5_11_8\Country_Helper::convert_alpha_country_code()
*
* @param string $code input country code
* @param string $expected expected return value
Expand All @@ -28,7 +28,7 @@ protected function _after() {
*/
public function test_convert_alpha_country_code( $code, $expected ) {

$result = \SkyVerge\WooCommerce\PluginFramework\v5_11_7\Country_Helper::convert_alpha_country_code( $code );
$result = \SkyVerge\WooCommerce\PluginFramework\v5_11_8\Country_Helper::convert_alpha_country_code( $code );

$this->assertEquals( $expected, $result );
}
Expand Down

0 comments on commit 31b23e2

Please sign in to comment.