Fix extensions.

woocommerce · Dec 19, 2023 · e540484 · e540484
1 parent 1444741
commit e540484
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/bootstrap.php b/bootstrap.php
@@ -34,11 +34,12 @@
 	$properties = PluginProperties::new( __FILE__ );
 	$bootstrap  = Package::new( $properties );
 
-
-
 	foreach ($modules as $key => $module) {
 		if (
 			$module instanceof \WooCommerce\PayPalCommerce\AdminNotices\AdminNotices ||
+			$module instanceof \WooCommerce\PayPalCommerce\ApiClient\ApiModule ||
+			$module instanceof \WooCommerce\PayPalCommerce\Applepay\ApplepayModule ||
+			$module instanceof \WooCommerce\PayPalCommerce\Blocks\BlocksModule ||
 			$module instanceof \WooCommerce\PayPalCommerce\Button\ButtonModule
 		) {
 			$bootstrap->addModule( $module );

diff --git a/modules/ppcp-applepay/extensions.php b/modules/ppcp-applepay/extensions.php
@@ -18,7 +18,7 @@
 
 
 return array(
-	'wcgateway.settings.fields' => function ( ContainerInterface $container, array $fields ): array {
+	'wcgateway.settings.fields' => function ( array $fields, ContainerInterface $container ): array {
 
 		// Eligibility check.
 		if ( ! $container->has( 'applepay.eligible' ) || ! $container->get( 'applepay.eligible' ) ) {

diff --git a/modules/ppcp-blocks/extensions.php b/modules/ppcp-blocks/extensions.php
@@ -13,7 +13,7 @@
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 
 return array(
-	'wcgateway.button.locations'                       => function ( ContainerInterface $container, array $locations ): array {
+	'wcgateway.button.locations'                       => function ( array $locations, ContainerInterface $container ): array {
 		return array_merge(
 			$locations,
 			array(
@@ -22,13 +22,13 @@
 			)
 		);
 	},
-	'wcgateway.settings.pay-later.messaging-locations' => function ( ContainerInterface $container, array $locations ): array {
+	'wcgateway.settings.pay-later.messaging-locations' => function ( array $locations, ContainerInterface $container ): array {
 		unset( $locations['checkout-block-express'] );
 		unset( $locations['cart-block'] );
 		return $locations;
 	},
 
-	'wcgateway.settings.fields'                        => function ( ContainerInterface $container, array $fields ): array {
+	'wcgateway.settings.fields'                        => function ( array $fields, ContainerInterface $container ): array {
 		$insert_after = function( array $array, string $key, array $new ): array {
 			$keys = array_keys( $array );
 			$index = array_search( $key, $keys, true );
@@ -59,7 +59,7 @@
 		);
 	},
 
-	'button.pay-now-contexts'                          => function ( ContainerInterface $container, array $contexts ): array {
+	'button.pay-now-contexts'                          => function ( array $contexts, ContainerInterface $container ): array {
 		if ( ! $container->get( 'blocks.settings.final_review_enabled' ) ) {
 			$contexts[] = 'checkout-block';
 			$contexts[] = 'cart-block';
@@ -68,7 +68,7 @@
 		return $contexts;
 	},
 
-	'button.handle-shipping-in-paypal'                 => function ( ContainerInterface $container ): bool {
+	'button.handle-shipping-in-paypal'                 => function ( bool $previous, ContainerInterface $container ): bool {
 		return ! $container->get( 'blocks.settings.final_review_enabled' );
 	},
 );