Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19300 from woocommerce/fix/phpcs-includes-payment-tokens 

PHPCS fixes for includes/payment-tokens directory
This commit is contained in:
Mike Jolley 2018-03-08 15:03:39 +00:00 committed by GitHub
parent 8a11a13b70 a8e03a1c4a
commit e4afb25931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
includes/payment-tokens/class-wc-payment-token-cc.php
View File

@ -1,6 +1,12 @@
<?php
/**
* Class WC_Payment_Token_CC file.
*
* @package WooCommerce\PaymentTokens
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
exit; // Exit if accessed directly.
}
/**
@ -8,16 +14,18 @@ if ( ! defined( 'ABSPATH' ) ) {
*
* Representation of a payment token for credit cards.
*
* @class WC_Payment_Token_CC
* @class WC_Payment_Token_CC
* @version 3.0.0
* @since 2.6.0
* @category PaymentTokens
* @package WooCommerce/PaymentTokens
* @author WooThemes
* @since 2.6.0
* @package WooCommerce/PaymentTokens
*/
class WC_Payment_Token_CC extends WC_Payment_Token {
/** @protected string Token Type String. */
/**
* Token Type String.
*
* @var string
*/
protected $type = 'CC';
/**
@ -36,12 +44,12 @@ class WC_Payment_Token_CC extends WC_Payment_Token {
* Get type to display to user.
*
* @since 2.6.0
* @param string $deprecated Deprecated since WooCommerce 3.0
* @param string $deprecated Deprecated since WooCommerce 3.0.
* @return string
*/
public function get_display_name( $deprecated = '' ) {
/* translators: 1: credit card type 2: last 4 digits 3: expiry month 4: expiry year */
$display = sprintf(
/* translators: 1: credit card type 2: last 4 digits 3: expiry month 4: expiry year */
__( '%1$s ending in %2$s (expires %3$s/%4$s)', 'woocommerce' ),
wc_get_credit_card_type_label( $this->get_card_type() ),
$this->get_last4(),
@ -108,7 +116,7 @@ class WC_Payment_Token_CC extends WC_Payment_Token {
* Returns the card type (mastercard, visa, ...).
*
* @since 2.6.0
* @param string $context
* @param string $context What the value is for. Valid values are view and edit.
* @return string Card type
*/
public function get_card_type( $context = 'view' ) {
@ -117,8 +125,9 @@ class WC_Payment_Token_CC extends WC_Payment_Token {
/**
* Set the card type (mastercard, visa, ...).
*
* @since 2.6.0
* @param string $type
* @param string $type Credit card type (mastercard, visa, ...).
*/
public function set_card_type( $type ) {
$this->set_prop( 'card_type', $type );
@ -128,7 +137,7 @@ class WC_Payment_Token_CC extends WC_Payment_Token {
* Returns the card expiration year (YYYY).
*
* @since 2.6.0
* @param string $context
* @param string $context What the value is for. Valid values are view and edit.
* @return string Expiration year
*/
public function get_expiry_year( $context = 'view' ) {
@ -137,8 +146,9 @@ class WC_Payment_Token_CC extends WC_Payment_Token {
/**
* Set the expiration year for the card (YYYY format).
*
* @since 2.6.0
* @param string $year
* @param string $year Credit card expiration year.
*/
public function set_expiry_year( $year ) {
$this->set_prop( 'expiry_year', $year );
@ -148,7 +158,7 @@ class WC_Payment_Token_CC extends WC_Payment_Token {
* Returns the card expiration month (MM).
*
* @since 2.6.0
* @param string $context
* @param string $context What the value is for. Valid values are view and edit.
* @return string Expiration month
*/
public function get_expiry_month( $context = 'view' ) {
@ -157,8 +167,9 @@ class WC_Payment_Token_CC extends WC_Payment_Token {
/**
* Set the expiration month for the card (formats into MM format).
*
* @since 2.6.0
* @param string $month
* @param string $month Credit card expiration month.
*/
public function set_expiry_month( $month ) {
$this->set_prop( 'expiry_month', str_pad( $month, 2, '0', STR_PAD_LEFT ) );
@ -168,7 +179,7 @@ class WC_Payment_Token_CC extends WC_Payment_Token {
* Returns the last four digits.
*
* @since 2.6.0
* @param string $context
* @param string $context What the value is for. Valid values are view and edit.
* @return string Last 4 digits
*/
public function get_last4( $context = 'view' ) {
@ -177,8 +188,9 @@ class WC_Payment_Token_CC extends WC_Payment_Token {
/**
* Set the last four digits.
*
* @since 2.6.0
* @param string $last4
* @param string $last4 Credit card last four digits.
*/
public function set_last4( $last4 ) {
$this->set_prop( 'last4', $last4 );

30
includes/payment-tokens/class-wc-payment-token-echeck.php
View File

@ -1,7 +1,12 @@
<?php
/**
* Class WC_Payment_Token_eCheck file.
*
* @package WooCommerce\PaymentTokens
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
exit; // Exit if accessed directly.
}
/**
@ -9,16 +14,18 @@ if ( ! defined( 'ABSPATH' ) ) {
*
* Representation of a payment token for eChecks.
*
* @class WC_Payment_Token_eCheck
* @class WC_Payment_Token_ECheck
* @version 3.0.0
* @since 2.6.0
* @category PaymentTokens
* @package WooCommerce/PaymentTokens
* @author WooThemes
* @since 2.6.0
* @package WooCommerce/PaymentTokens
*/
class WC_Payment_Token_eCheck extends WC_Payment_Token {
class WC_Payment_Token_ECheck extends WC_Payment_Token {
/** @protected string Token Type String. */
/**
* Token Type String.
*
* @var string
*/
protected $type = 'eCheck';
/**
@ -34,7 +41,7 @@ class WC_Payment_Token_eCheck extends WC_Payment_Token {
* Get type to display to user.
*
* @since 2.6.0
* @param string $deprecated Deprecated since WooCommerce 3.0
* @param string $deprecated Deprecated since WooCommerce 3.0.
* @return string
*/
public function get_display_name( $deprecated = '' ) {
@ -74,7 +81,7 @@ class WC_Payment_Token_eCheck extends WC_Payment_Token {
* Returns the last four digits.
*
* @since 2.6.0
* @param string $context
* @param string $context What the value is for. Valid values are view and edit.
* @return string Last 4 digits
*/
public function get_last4( $context = 'view' ) {
@ -83,8 +90,9 @@ class WC_Payment_Token_eCheck extends WC_Payment_Token {
/**
* Set the last four digits.
*
* @since 2.6.0
* @param string $last4
* @param string $last4 eCheck last four digits.
*/
public function set_last4( $last4 ) {
$this->set_prop( 'last4', $last4 );

4
tests/framework/helpers/class-wc-helper-payment-token.php
View File

@ -30,10 +30,10 @@ class WC_Helper_Payment_Token {
* Create a new eCheck payment token
*
* @since 2.6
* @return WC_Payment_Token_eCheck object
* @return WC_Payment_Token_ECheck object
*/
public static function create_eCheck_token() {
$token = new WC_Payment_Token_eCheck();
$token = new WC_Payment_Token_ECheck();
$token->set_last4( 1234 );
$token->set_token( time() );
$token->save();

2
tests/unit-tests/account/functions.php
View File

@ -243,7 +243,7 @@ class WC_Tests_Account_Functions extends WC_Unit_Test_Case {
* @since 3.3.0
*/
public function test_wc_get_account_saved_payment_methods_list_item_echeck() {
$token = new WC_Payment_Token_eCheck();
$token = new WC_Payment_Token_ECheck();
$token->set_token( '1234' );
$token->set_gateway_id( 'bacs' );
$token->set_last4( '1234' );

6
tests/unit-tests/payment-tokens/echeck.php
View File

@ -11,7 +11,7 @@ class WC_Tests_Payment_Token_eCheck extends WC_Unit_Test_Case {
* @since 2.6.0
*/
function test_wc_payment_token_echeck_validate_empty() {
$token = new WC_Payment_Token_eCheck();
$token = new WC_Payment_Token_ECheck();
$token->set_token( time() . ' ' . __FUNCTION__ );
$this->assertFalse( $token->validate() );
$token->set_last4( '1111' );
@ -23,7 +23,7 @@ class WC_Tests_Payment_Token_eCheck extends WC_Unit_Test_Case {
* @since 2.6.0
*/
public function test_wc_payment_token_echeck_last4() {
$token = new WC_Payment_Token_eCheck();
$token = new WC_Payment_Token_ECheck();
$token->set_last4( '1111' );
$this->assertEquals( '1111', $token->get_last4() );
}
@ -36,7 +36,7 @@ class WC_Tests_Payment_Token_eCheck extends WC_Unit_Test_Case {
$token = WC_Helper_Payment_Token::create_eCheck_token();
$token_id = $token->get_id();
$token_read = new WC_Payment_Token_eCheck( $token_id );
$token_read = new WC_Payment_Token_ECheck( $token_id );
$this->assertEquals( '1234', $token_read->get_last4() );
}
}