fix container fatal errors with activation and deactivation

wp-media · Apr 17, 2024 · cd4facf · cd4facf
1 parent abee9d8
commit cd4facf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/inc/Engine/Activation/Activation.php b/inc/Engine/Activation/Activation.php
@@ -4,8 +4,10 @@
 
 use WP_Rocket\Admin\Options;
 use WP_Rocket\Dependencies\League\Container\Container;
-use WP_Rocket\Event_Management\Event_Manager;
+use WP_Rocket\ServiceProvider\Options as OptionsServiceProvider;
+use WP_Rocket\Engine\Preload\Activation\ServiceProvider as PreloadActivationServiceProvider;
 use WP_Rocket\ThirdParty\Hostings\HostResolver;
+use WP_Rocket\ThirdParty\Hostings\ServiceProvider as HostingsServiceProvider;
 
 /**
  * Plugin activation controller
@@ -37,10 +39,10 @@ public static function activate_plugin() {
 		$container->add( 'template_path', WP_ROCKET_PATH . 'views' );
 		$options_api = new Options( 'wp_rocket_' );
 		$container->add( 'options_api', $options_api );
-		$container->addServiceProvider( \WP_Rocket\ServiceProvider\Options::class );
-		$container->addServiceProvider( \WP_Rocket\Engine\Preload\Activation\ServiceProvider::class );
-		$container->addServiceProvider( ServiceProvider::class );
-		$container->addServiceProvider( \WP_Rocket\ThirdParty\Hostings\ServiceProvider::class );
+		$container->addServiceProvider( new OptionsServiceProvider() );
+		$container->addServiceProvider( new PreloadActivationServiceProvider() );
+		$container->addServiceProvider( new ServiceProvider() );
+		$container->addServiceProvider( new HostingsServiceProvider() );
 
 		$host_type = HostResolver::get_host_service();
 

diff --git a/inc/Engine/Deactivation/Deactivation.php b/inc/Engine/Deactivation/Deactivation.php
@@ -8,6 +8,7 @@
 use WP_Rocket\Engine\Support\ServiceProvider as SupportServiceProvider;
 use WP_Rocket\ServiceProvider\Options as OptionsServiceProvider;
 use WP_Rocket\ThirdParty\Hostings\HostResolver;
+use WP_Rocket\ThirdParty\Hostings\ServiceProvider as HostingsServiceProvider;
 
 class Deactivation {
 	/**
@@ -35,12 +36,12 @@ public static function deactivate_plugin() {
 		$container->add( 'options_api', new Options( 'wp_rocket_' ) );
 		$container->add( 'template_path', WP_ROCKET_PATH . 'views' );
 
-		$container->addServiceProvider( OptionsServiceProvider::class );
-		$container->addServiceProvider( BeaconServiceProvider::class );
-		$container->addServiceProvider( SupportServiceProvider::class );
+		$container->addServiceProvider( new OptionsServiceProvider() );
+		$container->addServiceProvider( new BeaconServiceProvider() );
+		$container->addServiceProvider( new SupportServiceProvider() );
 
-		$container->addServiceProvider( 'WP_Rocket\Engine\Deactivation\ServiceProvider' );
-		$container->addServiceProvider( 'WP_Rocket\ThirdParty\Hostings\ServiceProvider' );
+		$container->addServiceProvider( new ServiceProvider() );
+		$container->addServiceProvider( new HostingsServiceProvider() );
 
 		$host_type = HostResolver::get_host_service();