chore: add support for 'themeisle_log_event'

Author: Soare-Robert-Daniel

includes/admin/feedzy-rss-feeds-log.php

@@ -269,7 +269,7 @@ public function set_context( array $context ) {
 	 */
 	public static function log( $level, $message, array $context = array() ) {
 		$instance = self::get_instance();
-		$instance->write_log( $level, $message, $context );
+		$instance->add_log_record( $level, $message, $context );
 	}
 
 	/**
@@ -281,15 +281,11 @@ public static function log( $level, $message, array $context = array() ) {
 	 * @param array<string, mixed> $context The log context.
 	 * @return void
 	 */
-	private function write_log( $level, $message, array $context = array() ) {
+	private function add_log_record( $level, $message, array $context = array() ) {
 		if ( self::ERROR === $level ) {
 			$this->increment_log_stat( 'error_count' );
 			$this->try_accumulate_error_message( $message );
 		}
-		
-		if ( ! $this->filesystem ) {
-			return;
-		}
 
 		if ( $this->level_threshold > $level ) {
 			return;
@@ -307,33 +303,65 @@ private function write_log( $level, $message, array $context = array() ) {
 			}
 		}
 
-		$record = array(
+		$log_entry = array(
 			'timestamp' => gmdate( 'c' ),
 			'level'     => isset( self::$levels[ $level ] ) ? self::$levels[ $level ] : 'UNKNOWN',
 			'message'   => $message,
 			'context'   => $merged_context,
 		);
 
 		if ( wp_doing_ajax() ) {
-			$record['doing_ajax'] = true;
+			$log_entry['doing_ajax'] = true;
 		}
 
 		if ( wp_doing_cron() ) {
-			$record['doing_cron'] = true;
+			$log_entry['doing_cron'] = true;
+		}
+
+		$this->append_log_to_file( $log_entry );
+	}
+
+	/**
+	 * Append the log to the log file.
+	 * 
+	 * @param array<string, mixed> $log_entry The log entry to append.
+	 * @return void
+	 */
+	public function append_log_to_file( $log_entry ) {
+		if ( ! $this->filesystem ) {
+			return;
 		}
-		
-		// Write log entry
-		$formatted = wp_json_encode( $record, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ) . PHP_EOL;
 
 		// Ensure the directory exists before writing.
 		$log_dir = dirname( $this->filepath );
 		if ( ! $this->filesystem->is_dir( $log_dir ) ) {
 			$this->setup_log_directory();
 		}
 
+		$formatted = wp_json_encode( $log_entry, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ) . PHP_EOL;
+
 		error_log( $formatted, 3, $this->filepath );
 	}
 
+	/**
+	 * Fallback method to append log to ThemeIsle's logging system.
+	 *
+	 * @param array<string, mixed> $log_entry Log entry to append.
+	 * @return void
+	 */
+	public function append_to_themeisle_log( $log_entry ) {
+
+		$formatted_message = $log_entry['message'];
+		if ( ! empty( $log_entry['context'] ) ) {
+			$formatted_message .= ' ' . wp_json_encode( $log_entry['context'], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE );
+		}
+
+		$function_signature = isset( $log_entry['context']['function'] ) ? $log_entry['context']['function'] : 'unknown';
+		$line_number        = isset( $log_entry['context']['line'] ) ? $log_entry['context']['line'] : null;
+
+		do_action( 'themeisle_log_event', FEEDZY_NAME, $formatted_message, $log_entry['level'], $function_signature, $line_number );
+	}
+
 	/**
 	 * Determine the caller origin (Class::method() or function()) for the current log entry,
 	 * returning both the function signature and source line number.

tests/test-log.php

@@ -54,19 +54,32 @@ private function assertIsType( $type, $value, $message = '' ) {
 		}
 	}
 
+	/**
+	 * Reset the logger singleton to ensure fresh state per test.
+	 */
+	private function reset_logger_singleton() {
+		if ( class_exists( 'Feedzy_Rss_Feeds_Log' ) ) {
+			$ref  = new ReflectionClass( 'Feedzy_Rss_Feeds_Log' );
+			if ( $ref->hasProperty( 'instance' ) ) {
+				$prop = $ref->getProperty( 'instance' );
+				$prop->setAccessible( true );
+				$prop->setValue( null, null );
+			}
+		}
+	}
+
 	/**
 	 * Set up test environment.
 	 */
 	public function setUp(): void {
 		parent::setUp();
 
-		// Create a fresh logger instance for each test
+		// Ensure fresh singleton for each test.
+		$this->reset_logger_singleton();
 		$this->logger = Feedzy_Rss_Feeds_Log::get_instance();
 
-		// Set up test log directory
-		$upload_dir = wp_upload_dir();
-		$test_log_dir = $upload_dir['basedir'] . '/feedzy-logs';
-		$this->test_log_path = $test_log_dir . '/feedzy.jsonl';
+		// Use the class API to determine the log path.
+		$this->test_log_path = $this->logger->get_log_file_path();
 
 		// Clean up any existing log files
 		if ( file_exists( $this->test_log_path ) ) {
@@ -92,6 +105,9 @@ public function tearDown(): void {
 		// Reset options
 		delete_option( Feedzy_Rss_Feeds_Log::STATS_OPTION_KEY );
 		delete_option( 'feedzy-settings' );
+
+		// Reset the singleton to avoid side effects between tests.
+		$this->reset_logger_singleton();
 
 		parent::tearDown();
 	}
@@ -219,6 +235,10 @@ public function test_context_setting() {
 		$logs = $this->logger->get_recent_logs( 1 );
 		$this->assertEquals( 123, $logs[0]['context']['import_id'] );
 		$this->assertEquals( 'https://example.com/feed.xml', $logs[0]['context']['feed_url'] );
+
+		// New: origin should be auto-injected.
+		$this->assertArrayHasKey( 'function', $logs[0]['context'] );
+		$this->assertArrayHasKey( 'line', $logs[0]['context'] );
 	}
 
 	/**
@@ -237,8 +257,8 @@ public function test_log_entry_structure() {
 		$this->assertArrayHasKey( 'message', $log );
 		$this->assertArrayHasKey( 'context', $log );
 
-		// Validate timestamp format (ISO 8601)
-		$this->assertMatchesRegularExpression( '/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}$/', $log['timestamp'] );
+		// Validate timestamp format (ISO 8601, allow Z or explicit offset)
+		$this->assertMatchesRegularExpression( '/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\+\d{2}:\d{2}|Z)$/', $log['timestamp'] );
 	}
 
 	/**
@@ -376,8 +396,9 @@ public function test_email_configuration() {
 		);
 		update_option( 'feedzy-settings', $settings );
 
-		// Recreate logger to pick up new settings
-		$this->logger = new Feedzy_Rss_Feeds_Log();
+		// Recreate logger singleton to pick up new settings
+		$this->reset_logger_singleton();
+		$this->logger = Feedzy_Rss_Feeds_Log::get_instance();
 
 		$this->assertTrue( $this->logger->can_send_email() );
 		$this->assertEquals( '[email protected]', $this->logger->get_email_address() );
@@ -428,7 +449,8 @@ public function test_settings_initialization() {
 		update_option( 'feedzy-settings', $settings );
 
 		// Create new logger instance to test initialization
-		$logger = new Feedzy_Rss_Feeds_Log();
+		$this->reset_logger_singleton();
+		$logger = Feedzy_Rss_Feeds_Log::get_instance();
 
 		$this->assertEquals( Feedzy_Rss_Feeds_Log::DEBUG, $logger->level_threshold );
 		$this->assertTrue( $logger->can_send_email );
@@ -447,7 +469,8 @@ public function test_invalid_settings_values() {
 		);
 		update_option( 'feedzy-settings', $settings );
 
-		$logger = new Feedzy_Rss_Feeds_Log();
+		$this->reset_logger_singleton();
+		$logger = Feedzy_Rss_Feeds_Log::get_instance();
 
 		// Should fallback to default ERROR level
 		$this->assertEquals( Feedzy_Rss_Feeds_Log::ERROR, $logger->level_threshold );