From 2e524b53ea24212a3aed98bf8d7445911b34e4ed Mon Sep 17 00:00:00 2001 From: Emili Castells Guasch Date: Wed, 21 Aug 2024 16:33:44 +0200 Subject: [PATCH] Fix phpcs --- .../services.php | 68 +++++++++---------- .../src/IDealGateway.php | 3 +- .../src/IDealPaymentMethod.php | 8 +-- .../LocalAlternativePaymentMethodsModule.php | 36 +++++----- .../src/MyBankPaymentMethod.php | 4 +- .../src/TrustlyPaymentMethod.php | 4 +- 6 files changed, 61 insertions(+), 62 deletions(-) diff --git a/modules/ppcp-local-alternative-payment-methods/services.php b/modules/ppcp-local-alternative-payment-methods/services.php index 325f19ffa..74796c712 100644 --- a/modules/ppcp-local-alternative-payment-methods/services.php +++ b/modules/ppcp-local-alternative-payment-methods/services.php @@ -23,42 +23,42 @@ return array( dirname( realpath( __FILE__ ), 3 ) . '/woocommerce-paypal-payments.php' ); }, - 'ppcp-local-apms.payment-methods' => static function( ContainerInterface $container): array { + 'ppcp-local-apms.payment-methods' => static function( ContainerInterface $container ): array { return array( 'bancontact' => array( - 'id' => BancontactGateway::ID, - 'countries' => array('BE',), - 'currencies' => array('EUR',), + 'id' => BancontactGateway::ID, + 'countries' => array( 'BE' ), + 'currencies' => array( 'EUR' ), ), - 'blik' => array( - 'id' => BlikGateway::ID, - 'countries' => array('PL',), - 'currencies' => array('PLN',), + 'blik' => array( + 'id' => BlikGateway::ID, + 'countries' => array( 'PL' ), + 'currencies' => array( 'PLN' ), ), - 'eps' => array( - 'id' => EPSGateway::ID, - 'countries' => array('AT',), - 'currencies' => array('EUR',), + 'eps' => array( + 'id' => EPSGateway::ID, + 'countries' => array( 'AT' ), + 'currencies' => array( 'EUR' ), ), - 'ideal' => array( - 'id' => IDealGateway::ID, - 'countries' => array('NL',), - 'currencies' => array('EUR',), + 'ideal' => array( + 'id' => IDealGateway::ID, + 'countries' => array( 'NL' ), + 'currencies' => array( 'EUR' ), ), - 'mybank' => array( - 'id' => MyBankGateway::ID, - 'countries' => array('IT',), - 'currencies' => array('EUR',), + 'mybank' => array( + 'id' => MyBankGateway::ID, + 'countries' => array( 'IT' ), + 'currencies' => array( 'EUR' ), ), - 'p24' => array( - 'id' => P24Gateway::ID, - 'countries' => array('PL',), - 'currencies' => array('EUR', 'PLN',), + 'p24' => array( + 'id' => P24Gateway::ID, + 'countries' => array( 'PL' ), + 'currencies' => array( 'EUR', 'PLN' ), ), - 'trustly' => array( - 'id' => TrustlyGateway::ID, - 'countries' => array('AT', 'DE', 'DK', 'EE', 'ES', 'FI', 'GB', 'LT', 'LV', 'NL', 'NO', 'SE',), - 'currencies' => array('EUR', 'DKK', 'SEK', 'GBP', 'NOK',), + 'trustly' => array( + 'id' => TrustlyGateway::ID, + 'countries' => array( 'AT', 'DE', 'DK', 'EE', 'ES', 'FI', 'GB', 'LT', 'LV', 'NL', 'NO', 'SE' ), + 'currencies' => array( 'EUR', 'DKK', 'SEK', 'GBP', 'NOK' ), ), ); }, @@ -86,7 +86,7 @@ return array( $container->get( 'wcgateway.transaction-url-provider' ) ); }, - 'ppcp-local-apms.ideal.wc-gateway' => static function ( ContainerInterface $container ): IDealGateway { + 'ppcp-local-apms.ideal.wc-gateway' => static function ( ContainerInterface $container ): IDealGateway { return new IDealGateway( $container->get( 'api.endpoint.orders' ), $container->get( 'api.factory.purchase-unit' ), @@ -94,7 +94,7 @@ return array( $container->get( 'wcgateway.transaction-url-provider' ) ); }, - 'ppcp-local-apms.mybank.wc-gateway' => static function ( ContainerInterface $container ): MyBankGateway { + 'ppcp-local-apms.mybank.wc-gateway' => static function ( ContainerInterface $container ): MyBankGateway { return new MyBankGateway( $container->get( 'api.endpoint.orders' ), $container->get( 'api.factory.purchase-unit' ), @@ -110,7 +110,7 @@ return array( $container->get( 'wcgateway.transaction-url-provider' ) ); }, - 'ppcp-local-apms.trustly.wc-gateway' => static function ( ContainerInterface $container ): TrustlyGateway { + 'ppcp-local-apms.trustly.wc-gateway' => static function ( ContainerInterface $container ): TrustlyGateway { return new TrustlyGateway( $container->get( 'api.endpoint.orders' ), $container->get( 'api.factory.purchase-unit' ), @@ -139,14 +139,14 @@ return array( $container->get( 'ppcp-local-apms.eps.wc-gateway' ) ); }, - 'ppcp-local-apms.ideal.payment-method' => static function( ContainerInterface $container ): IDealPaymentMethod { + 'ppcp-local-apms.ideal.payment-method' => static function( ContainerInterface $container ): IDealPaymentMethod { return new IDealPaymentMethod( $container->get( 'ppcp-local-apms.url' ), $container->get( 'ppcp.asset-version' ), $container->get( 'ppcp-local-apms.ideal.wc-gateway' ) ); }, - 'ppcp-local-apms.mybank.payment-method' => static function( ContainerInterface $container ): MyBankPaymentMethod { + 'ppcp-local-apms.mybank.payment-method' => static function( ContainerInterface $container ): MyBankPaymentMethod { return new MyBankPaymentMethod( $container->get( 'ppcp-local-apms.url' ), $container->get( 'ppcp.asset-version' ), @@ -160,7 +160,7 @@ return array( $container->get( 'ppcp-local-apms.p24.wc-gateway' ) ); }, - 'ppcp-local-apms.trustly.payment-method' => static function( ContainerInterface $container ): TrustlyPaymentMethod { + 'ppcp-local-apms.trustly.payment-method' => static function( ContainerInterface $container ): TrustlyPaymentMethod { return new TrustlyPaymentMethod( $container->get( 'ppcp-local-apms.url' ), $container->get( 'ppcp.asset-version' ), diff --git a/modules/ppcp-local-alternative-payment-methods/src/IDealGateway.php b/modules/ppcp-local-alternative-payment-methods/src/IDealGateway.php index 02b58db8f..0d6ece5e7 100644 --- a/modules/ppcp-local-alternative-payment-methods/src/IDealGateway.php +++ b/modules/ppcp-local-alternative-payment-methods/src/IDealGateway.php @@ -136,11 +136,10 @@ class IDealGateway extends WC_Payment_Gateway { $payment_source = array( 'country_code' => $wc_order->get_billing_country(), - 'name' => $wc_order->get_billing_first_name() . ' ' . $wc_order->get_billing_last_name(), + 'name' => $wc_order->get_billing_first_name() . ' ' . $wc_order->get_billing_last_name(), ); // TODO get "bic" from gateway settings. - $request_body = array( 'intent' => 'CAPTURE', 'payment_source' => array( diff --git a/modules/ppcp-local-alternative-payment-methods/src/IDealPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/IDealPaymentMethod.php index 19032cd04..7f40e90f9 100644 --- a/modules/ppcp-local-alternative-payment-methods/src/IDealPaymentMethod.php +++ b/modules/ppcp-local-alternative-payment-methods/src/IDealPaymentMethod.php @@ -1,6 +1,6 @@ get('ppcp-local-apms.payment-methods'); - foreach ($payment_methods as $key => $value) { - $methods[] = $c->get( 'ppcp-local-apms.' . $key . '.wc-gateway' ); + $payment_methods = $c->get( 'ppcp-local-apms.payment-methods' ); + foreach ( $payment_methods as $key => $value ) { + $methods[] = $c->get( 'ppcp-local-apms.' . $key . '.wc-gateway' ); } return $methods; @@ -72,11 +72,11 @@ class LocalAlternativePaymentMethodsModule implements ModuleInterface { $customer_country = WC()->customer->get_billing_country() ?: WC()->customer->get_shipping_country(); $site_currency = get_woocommerce_currency(); - $payment_methods = $c->get('ppcp-local-apms.payment-methods'); - foreach ($payment_methods as $payment_method) { + $payment_methods = $c->get( 'ppcp-local-apms.payment-methods' ); + foreach ( $payment_methods as $payment_method ) { if ( - ! in_array($customer_country, $payment_method['countries'], true) - || ! in_array($site_currency, $payment_method['currencies'], true) + ! in_array( $customer_country, $payment_method['countries'], true ) + || ! in_array( $site_currency, $payment_method['currencies'], true ) ) { unset( $methods[ $payment_method['id'] ] ); } @@ -90,8 +90,8 @@ class LocalAlternativePaymentMethodsModule implements ModuleInterface { add_action( 'woocommerce_blocks_payment_method_type_registration', function( PaymentMethodRegistry $payment_method_registry ) use ( $c ): void { - $payment_methods = $c->get('ppcp-local-apms.payment-methods'); - foreach ($payment_methods as $key => $value) { + $payment_methods = $c->get( 'ppcp-local-apms.payment-methods' ); + foreach ( $payment_methods as $key => $value ) { $payment_method_registry->register( $c->get( 'ppcp-local-apms.' . $key . '.payment-method' ) ); } } @@ -99,8 +99,8 @@ class LocalAlternativePaymentMethodsModule implements ModuleInterface { add_filter( 'woocommerce_paypal_payments_localized_script_data', - function ( array $data ) use ($c) { - $payment_methods = $c->get('ppcp-local-apms.payment-methods'); + function ( array $data ) use ( $c ) { + $payment_methods = $c->get( 'ppcp-local-apms.payment-methods' ); $default_disable_funding = $data['url_params']['disable-funding'] ?? ''; $disable_funding = array_merge( array_keys( $payment_methods ), array_filter( explode( ',', $default_disable_funding ) ) ); @@ -117,7 +117,7 @@ class LocalAlternativePaymentMethodsModule implements ModuleInterface { * * @psalm-suppress MissingClosureParamType */ - function( $order_id ) use($c) { + function( $order_id ) use ( $c ) { $order = wc_get_order( $order_id ); if ( ! $order instanceof WC_Order ) { return; @@ -128,9 +128,9 @@ class LocalAlternativePaymentMethodsModule implements ModuleInterface { $order_key = wc_clean( wp_unslash( $_GET['key'] ?? '' ) ); // phpcs:enable - $payment_methods = $c->get('ppcp-local-apms.payment-methods'); + $payment_methods = $c->get( 'ppcp-local-apms.payment-methods' ); if ( - ! $this->is_local_apm($order->get_payment_method(), $payment_methods) + ! $this->is_local_apm( $order->get_payment_method(), $payment_methods ) || ! $cancelled || $order->get_order_key() !== $order_key ) { @@ -152,12 +152,12 @@ class LocalAlternativePaymentMethodsModule implements ModuleInterface { * Check if given payment method is a local APM. * * @param string $selected_payment_method Selected payment method. - * @param array $payment_methods Available local APMs. + * @param array $payment_methods Available local APMs. * @return bool */ - private function is_local_apm(string $selected_payment_method, array $payment_methods): bool { - foreach ($payment_methods as $payment_method) { - if($payment_method['id'] === $selected_payment_method) { + private function is_local_apm( string $selected_payment_method, array $payment_methods ): bool { + foreach ( $payment_methods as $payment_method ) { + if ( $payment_method['id'] === $selected_payment_method ) { return true; } } diff --git a/modules/ppcp-local-alternative-payment-methods/src/MyBankPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/MyBankPaymentMethod.php index 11ffa6afa..132f918ac 100644 --- a/modules/ppcp-local-alternative-payment-methods/src/MyBankPaymentMethod.php +++ b/modules/ppcp-local-alternative-payment-methods/src/MyBankPaymentMethod.php @@ -40,8 +40,8 @@ class MyBankPaymentMethod extends AbstractPaymentMethodType { /** * MyBankPaymentMethod constructor. * - * @param string $module_url The URL of this module. - * @param string $version The assets version. + * @param string $module_url The URL of this module. + * @param string $version The assets version. * @param MyBankGateway $gateway MyBank WC gateway. */ public function __construct( diff --git a/modules/ppcp-local-alternative-payment-methods/src/TrustlyPaymentMethod.php b/modules/ppcp-local-alternative-payment-methods/src/TrustlyPaymentMethod.php index 8cbda2ac9..87ba625a2 100644 --- a/modules/ppcp-local-alternative-payment-methods/src/TrustlyPaymentMethod.php +++ b/modules/ppcp-local-alternative-payment-methods/src/TrustlyPaymentMethod.php @@ -40,8 +40,8 @@ class TrustlyPaymentMethod extends AbstractPaymentMethodType { /** * TrustlyPaymentMethod constructor. * - * @param string $module_url The URL of this module. - * @param string $version The assets version. + * @param string $module_url The URL of this module. + * @param string $version The assets version. * @param TrustlyGateway $gateway Trustly WC gateway. */ public function __construct(