feat: auto-format JSON style settings on save

jimmyn · jimmyn · commit 0e1dfe6ecacf · 2025-10-03T13:21:12.000+02:00
All payment gateway JSON style validation methods now automatically
pretty-print JSON when saved in WordPress admin for better readability.

Changes:
- Updated validate_*_style_field() methods in all gateway classes
- JSON is decoded, validated, then re-encoded with JSON_PRETTY_PRINT
- Settings files formatting improvements from PHPCBF
- Fixed PHPCBF to return success after fixing files in lint-staged
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     },
     "scripts": {
         "phpcs": "phpcs -n",
-        "phpcbf": "phpcbf",
+        "phpcbf": "phpcbf || true",
         "phpstan": "phpstan analyse --memory-limit=1G --no-progress",
         "lint": [
             "@phpcs",
diff --git a/includes/admin/monei-apple-google-settings.php b/includes/admin/monei-apple-google-settings.php
@@ -15,9 +15,7 @@
 	)
 );
 
-/**
- * Apple Google Gateway Settings.
- */
+/** Apple Google Gateway Settings. */
 return apply_filters(
 	'wc_monei_apple_google_settings',
 	array(
@@ -44,7 +42,7 @@
 			'title'       => __( 'Apple Pay / Google Pay Style', 'monei' ),
 			'type'        => 'textarea',
 			'description' => __( 'Configure in JSON format the style of the Apple Pay / Google Pay component. Documentation: ', 'monei' ) . '<a href="https://docs.monei.com/docs/monei-js/reference/#paymentrequest-options" target="_blank">MONEI Payment Request Style</a>',
-			'default'     => '{\"height\": \"42\"}',
+			'default'     => '{"height": "50px"}',
 			'css'         => 'min-height: 80px;',
 		),
 		'title'                 => array(
diff --git a/includes/admin/monei-bizum-settings.php b/includes/admin/monei-bizum-settings.php
@@ -15,9 +15,7 @@
 	)
 );
 
-/**
- * Monei Bizum Gateway Settings.
- */
+/** Monei Bizum Gateway Settings. */
 return apply_filters(
 	'wc_monei_bizum_settings',
 	array(
@@ -51,7 +49,7 @@
 			'title'       => __( 'Bizum Style', 'monei' ),
 			'type'        => 'textarea',
 			'description' => __( 'Configure in JSON format the style of the Bizum component. Documentation: ', 'monei' ) . '<a href="https://docs.monei.com/docs/monei-js/reference/#bizum-options" target="_blank">MONEI Bizum Style</a>',
-			'default'     => '{"height": "42"}',
+			'default'     => '{"height": "50px"}',
 			'css'         => 'min-height: 80px;',
 		),
 		'title'       => array(
diff --git a/includes/admin/monei-cc-settings.php b/includes/admin/monei-cc-settings.php
@@ -15,9 +15,7 @@
 	)
 );
 
-/**
- * Monei Gateway Settings.
- */
+/** Monei Gateway Settings. */
 return apply_filters(
 	'wc_monei_settings',
 	array(
@@ -51,7 +49,7 @@
 			'title'       => __( 'Card Input Style', 'monei' ),
 			'type'        => 'textarea',
 			'description' => __( 'Configure in JSON format the style of the Card Input component. Documentation: ', 'monei' ) . '<a href="https://docs.monei.com/docs/monei-js/reference/#cardinput-style-object" target="_blank">MONEI Card Input Style</a>',
-			'default'     => '{"base": {"height": "50"}, "input": {"background": "none"}}',
+			'default'     => '{"base": {"height": "50px"}, "input": {"background": "none"}}',
 			'css'         => 'min-height: 80px;',
 		),
 		'title'            => array(
@@ -102,6 +100,5 @@
 				'completed'  => __( 'Mark as Complete', 'monei' ),
 			),
 		),
-
 	)
 );
