From 10937144a1cb29ce5cbd9760f23bbee6ab072018 Mon Sep 17 00:00:00 2001 From: Alex P Date: Wed, 13 Oct 2021 15:02:10 +0300 Subject: [PATCH] Add typehint --- modules/ppcp-api-client/services.php | 4 ++-- modules/ppcp-compat/services.php | 4 +++- modules/ppcp-status-report/services.php | 2 +- modules/ppcp-vaulting/services.php | 9 +++++---- modules/ppcp-wc-gateway/extensions.php | 16 ++++++++-------- modules/ppcp-wc-gateway/services.php | 20 ++++++++++---------- modules/ppcp-webhooks/services.php | 20 ++++++++++---------- 7 files changed, 39 insertions(+), 36 deletions(-) diff --git a/modules/ppcp-api-client/services.php b/modules/ppcp-api-client/services.php index 060570793..9e1e5ef2e 100644 --- a/modules/ppcp-api-client/services.php +++ b/modules/ppcp-api-client/services.php @@ -219,10 +219,10 @@ return array( 'api.factory.webhook' => static function ( ContainerInterface $container ): WebhookFactory { return new WebhookFactory(); }, - 'api.factory.webhook-event' => static function ( $container ): WebhookEventFactory { + 'api.factory.webhook-event' => static function ( ContainerInterface $container ): WebhookEventFactory { return new WebhookEventFactory(); }, - 'api.factory.capture' => static function ( $container ): CaptureFactory { + 'api.factory.capture' => static function ( ContainerInterface $container ): CaptureFactory { $amount_factory = $container->get( 'api.factory.amount' ); return new CaptureFactory( $amount_factory ); diff --git a/modules/ppcp-compat/services.php b/modules/ppcp-compat/services.php index 223d468b6..258a1e7be 100644 --- a/modules/ppcp-compat/services.php +++ b/modules/ppcp-compat/services.php @@ -9,6 +9,8 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\Compat; +use Psr\Container\ContainerInterface; + return array( 'compat.ppec.mock-gateway' => static function( $container ) { @@ -23,7 +25,7 @@ return array( return new PPEC\MockGateway( $title ); }, - 'compat.ppec.subscriptions-handler' => static function ( $container ) { + 'compat.ppec.subscriptions-handler' => static function ( ContainerInterface $container ) { $ppcp_renewal_handler = $container->get( 'subscription.renewal-handler' ); $gateway = $container->get( 'compat.ppec.mock-gateway' ); diff --git a/modules/ppcp-status-report/services.php b/modules/ppcp-status-report/services.php index a35a89dfb..dccad7256 100644 --- a/modules/ppcp-status-report/services.php +++ b/modules/ppcp-status-report/services.php @@ -10,7 +10,7 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\StatusReport; return array( - 'status-report.renderer' => static function ( $container ): Renderer { + 'status-report.renderer' => static function (): Renderer { return new Renderer(); }, ); diff --git a/modules/ppcp-vaulting/services.php b/modules/ppcp-vaulting/services.php index b1b3ea7af..e81fc55ad 100644 --- a/modules/ppcp-vaulting/services.php +++ b/modules/ppcp-vaulting/services.php @@ -9,17 +9,18 @@ declare(strict_types=1); namespace WooCommerce\PayPalCommerce\Vaulting; +use Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\Vaulting\Assets\MyAccountPaymentsAssets; use WooCommerce\PayPalCommerce\Vaulting\Endpoint\DeletePaymentTokenEndpoint; return array( - 'vaulting.module-url' => static function ( $container ): string { + 'vaulting.module-url' => static function ( ContainerInterface $container ): string { return plugins_url( '/modules/ppcp-vaulting/', dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php' ); }, - 'vaulting.assets.myaccount-payments' => function( $container ) : MyAccountPaymentsAssets { + 'vaulting.assets.myaccount-payments' => function( ContainerInterface $container ) : MyAccountPaymentsAssets { return new MyAccountPaymentsAssets( $container->get( 'vaulting.module-url' ) ); @@ -27,12 +28,12 @@ return array( 'vaulting.payment-tokens-renderer' => static function (): PaymentTokensRenderer { return new PaymentTokensRenderer(); }, - 'vaulting.repository.payment-token' => static function ( $container ): PaymentTokenRepository { + 'vaulting.repository.payment-token' => static function ( ContainerInterface $container ): PaymentTokenRepository { $factory = $container->get( 'api.factory.payment-token' ); $endpoint = $container->get( 'api.endpoint.payment-token' ); return new PaymentTokenRepository( $factory, $endpoint ); }, - 'vaulting.endpoint.delete' => function( $container ) : DeletePaymentTokenEndpoint { + 'vaulting.endpoint.delete' => function( ContainerInterface $container ) : DeletePaymentTokenEndpoint { return new DeletePaymentTokenEndpoint( $container->get( 'vaulting.repository.payment-token' ), $container->get( 'button.request-data' ), diff --git a/modules/ppcp-wc-gateway/extensions.php b/modules/ppcp-wc-gateway/extensions.php index d8fcae8b9..09b0cbd8a 100644 --- a/modules/ppcp-wc-gateway/extensions.php +++ b/modules/ppcp-wc-gateway/extensions.php @@ -20,15 +20,15 @@ use Psr\Log\LoggerInterface; return array( - 'api.merchant_email' => static function ( $container ): string { + 'api.merchant_email' => static function ( ContainerInterface $container ): string { $settings = $container->get( 'wcgateway.settings' ); return $settings->has( 'merchant_email' ) ? (string) $settings->get( 'merchant_email' ) : ''; }, - 'api.merchant_id' => static function ( $container ): string { + 'api.merchant_id' => static function ( ContainerInterface $container ): string { $settings = $container->get( 'wcgateway.settings' ); return $settings->has( 'merchant_id' ) ? (string) $settings->get( 'merchant_id' ) : ''; }, - 'api.partner_merchant_id' => static function ( $container ): string { + 'api.partner_merchant_id' => static function ( ContainerInterface $container ): string { $environment = $container->get( 'onboarding.environment' ); /** @@ -39,20 +39,20 @@ return array( return $environment->current_environment_is( Environment::SANDBOX ) ? (string) $container->get( 'api.partner_merchant_id-sandbox' ) : (string) $container->get( 'api.partner_merchant_id-production' ); }, - 'api.key' => static function ( $container ): string { + 'api.key' => static function ( ContainerInterface $container ): string { $settings = $container->get( 'wcgateway.settings' ); $key = $settings->has( 'client_id' ) ? (string) $settings->get( 'client_id' ) : ''; return $key; }, - 'api.secret' => static function ( $container ): string { + 'api.secret' => static function ( ContainerInterface $container ): string { $settings = $container->get( 'wcgateway.settings' ); return $settings->has( 'client_secret' ) ? (string) $settings->get( 'client_secret' ) : ''; }, - 'api.prefix' => static function ( $container ): string { + 'api.prefix' => static function ( ContainerInterface $container ): string { $settings = $container->get( 'wcgateway.settings' ); return $settings->has( 'prefix' ) ? (string) $settings->get( 'prefix' ) : 'WC-'; }, - 'api.endpoint.order' => static function ( $container ): OrderEndpoint { + 'api.endpoint.order' => static function ( ContainerInterface $container ): OrderEndpoint { $order_factory = $container->get( 'api.factory.order' ); $patch_collection_factory = $container->get( 'api.factory.patch-collection-factory' ); $logger = $container->get( 'woocommerce.logger.woocommerce' ); @@ -85,7 +85,7 @@ return array( $bn_code ); }, - 'woocommerce.logger.woocommerce' => function ( $container ): LoggerInterface { + 'woocommerce.logger.woocommerce' => function ( ContainerInterface $container ): LoggerInterface { $settings = $container->get( 'wcgateway.settings' ); if ( ! function_exists( 'wc_get_logger' ) || ! $settings->has( 'logging_enabled' ) || ! $settings->get( 'logging_enabled' ) ) { return new NullLogger(); diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 7ae429d8d..f6b7fb5ee 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -113,13 +113,13 @@ return array( $settings = $container->get( 'wcgateway.settings' ); return new DisableGateways( $session_handler, $settings ); }, - 'wcgateway.is-wc-payments-page' => static function ( $container ): bool { + 'wcgateway.is-wc-payments-page' => static function ( ContainerInterface $container ): bool { $page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : ''; $tab = isset( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : ''; return 'wc-settings' === $page && 'checkout' === $tab; }, - 'wcgateway.is-ppcp-settings-page' => static function ( $container ): bool { + 'wcgateway.is-ppcp-settings-page' => static function ( ContainerInterface $container ): bool { if ( ! $container->get( 'wcgateway.is-wc-payments-page' ) ) { return false; } @@ -128,7 +128,7 @@ return array( return in_array( $section, array( PayPalGateway::ID, CreditCardGateway::ID, WebhooksStatusPage::ID ), true ); }, - 'wcgateway.current-ppcp-settings-page-id' => static function ( $container ): string { + 'wcgateway.current-ppcp-settings-page-id' => static function ( ContainerInterface $container ): string { if ( ! $container->get( 'wcgateway.is-ppcp-settings-page' ) ) { return ''; } @@ -155,7 +155,7 @@ return array( return new DccWithoutPayPalAdminNotice( $state, $settings, $is_payments_page, $is_ppcp_settings_page ); }, 'wcgateway.notice.authorize-order-action' => - static function ( $container ): AuthorizeOrderActionNotice { + static function ( ContainerInterface $container ): AuthorizeOrderActionNotice { return new AuthorizeOrderActionNotice(); }, 'wcgateway.settings.sections-renderer' => static function ( ContainerInterface $container ): SectionsRenderer { @@ -1973,10 +1973,10 @@ return array( dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php' ); }, - 'wcgateway.relative-path' => static function( $container ): string { + 'wcgateway.relative-path' => static function( ContainerInterface $container ): string { return 'modules/ppcp-wc-gateway/'; }, - 'wcgateway.absolute-path' => static function( $container ): string { + 'wcgateway.absolute-path' => static function( ContainerInterface $container ): string { return plugin_dir_path( dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php' ) . @@ -1993,15 +1993,15 @@ return array( ); }, - 'wcgateway.transaction-url-sandbox' => static function ( $container ): string { + 'wcgateway.transaction-url-sandbox' => static function ( ContainerInterface $container ): string { return 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%s'; }, - 'wcgateway.transaction-url-live' => static function ( $container ): string { + 'wcgateway.transaction-url-live' => static function ( ContainerInterface $container ): string { return 'https://www.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%s'; }, - 'wcgateway.transaction-url-provider' => static function ( $container ): TransactionUrlProvider { + 'wcgateway.transaction-url-provider' => static function ( ContainerInterface $container ): TransactionUrlProvider { $sandbox_url_base = $container->get( 'wcgateway.transaction-url-sandbox' ); $live_url_base = $container->get( 'wcgateway.transaction-url-live' ); @@ -2015,7 +2015,7 @@ return array( return new DCCProductStatus( $settings, $partner_endpoint ); }, - 'button.helper.messages-disclaimers' => static function ( $container ): MessagesDisclaimers { + 'button.helper.messages-disclaimers' => static function ( ContainerInterface $container ): MessagesDisclaimers { return new MessagesDisclaimers(); }, ); diff --git a/modules/ppcp-webhooks/services.php b/modules/ppcp-webhooks/services.php index 539ab7330..07df9b146 100644 --- a/modules/ppcp-webhooks/services.php +++ b/modules/ppcp-webhooks/services.php @@ -72,7 +72,7 @@ return array( ); }, - 'webhook.current' => function( $container ) : ?Webhook { + 'webhook.current' => function( ContainerInterface $container ) : ?Webhook { $data = (array) get_option( WebhookRegistrar::KEY, array() ); if ( empty( $data ) ) { return null; @@ -91,18 +91,18 @@ return array( } }, - 'webhook.is-registered' => function( $container ) : bool { + 'webhook.is-registered' => function( ContainerInterface $container ) : bool { return $container->get( 'webhook.current' ) !== null; }, - 'webhook.status.registered-webhooks' => function( $container ) : array { + 'webhook.status.registered-webhooks' => function( ContainerInterface $container ) : array { $endpoint = $container->get( 'api.endpoint.webhook' ); assert( $endpoint instanceof WebhookEndpoint ); return $endpoint->list(); }, - 'webhook.status.registered-webhooks-data' => function( $container ) : array { + 'webhook.status.registered-webhooks-data' => function( ContainerInterface $container ) : array { $empty_placeholder = __( 'No webhooks found.', 'woocommerce-paypal-payments' ); $webhooks = array(); @@ -139,7 +139,7 @@ return array( ); }, - 'webhook.status.simulation' => function( $container ) : WebhookSimulation { + 'webhook.status.simulation' => function( ContainerInterface $container ) : WebhookSimulation { $webhook_endpoint = $container->get( 'api.endpoint.webhook' ); $webhook = $container->get( 'webhook.current' ); return new WebhookSimulation( @@ -150,13 +150,13 @@ return array( ); }, - 'webhook.status.assets' => function( $container ) : WebhooksStatusPageAssets { + 'webhook.status.assets' => function( ContainerInterface $container ) : WebhooksStatusPageAssets { return new WebhooksStatusPageAssets( $container->get( 'webhook.module-url' ) ); }, - 'webhook.endpoint.resubscribe' => static function ( $container ) : ResubscribeEndpoint { + 'webhook.endpoint.resubscribe' => static function ( ContainerInterface $container ) : ResubscribeEndpoint { $registrar = $container->get( 'webhook.registrar' ); $request_data = $container->get( 'button.request-data' ); @@ -166,7 +166,7 @@ return array( ); }, - 'webhook.endpoint.simulate' => static function ( $container ) : SimulateEndpoint { + 'webhook.endpoint.simulate' => static function ( ContainerInterface $container ) : SimulateEndpoint { $simulation = $container->get( 'webhook.status.simulation' ); $request_data = $container->get( 'button.request-data' ); @@ -175,7 +175,7 @@ return array( $request_data ); }, - 'webhook.endpoint.simulation-state' => static function ( $container ) : SimulationStateEndpoint { + 'webhook.endpoint.simulation-state' => static function ( ContainerInterface $container ) : SimulationStateEndpoint { $simulation = $container->get( 'webhook.status.simulation' ); return new SimulationStateEndpoint( @@ -183,7 +183,7 @@ return array( ); }, - 'webhook.module-url' => static function ( $container ): string { + 'webhook.module-url' => static function ( ContainerInterface $container ): string { return plugins_url( '/modules/ppcp-webhooks/', dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php'