Fix image uploads failing due to bad container injection

Author: arunshenoy99

includes/Images/ImageManager.php

@@ -39,20 +39,22 @@ private function initialize_settings( Container $container ) {
 	 * @param Container $container Dependency injection container.
 	 */
 	private function initialize_services( Container $container ) {
-		$this->initialize_upload_listener();
+		$this->initialize_upload_listener( $container );
 		$this->maybe_initialize_lazy_loader();
 		$this->maybe_initialize_bulk_optimizer();
-		$this->maybe_initialize_rest_api();
+		$this->maybe_initialize_rest_api( $container );
 		$this->maybe_initialize_marker();
 		$this->maybe_initialize_image_rewrite_handler( $container );
 		$this->maybe_initialize_image_limit_banner( $container );
 	}
 
 	/**
 	 * Initializes the ImageUploadListener if auto-optimization is enabled.
+	 *
+	 * @param \NewfoldLabs\WP\Container\Container $container Dependency injection container.
 	 */
-	private function initialize_upload_listener() {
-		new ImageUploadListener( ImageSettings::is_auto_delete_enabled() );
+	private function initialize_upload_listener( $container ) {
+		new ImageUploadListener( ImageSettings::is_auto_delete_enabled(), $container );
 	}
 
 	/**
@@ -75,10 +77,12 @@ private function maybe_initialize_bulk_optimizer() {
 
 	/**
 	 * Initializes the REST API routes if accessed via REST and user is an admin.
+	 *
+	 * @param \NewfoldLabs\WP\Container\Container $container Dependency injection container.
 	 */
-	private function maybe_initialize_rest_api() {
+	private function maybe_initialize_rest_api( $container ) {
 		if ( Permissions::rest_is_authorized_admin() ) {
-			new RestApi();
+			new RestApi( $container );
 		}
 	}
 

includes/Images/ImageService.php

@@ -10,6 +10,24 @@
  */
 class ImageService {
 
+	/**
+	 * Dependency injection container.
+	 *
+	 * @var \NewfoldLabs\WP\Container\Container
+	 */
+	protected $container;
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \NewfoldLabs\WP\Container\Container $container Dependency injection container.
+	 */
+	public function __construct( $container ) {
+		$this->container = $container;
+	}
+
+
 	/**
 	 * Cloudflare Worker URL for image optimization.
 	 */
@@ -100,7 +118,7 @@ public function optimize_image( $image_url, $original_file_path ) {
 				'monthlyRequestCount' => $monthly_request_count,
 				'maxRequestsPerMonth' => $monthly_limit,
 			);
-			ImageSettings::update( $settings );
+			ImageSettings::update( $settings, $this->container );
 		}
 
 		// Handle errors from the HTTP request
@@ -219,7 +237,7 @@ private function ban_site() {
 		$settings['bulk_optimization'] = false;
 		$settings['auto_optimized_uploaded_images']['enabled']                    = false;
 		$settings['auto_optimized_uploaded_images']['auto_delete_original_image'] = false;
-		ImageSettings::update( $settings );
+		ImageSettings::update( $settings, $this->container );
 	}
 
 	/**
@@ -488,7 +506,7 @@ public function get_monthly_usage_limit() {
 
 		$settings                  = ImageSettings::get( false );
 		$settings['monthly_usage'] = $body;
-		ImageSettings::update( $settings );
+		ImageSettings::update( $settings, $this->container );
 
 		return $body;
 	}

includes/Images/ImageSettings.php

@@ -441,12 +441,13 @@ public static function get( $call_worker = true ) {
 	/**
 	 * Updates the image optimization settings.
 	 *
-	 * @param array $settings The new settings array.
+	 * @param array                               $settings  The new settings array.
+	 * @param \NewfoldLabs\WP\Container\Container $container Dependency injection container.
 	 *
 	 * @return bool true if the settings were updated successfully, false otherwise.
 	 */
-	public static function update( $settings ) {
-		$instance           = new self();
+	public static function update( $settings, $container ) {
+		$instance           = new self( $container );
 		$sanitized_settings = $instance->sanitize_settings( $settings );
 		return update_option( self::SETTING_KEY, $sanitized_settings );
 	}

includes/Images/ImageUploadListener.php

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

includes/Images/RestApi/ImagesController.php

@@ -10,6 +10,12 @@
  * Provides REST API for single media item optimization.
  */
 class ImagesController {
+	/**
+	 * Dependency injection container.
+	 *
+	 * @var \NewfoldLabs\WP\Container\Container
+	 */
+	protected $container;
 
 	/**
 	 * The REST route namespace.
@@ -25,6 +31,15 @@ class ImagesController {
 	 */
 	protected $rest_base = '/images';
 
+	/**
+	 * Constructor.
+	 *
+	 * @param \NewfoldLabs\WP\Container\Container $container Dependency injection container.
+	 */
+	public function __construct( $container ) {
+		$this->container = $container;
+	}
+
 	/**
 	 * Registers API routes.
 	 */
@@ -74,7 +89,7 @@ public function optimize_image( \WP_REST_Request $request ) {
 			);
 		}
 
-		$image_service    = new ImageService();
+		$image_service    = new ImageService( $this->container );
 		$delete_original  = ImageSettings::is_auto_delete_enabled();
 		$optimized_result = $image_service->optimize_image( $image_url, $file_path );
 

includes/Images/RestApi/RestApi.php

@@ -6,6 +6,12 @@
  * Instantiate controllers and register routes.
  */
 final class RestApi {
+	/**
+	 * Dependency injection container.
+	 *
+	 * @var \NewfoldLabs\WP\Container\Container
+	 */
+	protected $container;
 
 	/**
 	 * List of custom REST API controllers
@@ -18,9 +24,12 @@ final class RestApi {
 
 
 	/**
-	 * Setup the custom REST API
+	 * Setup the custom REST API.
+	 *
+	 * @param \NewfoldLabs\WP\Container\Container $container Dependency injection container.
 	 */
-	public function __construct() {
+	public function __construct( $container ) {
+		$this->container = $container;
 		add_action( 'rest_api_init', array( $this, 'register_routes' ) );
 	}
 
@@ -34,7 +43,7 @@ public function register_routes() {
 			 *
 			 * @var $instance WP_REST_Controller
 			 */
-			$instance = new $controller();
+			$instance = new $controller( $this->container );
 			$instance->register_routes();
 		}
 	}