diff --git a/src/Gateways/PaymentMethods/WCGatewayMoneiAppleGoogle.php b/src/Gateways/PaymentMethods/WCGatewayMoneiAppleGoogle.php
@@ -137,7 +137,7 @@ public function validate_payment_request_style_field( $key, $value ) {
 		$value = stripslashes( $value );
 
 		// Try to decode JSON
-		json_decode( $value );
+		$decoded = json_decode( $value, true );
 
 		// Check for JSON errors
 		if ( json_last_error() !== JSON_ERROR_NONE ) {
@@ -151,7 +151,8 @@ public function validate_payment_request_style_field( $key, $value ) {
 			return $this->get_option( 'payment_request_style', '{"height": "50px"}' );
 		}
 
-		return $value;
+		// Re-encode with pretty print for better readability in admin
+		return wp_json_encode( $decoded, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES );
 	}
 
 	/**
diff --git a/src/Gateways/PaymentMethods/WCGatewayMoneiBizum.php b/src/Gateways/PaymentMethods/WCGatewayMoneiBizum.php
@@ -139,7 +139,7 @@ public function validate_bizum_style_field( $key, $value ) {
 		$value = stripslashes( $value );
 
 		// Try to decode JSON
-		json_decode( $value );
+		$decoded = json_decode( $value, true );
 
 		// Check for JSON errors
 		if ( json_last_error() !== JSON_ERROR_NONE ) {
@@ -153,7 +153,8 @@ public function validate_bizum_style_field( $key, $value ) {
 			return $this->get_option( 'bizum_style', '{"height": "50px"}' );
 		}
 
-		return $value;
+		// Re-encode with pretty print for better readability in admin
+		return wp_json_encode( $decoded, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES );
 	}
 
 	/**
diff --git a/src/Gateways/PaymentMethods/WCGatewayMoneiCC.php b/src/Gateways/PaymentMethods/WCGatewayMoneiCC.php
@@ -199,7 +199,7 @@ public function validate_card_input_style_field( $key, $value ) {
 		$value = stripslashes( $value );
 
 		// Try to decode JSON
-		json_decode( $value );
+		$decoded = json_decode( $value, true );
 
 		// Check for JSON errors
 		if ( json_last_error() !== JSON_ERROR_NONE ) {
@@ -213,7 +213,8 @@ public function validate_card_input_style_field( $key, $value ) {
 			return $this->get_option( 'card_input_style', '{"base": {"height": "50px"}, "input": {"background": "none"}}' );
 		}
 
-		return $value;
+		// Re-encode with pretty print for better readability in admin
+		return wp_json_encode( $decoded, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES );
 	}
 
 	/**
diff --git a/src/Gateways/PaymentMethods/WCGatewayMoneiPaypal.php b/src/Gateways/PaymentMethods/WCGatewayMoneiPaypal.php
@@ -139,7 +139,7 @@ public function validate_paypal_style_field( $key, $value ) {
 		$value = stripslashes( $value );
 
 		// Try to decode JSON
-		json_decode( $value );
+		$decoded = json_decode( $value, true );
 
 		// Check for JSON errors
 		if ( json_last_error() !== JSON_ERROR_NONE ) {
@@ -153,7 +153,8 @@ public function validate_paypal_style_field( $key, $value ) {
 			return $this->get_option( 'paypal_style', '{"height": "50px", "disableMaxWidth": true}' );
 		}
 
-		return $value;
+		// Re-encode with pretty print for better readability in admin
+		return wp_json_encode( $decoded, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES );
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function validate_payment_request_style_field( $key, $value ) {`
`137`	`137`	`$value = stripslashes( $value );`
`138`	`138`
`139`	`139`	`// Try to decode JSON`
`140`		`- json_decode( $value );`
	`140`	`+ $decoded = json_decode( $value, true );`
`141`	`141`
`142`	`142`	`// Check for JSON errors`
`143`	`143`	`if ( json_last_error() !== JSON_ERROR_NONE ) {`
`@@ -151,7 +151,8 @@ public function validate_payment_request_style_field( $key, $value ) {`
`151`	`151`	`return $this->get_option( 'payment_request_style', '{"height": "50px"}' );`
`152`	`152`	`}`
`153`	`153`
`154`		`- return $value;`
	`154`	`+ // Re-encode with pretty print for better readability in admin`
	`155`	`+ return wp_json_encode( $decoded, JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES );`
`155`	`156`	`}`
`156`	`157`
`157`	`158`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public function validate_bizum_style_field( $key, $value ) {`
`139`	`139`	`$value = stripslashes( $value );`
`140`	`140`
`141`	`141`	`// Try to decode JSON`
`142`		`- json_decode( $value );`
	`142`	`+ $decoded = json_decode( $value, true );`
`143`	`143`
`144`	`144`	`// Check for JSON errors`
`145`	`145`	`if ( json_last_error() !== JSON_ERROR_NONE ) {`
`@@ -153,7 +153,8 @@ public function validate_bizum_style_field( $key, $value ) {`
`153`	`153`	`return $this->get_option( 'bizum_style', '{"height": "50px"}' );`
`154`	`154`	`}`
`155`	`155`
`156`		`- return $value;`
	`156`	`+ // Re-encode with pretty print for better readability in admin`
	`157`	`+ return wp_json_encode( $decoded, JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES );`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public function validate_card_input_style_field( $key, $value ) {`
`199`	`199`	`$value = stripslashes( $value );`
`200`	`200`
`201`	`201`	`// Try to decode JSON`
`202`		`- json_decode( $value );`
	`202`	`+ $decoded = json_decode( $value, true );`
`203`	`203`
`204`	`204`	`// Check for JSON errors`
`205`	`205`	`if ( json_last_error() !== JSON_ERROR_NONE ) {`
`@@ -213,7 +213,8 @@ public function validate_card_input_style_field( $key, $value ) {`
`213`	`213`	`return $this->get_option( 'card_input_style', '{"base": {"height": "50px"}, "input": {"background": "none"}}' );`
`214`	`214`	`}`
`215`	`215`
`216`		`- return $value;`
	`216`	`+ // Re-encode with pretty print for better readability in admin`
	`217`	`+ return wp_json_encode( $decoded, JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES );`
`217`	`218`	`}`
`218`	`219`
`219`	`220`	`/**`