Fix code conflict

wp-media · Feb 17, 2025 · 8febaa1 · 8febaa1
2 parents 6cef87b + af7e84c
commit 8febaa1
Show file tree

Hide file tree

Showing 86 changed files with 5,573 additions and 3,600 deletions.
diff --git a/assets/js/lazyload-scripts.min.js b/assets/js/lazyload-scripts.min.js
diff --git a/dynamic-lists-delayjs.json b/dynamic-lists-delayjs.json
diff --git a/dynamic-lists.json b/dynamic-lists.json
diff --git a/inc/Addon/Cloudflare/ServiceProvider.php b/inc/Addon/Cloudflare/ServiceProvider.php
@@ -20,6 +20,7 @@ class ServiceProvider extends AbstractServiceProvider {
 	 * @var array
 	 */
 	protected $provides = [
+		'cloudflare_api_key_factory',
 		'cloudflare_client',
 		'cloudflare_endpoints',
 		'cloudflare',
@@ -42,26 +43,29 @@ public function provides( string $id ): bool {
 	 * Registers items with the container
 	 */
 	public function register(): void {
-		$options = $this->getContainer()->get( 'options' );
-
-		$this->getContainer()->add( 'cloudflare_auth_factory', APIKeyFactory::class )->addArgument( $options );
+		$this->getContainer()->add( 'cloudflare_api_key_factory', APIKeyFactory::class )->addArgument( 'options' );
 
 		$this->getContainer()->add( 'cloudflare_client', Client::class )
-			->addArgument( $this->getContainer()->get( 'cloudflare_auth_factory' )->create() );
+			->addArgument( $this->getContainer()->get( 'cloudflare_api_key_factory' )->create() );
 		$this->getContainer()->add( 'cloudflare_endpoints', Endpoints::class )
-			->addArgument( $this->getContainer()->get( 'cloudflare_client' ) );
+			->addArgument( 'cloudflare_client' );
 
 		$this->getContainer()->add( 'cloudflare', Cloudflare::class )
-			->addArgument( $options )
-			->addArgument( $this->getContainer()->get( 'cloudflare_endpoints' ) );
+			->addArguments(
+				[
+					'options',
+					'cloudflare_endpoints',
+				]
+			);
 		$this->getContainer()->addShared( 'cloudflare_subscriber', CloudflareSubscriber::class )
-			->addArgument( $this->getContainer()->get( 'cloudflare' ) )
-			->addArgument( $options )
-			->addArgument( $this->getContainer()->get( 'options_api' ) )
-			->addArgument( $this->getContainer()->get( 'cloudflare_auth_factory' ) );
-		$this->getContainer()->addShared(
-			'cloudflare_admin_subscriber',
-			CloudflareAdminSubscriber::class
-		);
+			->addArguments(
+				[
+					'cloudflare',
+					'options',
+					'options_api',
+					'cloudflare_api_key_factory',
+				]
+			);
+		$this->getContainer()->addShared( 'cloudflare_admin_subscriber', CloudflareAdminSubscriber::class );
 	}
 }
diff --git a/inc/Addon/ServiceProvider.php b/inc/Addon/ServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace WP_Rocket\Addon;
 
 use WP_Rocket\Addon\Sucuri\Subscriber as SucuriSubscriber;
@@ -36,20 +38,25 @@ public function provides( string $id ): bool {
 	 * Registers items with the container
 	 */
 	public function register(): void {
-		$options = $this->getContainer()->get( 'options' );
-
-		// Sucuri Addon.
 		$this->getContainer()->addShared( 'sucuri_subscriber', SucuriSubscriber::class )
-			->addArgument( $options );
+			->addArgument( 'options' );
 
 		$this->getContainer()->addShared( 'webp_admin_subscriber', WebPAdminSubscriber::class )
-			->addArgument( $options )
-			->addArgument( $this->getContainer()->get( 'cdn_subscriber' ) )
-			->addArgument( $this->getContainer()->get( 'beacon' ) );
+			->addArguments(
+				[
+					'options',
+					'cdn_subscriber',
+					'beacon',
+				]
+			);
 
 		$this->getContainer()->addShared( 'webp_subscriber', WebPSubscriber::class )
-			->addArgument( $options )
-			->addArgument( $this->getContainer()->get( 'options_api' ) )
-			->addArgument( $this->getContainer()->get( 'cdn_subscriber' ) );
+			->addArguments(
+				[
+					'options',
+					'options_api',
+					'cdn_subscriber',
+				]
+			);
 	}
 }
diff --git a/inc/Addon/Varnish/ServiceProvider.php b/inc/Addon/Varnish/ServiceProvider.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace WP_Rocket\Addon\Varnish;
 
 use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
@@ -36,7 +38,11 @@ public function provides( string $id ): bool {
 	public function register(): void {
 		$this->getContainer()->add( 'varnish', Varnish::class );
 		$this->getContainer()->addShared( 'varnish_subscriber', Subscriber::class )
-			->addArgument( $this->getContainer()->get( 'varnish' ) )
-			->addArgument( $this->getContainer()->get( 'options' ) );
+			->addArguments(
+				[
+					'varnish',
+					'options',
+				]
+			);
 	}
 }
diff --git a/inc/Engine/Activation/Activation.php b/inc/Engine/Activation/Activation.php
@@ -3,6 +3,7 @@
 namespace WP_Rocket\Engine\Activation;
 
 use WP_Rocket\Admin\Options;
+use WP_Rocket\Dependencies\League\Container\Argument\Literal\StringArgument;
 use WP_Rocket\Dependencies\League\Container\Container;
 use WP_Rocket\Engine\Common\PerformanceHints\Activation\ServiceProvider as PerformanceHintsActivationServiceProvider;
 use WP_Rocket\Engine\License\ServiceProvider as LicenseServiceProvider;
@@ -44,7 +45,7 @@ public static function activate_plugin() {
 		$container     = new Container();
 		$event_manager = new Event_Manager();
 
-		$container->add( 'template_path', WP_ROCKET_PATH . 'views' );
+		$container->add( 'template_path', new StringArgument( rocket_get_constant( 'WP_ROCKET_PATH', '' ) . 'views' ) );
 		$options_api = new Options( 'wp_rocket_' );
 		$container->add( 'options_api', $options_api );
 		$container->addServiceProvider( new OptionsServiceProvider() );

diff --git a/inc/Engine/Activation/ServiceProvider.php b/inc/Engine/Activation/ServiceProvider.php
@@ -1,6 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace WP_Rocket\Engine\Activation;
 
+use WP_Rocket\Dependencies\League\Container\Argument\Literal\StringArgument;
 use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
 use WP_Rocket\Dependencies\League\Container\ServiceProvider\BootableServiceProviderInterface;
 use WP_Rocket\Engine\Cache\AdvancedCache;
@@ -53,8 +56,12 @@ public function register(): void {
 		$filesystem = rocket_direct_filesystem();
 
 		$this->getContainer()->add( 'advanced_cache', AdvancedCache::class )
-			->addArgument( $this->getContainer()->get( 'template_path' ) . '/cache/' )
-			->addArgument( $filesystem );
+			->addArguments(
+				[
+					new StringArgument( $this->getContainer()->get( 'template_path' ) . '/cache/' ),
+					$filesystem,
+				]
+			);
 		$this->getContainer()->add( 'capabilities_manager', Manager::class );
 		$this->getContainer()->add( 'wp_cache', WPCache::class )
 			->addArgument( $filesystem );

diff --git a/inc/Engine/Admin/API/ServiceProvider.php b/inc/Engine/Admin/API/ServiceProvider.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace WP_Rocket\Engine\Admin\API;
 

diff --git a/inc/Engine/Admin/Beacon/ServiceProvider.php b/inc/Engine/Admin/Beacon/ServiceProvider.php
@@ -1,6 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace WP_Rocket\Engine\Admin\Beacon;
 
+use WP_Rocket\Dependencies\League\Container\Argument\Literal\StringArgument;
 use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
 
 /**
@@ -34,8 +37,12 @@ public function provides( string $id ): bool {
 	 */
 	public function register(): void {
 		$this->getContainer()->addShared( 'beacon', Beacon::class )
-			->addArgument( $this->getContainer()->get( 'options' ) )
-			->addArgument( $this->getContainer()->get( 'template_path' ) . '/settings' )
-			->addArgument( $this->getContainer()->get( 'support_data' ) );
+			->addArguments(
+				[
+					'options',
+					new StringArgument( $this->getContainer()->get( 'template_path' ) . '/settings' ),
+					'support_data',
+				]
+			);
 	}
 }
diff --git a/inc/Engine/Admin/Database/ServiceProvider.php b/inc/Engine/Admin/Database/ServiceProvider.php
@@ -1,6 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace WP_Rocket\Engine\Admin\Database;
 
+use WP_Rocket\Admin\Options_Data;
 use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
 
 /**
@@ -37,9 +40,13 @@ public function provides( string $id ): bool {
 	public function register(): void {
 		$this->getContainer()->add( 'db_optimization_process', OptimizationProcess::class );
 		$this->getContainer()->add( 'db_optimization', Optimization::class )
-			->addArgument( $this->getContainer()->get( 'db_optimization_process' ) );
+			->addArgument( 'db_optimization_process' );
 		$this->getContainer()->addShared( 'db_optimization_subscriber', Subscriber::class )
-			->addArgument( $this->getContainer()->get( 'db_optimization' ) )
-			->addArgument( $this->getContainer()->get( 'options' ) );
+			->addArguments(
+				[
+					'db_optimization',
+					'options',
+				]
+			);
 	}
 }
diff --git a/inc/Engine/Admin/DomainChange/ServiceProvider.php b/inc/Engine/Admin/DomainChange/ServiceProvider.php
@@ -1,8 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace WP_Rocket\Engine\Admin\DomainChange;
 
 use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
+
 use WP_Rocket\Engine\Common\Ajax\AjaxHandler;
 
 class ServiceProvider extends AbstractServiceProvider {
@@ -34,8 +36,12 @@ public function provides( string $id ): bool {
 	 */
 	public function register(): void {
 		$this->getContainer()->add( 'ajax_handler', AjaxHandler::class );
-		$this->getContainer()->add( 'domain_change_subscriber', Subscriber::class )
-			->addArgument( $this->getContainer()->get( 'ajax_handler' ) )
-			->addArgument( $this->getContainer()->get( 'beacon' ) );
+		$this->getContainer()->addShared( 'domain_change_subscriber', Subscriber::class )
+			->addArguments(
+				[
+					'ajax_handler',
+					'beacon',
+				]
+			);
 	}
 }
diff --git a/inc/Engine/Admin/ServiceProvider.php b/inc/Engine/Admin/ServiceProvider.php
@@ -1,7 +1,10 @@
 <?php
+declare(strict_types=1);
+
 namespace WP_Rocket\Engine\Admin;
 
 use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
+use WP_Rocket\Dependencies\League\Container\Argument\Literal\StringArgument;
 use WP_Rocket\Engine\Admin\Deactivation\{DeactivationIntent, Subscriber};
 use WP_Rocket\Engine\Admin\Metaboxes\PostEditOptionsSubscriber;
 use WP_Rocket\ThirdParty\Plugins\Optimization\Hummingbird;
@@ -40,19 +43,25 @@ public function provides( string $id ): bool {
 	 * @return void
 	 */
 	public function register(): void {
-		$options = $this->getContainer()->get( 'options' );
-
 		$this->getContainer()->add( 'deactivation_intent', DeactivationIntent::class )
-			->addArgument( $this->getContainer()->get( 'template_path' ) . '/deactivation-intent' )
-			->addArgument( $this->getContainer()->get( 'options_api' ) )
-			->addArgument( $options );
+			->addArguments(
+				[
+					new StringArgument( $this->getContainer()->get( 'template_path' ) . '/deactivation-intent' ),
+					'options_api',
+					'options',
+				]
+			);
 		$this->getContainer()->addShared( 'deactivation_intent_subscriber', Subscriber::class )
 			->addArgument( $this->getContainer()->get( 'deactivation_intent' ) );
 		$this->getContainer()->addShared( 'hummingbird_subscriber', Hummingbird::class )
-			->addArgument( $options );
+			->addArgument( 'options' );
 		$this->getContainer()->addShared( 'actionscheduler_admin_subscriber', ActionSchedulerSubscriber::class );
 		$this->getContainer()->addShared( 'post_edit_options_subscriber', PostEditOptionsSubscriber::class )
-			->addArgument( $options )
-			->addArgument( $this->getContainer()->get( 'template_path' ) . '/metaboxes' );
+			->addArguments(
+				[
+					'options',
+					new StringArgument( $this->getContainer()->get( 'template_path' ) . '/metaboxes' ),
+				]
+			);
 	}
 }
diff --git a/inc/Engine/Admin/Settings/ServiceProvider.php b/inc/Engine/Admin/Settings/ServiceProvider.php
@@ -1,6 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace WP_Rocket\Engine\Admin\Settings;
 
+use WP_Rocket\Dependencies\League\Container\Argument\Literal\{ArrayArgument, StringArgument};
 use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
 use WP_Rocket\Dependencies\WPMedia\PluginFamily\Model\PluginFamily as PluginFamilyModel;
 use WP_Rocket\Dependencies\WPMedia\PluginFamily\Controller\PluginFamily as PluginFamilyController;
@@ -15,6 +18,8 @@ class ServiceProvider extends AbstractServiceProvider {
 	 * @var array
 	 */
 	protected $provides = [
+		'plugin_family_model',
+		'plugin_family_controller',
 		'settings',
 		'settings_render',
 		'settings_page',
@@ -42,28 +47,38 @@ public function register(): void {
 		$this->getContainer()->add( 'plugin_family_controller', PluginFamilyController::class );
 
 		$this->getContainer()->add( 'settings', Settings::class )
-			->addArgument( $this->getContainer()->get( 'options' ) );
+			->addArgument( 'options' );
 		$this->getContainer()->add( 'settings_render', Render::class )
 			->addArguments(
 				[
-					$this->getContainer()->get( 'template_path' ) . '/settings',
+					new StringArgument( $this->getContainer()->get( 'template_path' ) . '/settings' ),
 					'plugin_family_model',
 				]
 			);
 		$this->getContainer()->add( 'settings_page', Page::class )
-			->addArgument( $this->getContainer()->get( 'settings_page_config' ) )
-			->addArgument( $this->getContainer()->get( 'settings' ) )
-			->addArgument( $this->getContainer()->get( 'settings_render' ) )
-			->addArgument( $this->getContainer()->get( 'beacon' ) )
-			->addArgument( $this->getContainer()->get( 'db_optimization' ) )
-			->addArgument( $this->getContainer()->get( 'user_client' ) )
-			->addArgument( $this->getContainer()->get( 'delay_js_sitelist' ) )
-			->addArgument( $this->getContainer()->get( 'template_path' ) )
-			->addArgument( $this->getContainer()->get( 'options' ) );
+			->addArguments(
+				[
+					new ArrayArgument(
+						[
+							'slug'       => WP_ROCKET_PLUGIN_SLUG,
+							'title'      => WP_ROCKET_PLUGIN_NAME,
+							'capability' => 'rocket_manage_options',
+						]
+					),
+					'settings',
+					'settings_render',
+					'beacon',
+					'db_optimization',
+					'user_client',
+					'delay_js_sitelist',
+					'template_path',
+					'options',
+				]
+			);
 		$this->getContainer()->addShared( 'settings_page_subscriber', Subscriber::class )
 			->addArguments(
 				[
-					$this->getContainer()->get( 'settings_page' ),
+					'settings_page',
 					'plugin_family_controller',
 				]
 			);