refactor(cli): refactor CLI registration and improve optimization handling

- Convert CLI class to use static registration method
- Add proper return value handling for optimization results
- Integrate CLI initialization into base WP class hook system
- Add is_cli() helper method to base class
- Improve optimization counting by checking success results
- Add documentation for optimize_attachment method return type

Author: tijmenbruggeman

src/class-tiny-cli.php

@@ -19,25 +19,8 @@
 */
 
 class Tiny_Cli {
-
-	/**
-	 * Tinify Settings
-	 *
-	 * @var Tiny_Settings
-	 */
-	private $tiny_settings;
-
-	public function __construct( $settings ) {
-		$this->tiny_settings = $settings;
-
-		// Only add CLI hooks when WP-CLI is available
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			add_action( 'cli_init', array( $this, 'register_command' ) );
-		}
-	}
-
-	public function register_command() {
-		$command_instance = new Tiny_Command( $this->tiny_settings );
+	public static function register_command( $settings ) {
+		$command_instance = new Tiny_Command( $settings );
 		WP_CLI::add_command( 'tiny', $command_instance );
 	}
 }
@@ -105,8 +88,10 @@ public function optimize( $args, $assoc_args ) {
 			}
 
 			try {
-				$this->optimize_attachment( $attachment_id );
-				$optimized++;
+				$result = $this->optimize_attachment( $attachment_id );
+				if ( isset( $result['success'] ) && $result['success'] > 0 ) {
+					$optimized++;
+				}
 			} catch ( Exception $e ) {
 				WP_CLI::warning(
 					'skipping - error: ' .
@@ -140,9 +125,14 @@ private function get_unoptimized_attachments() {
 		return $ids;
 	}
 
+	/**
+	 * Will process an attachment for optimization
+	 *
+	 * @return array{ success: int, failed: int }
+	 */
 	private function optimize_attachment( $attachment_id ) {
 		$tiny_image = new Tiny_Image( $this->tiny_settings, $attachment_id );
-		$tiny_image->compress();
+		return $tiny_image->compress();
 	}
 
 	private function is_valid_attachment( $attachment_id ) {

src/class-tiny-plugin.php

@@ -66,13 +66,15 @@ public function init() {
 			dirname( plugin_basename( __FILE__ ) ) . '/languages'
 		);
 
-		new Tiny_CLI( $this->settings );
-
 		if ( $this->settings->get_conversion_enabled() ) {
 			new Tiny_Picture( ABSPATH, array( get_site_url() ) );
 		}
 	}
 
+	public function cli_init() {
+		Tiny_CLI::register_command( $this->settings );
+	}
+
 	public function ajax_init() {
 		add_filter( 'wp_ajax_tiny_async_optimize_upload_new_media',
 			$this->get_method( 'compress_on_upload' )

src/class-tiny-settings.php

@@ -50,6 +50,13 @@ public function xmlrpc_init() {
 		}
 	}
 
+	public function cli_init() {
+		try {
+			$this->init_compressor();
+		} catch ( Tiny_Exception $e ) {
+		}
+	}
+
 	public function ajax_init() {
 		try {
 			$this->init_compressor();

src/class-tiny-wp-base.php

@@ -49,6 +49,10 @@ protected function doing_ajax_request() {
 		return defined( 'DOING_AJAX' ) && DOING_AJAX;
 	}
 
+	protected function is_cli() {
+		return defined( 'WP_CLI' ) && WP_CLI;
+	}
+
 	protected static function get_prefixed_name( $name ) {
 		return self::PREFIX . $name;
 	}
@@ -65,6 +69,10 @@ public function __construct() {
 			add_action( 'admin_init', $this->get_method( 'admin_init' ) );
 			add_action( 'admin_menu', $this->get_method( 'admin_menu' ) );
 		}
+
+		if ( self::is_cli() ) {
+			add_action( 'cli_init', $this->get_method( 'cli_init' ) );
+		}
 	}
 
 	protected function get_method( $name ) {
@@ -100,4 +108,7 @@ public function admin_menu() {
 
 	public function rest_init() {
 	}
+
+	public function cli_init() {
+	}
 }