fix: treat already-disabled smilies as applied

Author: faisalahammad

includes/class-static-site-importer-wordpress-site-plan-materializer.php

@@ -262,8 +262,12 @@ public static function materialize_prepared( array $prepared ): array {
 				'theme_slug' => $state['theme']['slug'],
 			);
 			if ( ! isset( $args['disable_smilies'] ) || false !== (bool) $args['disable_smilies'] ) {
-				if ( false === update_option( 'use_smilies', false ) ) {
-					return self::failed_receipt( $state, 'disable_smilies_not_applied' );
+				// update_option( 'use_smilies', false ) returns false both on failure and
+				// when the stored value is already false, so the existing value is the oracle.
+				if ( false !== get_option( 'use_smilies', false ) ) {
+					if ( false === update_option( 'use_smilies', false ) ) {
+						return self::failed_receipt( $state, 'disable_smilies_not_applied' );
+					}
 				}
 				$state['applied']['runtime_policy']['disable_smilies'] = true;
 			}

tests/smoke-wordpress-site-plan-materializer.php

@@ -64,7 +64,14 @@ function wp_safe_remote_get( string $url, array $args ) {
 }
 function wp_remote_retrieve_response_code( $response ): int { return (int) ( $response['response']['code'] ?? 0 ); }
 function wp_remote_retrieve_body( $response ): string { return (string) ( $response['body'] ?? '' ); }
-function update_option( string $key, $value ): bool { $GLOBALS['ssi_plan_options'][ $key ] = $value; return true; }
+function get_option( string $key, mixed $default = false ): mixed { return $GLOBALS['ssi_plan_options'][ $key ] ?? $default; }
+function update_option( string $key, $value ): bool {
+	if ( array_key_exists( $key, $GLOBALS['ssi_plan_options'] ) && $GLOBALS['ssi_plan_options'][ $key ] === $value ) {
+		return false; // Core semantics: unchanged value writes no row and returns false.
+	}
+	$GLOBALS['ssi_plan_options'][ $key ] = $value;
+	return true;
+}
 function switch_theme( string $slug ): void { $GLOBALS['ssi_plan_options']['stylesheet'] = $slug; }
 function convert_smilies( string $content, string $which = 'content' ): string { return ( $GLOBALS['ssi_plan_options']['use_smilies'] ?? true ) ? 'smilied-' . $which : $content; }
 function sanitize_text_field( string $value ): string { return $value; }
@@ -438,6 +445,13 @@ function wp_insert_post( array $post, bool $wp_error ) {
 $assert( true === $GLOBALS['ssi_plan_options']['use_smilies'], 'activate-with-disable-smilies-false-keeps-smilies' );
 $assert( false === ( $activated_off['completed']['runtime_policy']['disable_smilies']['requested'] ?? null ) && false === ( $activated_off['completed']['runtime_policy']['disable_smilies']['applied'] ?? null ), 'disable-smilies-false-not-applied-on-activate' );
 
+// Repeated activating import: use_smilies already false, update_option returns false (unchanged value).
+$GLOBALS['ssi_plan_options']['use_smilies'] = false;
+$receipt_repeat_policy = Static_Site_Importer_WordPress_Site_Plan_Materializer::materialize( $plan, array( 'slug' => 'site-plan', 'overwrite' => true, 'activate' => true, 'site_title' => 'Repeat Policy' ) );
+$assert( 'completed' === $receipt_repeat_policy['status'], 'repeated-activating-import-completes' );
+$assert( true === ( $receipt_repeat_policy['completed']['runtime_policy']['disable_smilies']['requested'] ?? null ) && true === ( $receipt_repeat_policy['completed']['runtime_policy']['disable_smilies']['applied'] ?? null ), 'repeated-activating-import-records-requested-and-applied' );
+$assert( false === $GLOBALS['ssi_plan_options']['use_smilies'], 'repeated-activating-import-keeps-use-smilies-false' );
+
 $repeat = Static_Site_Importer_WordPress_Site_Plan_Materializer::materialize( $plan, array( 'slug' => 'site-plan' ) );
 $assert( 'completed' === $repeat['status'], 'reconciliation repeat completes' );
 $assert( count( $GLOBALS['ssi_plan_posts'] ) === count( $plan['pages'] ), 'reconciliation preserves source page identity' );