Skip to content

Autoloader: Renaming the main extension files #4373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from 22 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*** Changelog ***

= 9.6.0 - xxxx-xx-xx =
* Dev - Renames all the main extension files to follow the PSR-4 autoloading standard.
* Dev - Implements the PSR-4 autoloading standard for the plugin unit tests (PHP).
* Fix - Sends missing information to Stripe when completing transactions with WeChat Pay, Blik and Klarna, using the Optimized Checkout.
* Dev - Moves the main Stripe class to a new file.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public function javascript_params() {
* @since 5.8.0
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-' . $this->stripe_id . '-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-' . $this->stripe_id . '-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -549,10 +549,10 @@ private function update_is_upe_enabled( WP_REST_Request $request ) {

// including the class again because otherwise it's not present.
if ( WC_Stripe_Inbox_Notes::are_inbox_notes_supported() ) {
require_once WC_STRIPE_PLUGIN_PATH . '/includes/notes/class-wc-stripe-upe-availability-note.php';
require_once WC_STRIPE_PLUGIN_PATH . '/includes/Notes/WC_Stripe_UPE_Availability_Note.php';
WC_Stripe_UPE_Availability_Note::possibly_delete_note();

require_once WC_STRIPE_PLUGIN_PATH . '/includes/notes/class-wc-stripe-upe-stripelink-note.php';
require_once WC_STRIPE_PLUGIN_PATH . '/includes/Notes/WC_Stripe_UPE_StripeLink_Note.php';
WC_Stripe_UPE_StripeLink_Note::possibly_delete_note();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ public static function create_upe_notes() {
return;
}

require_once WC_STRIPE_PLUGIN_PATH . '/includes/notes/class-wc-stripe-upe-availability-note.php';
require_once WC_STRIPE_PLUGIN_PATH . '/includes/Notes/WC_Stripe_UPE_Availability_Note.php';
WC_Stripe_UPE_Availability_Note::init();

require_once WC_STRIPE_PLUGIN_PATH . '/includes/notes/class-wc-stripe-upe-stripelink-note.php';
require_once WC_STRIPE_PLUGIN_PATH . '/includes/Notes/WC_Stripe_UPE_StripeLink_Note.php';
WC_Stripe_UPE_StripeLink_Note::init( WC_Stripe::get_instance()->get_main_stripe_gateway() );
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ public function set_flag( WP_REST_Request $request ) {

// including the class again because otherwise it's not present.
if ( WC_Stripe_Inbox_Notes::are_inbox_notes_supported() ) {
require_once WC_STRIPE_PLUGIN_PATH . '/includes/notes/class-wc-stripe-upe-availability-note.php';
require_once WC_STRIPE_PLUGIN_PATH . '/includes/Notes/WC_Stripe_UPE_Availability_Note.php';
WC_Stripe_UPE_Availability_Note::possibly_delete_note();

require_once WC_STRIPE_PLUGIN_PATH . '/includes/notes/class-wc-stripe-upe-stripelink-note.php';
require_once WC_STRIPE_PLUGIN_PATH . '/includes/Notes/WC_Stripe_UPE_StripeLink_Note.php';
WC_Stripe_UPE_StripeLink_Note::possibly_delete_note();
}

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public function payment_scripts() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-alipay-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-alipay-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function payment_scripts() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-bancontact-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-bancontact-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function payment_scripts() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-eps-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-eps-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public function payment_scripts() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-giropay-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-giropay-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function payment_scripts() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-ideal-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-ideal-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public function payment_scripts() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-multibanco-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-multibanco-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function payment_scripts() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-p24-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-p24-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public function payment_scripts() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sepa-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-sepa-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function payment_scripts() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-sofort-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-sofort-settings.php';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ public function normalize_state( $data ) {
// @reykjalin: This HK specific sanitazation *should be removed* once Apple Pay fix
// the address bug. More info on that in pc4etw-bY-p2.
if ( 'HK' === $billing_country ) {
include_once WC_STRIPE_PLUGIN_PATH . '/includes/constants/class-wc-stripe-hong-kong-states.php';
include_once WC_STRIPE_PLUGIN_PATH . '/includes/Constants/WC_Stripe_Hong_Kong_States.php';

if ( ! WC_Stripe_Hong_Kong_States::is_valid_state( strtolower( $billing_state ) ) ) {
$billing_postcode = ! empty( $data['billing_address']['postcode'] ) ? wc_clean( wp_unslash( $data['billing_address']['postcode'] ) ) : '';
Expand All @@ -1011,7 +1011,7 @@ public function normalize_state( $data ) {
}
}
if ( 'HK' === $shipping_country ) {
include_once WC_STRIPE_PLUGIN_PATH . '/includes/constants/class-wc-stripe-hong-kong-states.php';
include_once WC_STRIPE_PLUGIN_PATH . '/includes/Constants/WC_Stripe_Hong_Kong_States.php';

if ( ! WC_Stripe_Hong_Kong_States::is_valid_state( strtolower( $shipping_state ) ) ) {
$shipping_postcode = ! empty( $data['shipping_address']['postcode'] ) ? wc_clean( wp_unslash( $data['shipping_address']['postcode'] ) ) : '';
Expand Down Expand Up @@ -1070,7 +1070,7 @@ public function sanitize_string( $string ) {
*/
public function get_normalized_state_from_pr_states( $state, $country ) {
// Include Payment Request API State list for compatibility with WC countries/states.
include_once WC_STRIPE_PLUGIN_PATH . '/includes/constants/class-wc-stripe-payment-request-button-states.php';
include_once WC_STRIPE_PLUGIN_PATH . '/includes/Constants/WC_Stripe_Payment_Request_Button_States.php';
$pr_states = WC_Stripe_Payment_Request_Button_States::STATES;

if ( ! isset( $pr_states[ $country ] ) ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1534,7 +1534,7 @@ public function normalize_state() {
// @reykjalin: This HK specific sanitazation *should be removed* once Apple Pay fix
// the address bug. More info on that in pc4etw-bY-p2.
if ( 'HK' === $billing_country ) {
include_once WC_STRIPE_PLUGIN_PATH . '/includes/constants/class-wc-stripe-hong-kong-states.php';
include_once WC_STRIPE_PLUGIN_PATH . '/includes/Constants/WC_Stripe_Hong_Kong_States.php';

if ( ! WC_Stripe_Hong_Kong_States::is_valid_state( strtolower( $billing_state ) ) ) {
$billing_postcode = ! empty( $_POST['billing_postcode'] ) ? wc_clean( wp_unslash( $_POST['billing_postcode'] ) ) : '';
Expand All @@ -1544,7 +1544,7 @@ public function normalize_state() {
}
}
if ( 'HK' === $shipping_country ) {
include_once WC_STRIPE_PLUGIN_PATH . '/includes/constants/class-wc-stripe-hong-kong-states.php';
include_once WC_STRIPE_PLUGIN_PATH . '/includes/Constants/WC_Stripe_Hong_Kong_States.php';

if ( ! WC_Stripe_Hong_Kong_States::is_valid_state( strtolower( $shipping_state ) ) ) {
$shipping_postcode = ! empty( $_POST['shipping_postcode'] ) ? wc_clean( wp_unslash( $_POST['shipping_postcode'] ) ) : '';
Expand Down Expand Up @@ -1607,7 +1607,7 @@ public function sanitize_string( $string ) {
*/
public function get_normalized_state_from_pr_states( $state, $country ) {
// Include Payment Request API State list for compatibility with WC countries/states.
include_once WC_STRIPE_PLUGIN_PATH . '/includes/constants/class-wc-stripe-payment-request-button-states.php';
include_once WC_STRIPE_PLUGIN_PATH . '/includes/Constants/WC_Stripe_Payment_Request_Button_States.php';
$pr_states = WC_Stripe_Payment_Request_Button_States::STATES;

if ( ! isset( $pr_states[ $country ] ) ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ public function get_icon() {
* Initialize Gateway Settings Form Fields.
*/
public function init_form_fields() {
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/admin/stripe-settings.php';
$this->form_fields = require WC_STRIPE_PLUGIN_PATH . '/includes/Admin/stripe-settings.php';
unset( $this->form_fields['inline_cc_form'] );
unset( $this->form_fields['title'] );
unset( $this->form_fields['description'] );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public function get_icon() {
* Initialise Gateway Settings Form Fields
*/
public function init_form_fields() {
$this->form_fields = require __DIR__ . '/admin/stripe-settings.php';
$this->form_fields = require __DIR__ . '/Admin/stripe-settings.php';
}

/**
Expand Down
2 changes: 1 addition & 1 deletion includes/class-wc-stripe.php → includes/WC_Stripe.php
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ public function initialize_subscriptions_updater() {
if ( ! class_exists( 'WCS_Background_Repairer' ) ) {
return;
}
require_once WC_STRIPE_PLUGIN_PATH . '/includes/migrations/class-wc-stripe-subscriptions-repairer-legacy-sepa-tokens.php';
require_once WC_STRIPE_PLUGIN_PATH . '/includes/Migrations/WC_Stripe_Subscriptions_Repairer_Legacy_SEPA_Tokens.php';

$logger = wc_get_logger();
$updater = new WC_Stripe_Subscriptions_Repairer_Legacy_SEPA_Tokens( $logger );
Expand Down
File renamed without changes.
File renamed without changes.
Loading
Loading