Merge branch 'main' of https://github.com/newfold-labs/wp-module-performance into fix/link-prefetch

Author: arunshenoy99

includes/Images/ImageManager.php

@@ -54,7 +54,7 @@ private function initialize_services( Container $container ) {
 	 * @param \NewfoldLabs\WP\Container\Container $container Dependency injection container.
 	 */
 	private function initialize_upload_listener( $container ) {
-		new ImageUploadListener( ImageSettings::is_auto_delete_enabled(), $container );
+		new ImageUploadListener( $container, ImageSettings::is_auto_delete_enabled() );
 	}
 
 	/**

includes/Images/ImageUploadListener.php

@@ -26,10 +26,10 @@ class ImageUploadListener {
 	/**
 	 * Constructor to initialize the listener.
 	 *
-	 * @param bool                                $delete_original Whether to delete the original file after optimization.
 	 * @param \NewfoldLabs\WP\Container\Container $container Dependency injection container.
+	 * @param bool                                $delete_original Whether to delete the original file after optimization.
 	 */
-	public function __construct( $delete_original = false, $container ) {
+	public function __construct( $container, $delete_original = false ) {
 		$this->image_service   = new ImageService( $container );
 		$this->delete_original = $delete_original;
 		$this->register_hooks();

includes/Images/WPCLI/ImageCommandHandler.php

@@ -4,6 +4,7 @@
 
 use NewfoldLabs\WP\Module\Performance\NFD_WPCLI;
 use NewfoldLabs\WP\Module\Performance\Images\ImageSettings;
+use function NewfoldLabs\WP\ModuleLoader\container;
 
 /**
  * Handles WP-CLI commands for Image Optimization settings.
@@ -17,6 +18,21 @@ class ImageCommandHandler {
 	 */
 	private const VALID_STATUSES = array( 'on', 'off' );
 
+	/**
+	 * Container.
+	 *
+	 * @var object Container
+	 */
+	private $container;
+
+
+	/**
+	 * Class constructor.
+	 */
+	public function __construct() {
+		$this->container = container();
+	}
+
 	/**
 	 * Toggles the bulk optimization setting.
 	 *
@@ -149,9 +165,9 @@ public function webp_preference( $args ) {
 	public function all( $args ) {
 		$status   = $this->validate_status( isset( $args[0] ) ? $args[0] : null );
 		$enabled  = ( 'on' === $status );
-		$settings = ImageSettings::get();
+		$settings = ImageSettings::get( $this->container );
 		$this->set_all_values( $settings, $enabled );
-		ImageSettings::update( $settings );
+		ImageSettings::update( $settings, $this->container );
 		/* translators: %s is the on/off status. */
 		NFD_WPCLI::success( sprintf( __( 'All image optimization settings have been turned %s.', 'wp-module-performance' ), $status ) );
 	}
@@ -166,7 +182,7 @@ public function all( $args ) {
 	 */
 	private function toggle_setting( $setting, $status ) {
 		$enabled  = ( 'on' === $status );
-		$settings = ImageSettings::get();
+		$settings = ImageSettings::get( $this->container );
 
 		// If a feature is turned on (except for the "all" command), enable overall image optimization.
 		if ( $enabled ) {
@@ -184,7 +200,7 @@ private function toggle_setting( $setting, $status ) {
 			$settings['auto_optimized_uploaded_images']['auto_delete_original_image'] = false;
 		}
 
-		ImageSettings::update( $settings );
+		ImageSettings::update( $settings, $this->container );
 
 		NFD_WPCLI::success(
 			sprintf(