Remove unused localized variable and class property

Because we're not checking whether vaulting is in the account's scope in the client side, we don't need to localize this variable and the class SettingsPageAssets doesn't need the  property anymore, thus removing these.
This commit is contained in:
Danae Millan 2021-11-20 13:10:37 -03:00
parent 1d089cbfa5
commit e4c39fc2e3
3 changed files with 6 additions and 34 deletions

View file

@ -9,7 +9,6 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\WcGateway\Assets;
use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer;
use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
/**
@ -31,34 +30,24 @@ class SettingsPageAssets {
*/
private $module_path;
/**
* The bearer.
*
* @var Bearer
*/
private $bearer;
/**
* Assets constructor.
*
* @param string $module_url The url of this module.
* @param string $module_path The filesystem path to this module.
* @param Bearer $bearer The bearer.
*/
public function __construct( string $module_url, string $module_path, Bearer $bearer ) {
public function __construct( string $module_url, string $module_path ) {
$this->module_url = $module_url;
$this->module_path = $module_path;
$this->bearer = $bearer;
}
/**
* Register assets provided by this module.
*/
public function register_assets() {
$bearer = $this->bearer;
add_action(
'admin_enqueue_scripts',
function() use ( $bearer ) {
function() {
if ( ! is_admin() || is_ajax() ) {
return;
}
@ -67,7 +56,7 @@ class SettingsPageAssets {
return;
}
$this->register_admin_assets( $bearer );
$this->register_admin_assets();
}
);
@ -98,10 +87,8 @@ class SettingsPageAssets {
/**
* Register assets for admin pages.
*
* @param Bearer $bearer The bearer.
*/
private function register_admin_assets( Bearer $bearer ) {
private function register_admin_assets() {
$gateway_settings_script_path = trailingslashit( $this->module_path ) . 'assets/js/gateway-settings.js';
wp_enqueue_script(
@ -111,18 +98,5 @@ class SettingsPageAssets {
file_exists( $gateway_settings_script_path ) ? (string) filemtime( $gateway_settings_script_path ) : null,
true
);
try {
$token = $bearer->bearer();
wp_localize_script(
'ppcp-gateway-settings',
'PayPalCommerceGatewaySettings',
array(
'vaulting_features_available' => $token->vaulting_available(),
)
);
} catch ( RuntimeException $exception ) {
return;
}
}
}

View file

@ -73,8 +73,7 @@ class WCGatewayModule implements ModuleInterface {
if ( $c->has( 'wcgateway.url' ) ) {
$assets = new SettingsPageAssets(
$c->get( 'wcgateway.url' ),
$c->get( 'wcgateway.absolute-path' ),
$c->get( 'api.bearer' )
$c->get( 'wcgateway.absolute-path' )
);
$assets->register_assets();
}

View file

@ -13,9 +13,8 @@ class SettingsPagesAssetsTest extends TestCase
{
$moduleUrl = 'http://example.com/wp-content/plugins/woocommerce-paypal-payments/modules/ppcp-wc-gateway';
$modulePath = '/var/www/html/wp-content/plugins/woocommerce-paypal-payments/modules/ppcp-wc-gateway';
$bearer = Mockery::mock(Bearer::class);
$testee = new SettingsPageAssets($moduleUrl, $modulePath, $bearer);
$testee = new SettingsPageAssets($moduleUrl, $modulePath);
when('is_admin')
->justReturn(true);