Skip to content

Commit

Permalink
Closes #6413 Remove tags from services (#6977)
Browse files Browse the repository at this point in the history
  • Loading branch information
remyperona authored Sep 18, 2024
1 parent a0f3dec commit de60b47
Show file tree
Hide file tree
Showing 28 changed files with 100 additions and 201 deletions.
3 changes: 1 addition & 2 deletions inc/Addon/Cloudflare/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ public function register(): void {
->addArgument( $this->getContainer()->get( 'cloudflare' ) )
->addArgument( $options )
->addArgument( $this->getContainer()->get( 'options_api' ) )
->addArgument( $this->getContainer()->get( 'cloudflare_auth_factory' ) )
->addTag( 'cloudflare_subscriber' );
->addArgument( $this->getContainer()->get( 'cloudflare_auth_factory' ) );
$this->getContainer()->addShared(
'cloudflare_admin_subscriber',
CloudflareAdminSubscriber::class
Expand Down
9 changes: 3 additions & 6 deletions inc/Addon/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,16 @@ public function register(): void {

// Sucuri Addon.
$this->getContainer()->addShared( 'sucuri_subscriber', SucuriSubscriber::class )
->addArgument( $options )
->addTag( 'common_subscriber' );
->addArgument( $options );

$this->getContainer()->addShared( 'webp_admin_subscriber', WebPAdminSubscriber::class )
->addArgument( $options )
->addArgument( $this->getContainer()->get( 'cdn_subscriber' ) )
->addArgument( $this->getContainer()->get( 'beacon' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'beacon' ) );

$this->getContainer()->addShared( 'webp_subscriber', WebPSubscriber::class )
->addArgument( $options )
->addArgument( $this->getContainer()->get( 'options_api' ) )
->addArgument( $this->getContainer()->get( 'cdn_subscriber' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'cdn_subscriber' ) );
}
}
3 changes: 1 addition & 2 deletions inc/Addon/Varnish/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ 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' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'options' ) );
}
}
3 changes: 1 addition & 2 deletions inc/Engine/Admin/Beacon/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ 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' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'support_data' ) );
}
}
3 changes: 1 addition & 2 deletions inc/Engine/Admin/Database/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public function register(): void {
->addArgument( $this->getContainer()->get( 'db_optimization_process' ) );
$this->getContainer()->addShared( 'db_optimization_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'db_optimization' ) )
->addArgument( $this->getContainer()->get( 'options' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'options' ) );
}
}
9 changes: 3 additions & 6 deletions inc/Engine/Admin/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,12 @@ public function register(): void {
->addArgument( $this->getContainer()->get( 'options_api' ) )
->addArgument( $options );
$this->getContainer()->addShared( 'deactivation_intent_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'deactivation_intent' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'deactivation_intent' ) );
$this->getContainer()->addShared( 'hummingbird_subscriber', Hummingbird::class )
->addArgument( $options )
->addTag( 'admin_subscriber' );
->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' )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'template_path' ) . '/metaboxes' );
}
}
3 changes: 1 addition & 2 deletions inc/Engine/Admin/Settings/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public function register(): void {
->addArgument( $this->getContainer()->get( 'template_path' ) )
->addArgument( $this->getContainer()->get( 'options' ) );
$this->getContainer()->addShared( 'settings_page_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'settings_page' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'settings_page' ) );
}
}
12 changes: 4 additions & 8 deletions inc/Engine/CDN/RocketCDN/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,21 @@ public function register(): void {
// RocketCDN Data manager subscriber.
$this->getContainer()->addShared( 'rocketcdn_data_manager_subscriber', DataManagerSubscriber::class )
->addArgument( $this->getContainer()->get( 'rocketcdn_api_client' ) )
->addArgument( $this->getContainer()->get( 'rocketcdn_options_manager' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'rocketcdn_options_manager' ) );
// RocketCDN REST API Subscriber.
$this->getContainer()->addShared( 'rocketcdn_rest_subscriber', RESTSubscriber::class )
->addArgument( $this->getContainer()->get( 'rocketcdn_options_manager' ) )
->addArgument( $options )
->addTag( 'common_subscriber' );
->addArgument( $options );
// RocketCDN Notices Subscriber.
$this->getContainer()->addShared( 'rocketcdn_notices_subscriber', NoticesSubscriber::class )
->addArgument( $this->getContainer()->get( 'rocketcdn_api_client' ) )
->addArgument( $this->getContainer()->get( 'beacon' ) )
->addArgument( __DIR__ . '/views' )
->addTag( 'admin_subscriber' );
->addArgument( __DIR__ . '/views' );
// RocketCDN settings page subscriber.
$this->getContainer()->addShared( 'rocketcdn_admin_subscriber', AdminPageSubscriber::class )
->addArgument( $this->getContainer()->get( 'rocketcdn_api_client' ) )
->addArgument( $options )
->addArgument( $this->getContainer()->get( 'beacon' ) )
->addArgument( __DIR__ . '/views' )
->addTag( 'admin_subscriber' );
->addArgument( __DIR__ . '/views' );
}
}
6 changes: 2 additions & 4 deletions inc/Engine/CDN/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ public function register(): void {
->addArgument( $options );
$this->getContainer()->addShared( 'cdn_subscriber', Subscriber::class )
->addArgument( $options )
->addArgument( $this->getContainer()->get( 'cdn' ) )
->addTag( 'common_subscriber' );
$this->getContainer()->addShared( 'cdn_admin_subscriber', AdminSubscriber::class )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'cdn' ) );
$this->getContainer()->addShared( 'cdn_admin_subscriber', AdminSubscriber::class );
}
}
12 changes: 4 additions & 8 deletions inc/Engine/Cache/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,18 @@ public function register(): void {
->addArgument( $cache_query );
$this->getContainer()->addShared( 'purge_actions_subscriber', PurgeActionsSubscriber::class )
->addArgument( $this->getContainer()->get( 'options' ) )
->addArgument( $this->getContainer()->get( 'purge' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'purge' ) );
$this->getContainer()->addShared( 'admin_cache_subscriber', AdminSubscriber::class )
->addArgument( $this->getContainer()->get( 'advanced_cache' ) )
->addArgument( $this->getContainer()->get( 'wp_cache' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'wp_cache' ) );

$this->getContainer()->add( 'expired_cache_purge', PurgeExpiredCache::class )
->addArgument( rocket_get_constant( 'WP_ROCKET_CACHE_PATH' ) );
$this->getContainer()->addShared( 'expired_cache_purge_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'options' ) )
->addArgument( $this->getContainer()->get( 'expired_cache_purge' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'expired_cache_purge' ) );
$this->getContainer()->add( 'cache_config', ConfigSubscriber::class )
->addArgument( $this->getContainer()->get( 'options' ) )
->addArgument( $this->getContainer()->get( 'options_api' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'options_api' ) );
}
}
3 changes: 1 addition & 2 deletions inc/Engine/Capabilities/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public function provides( string $id ): bool {
public function register(): void {
$this->getContainer()->add( 'capabilities_manager', Manager::class );
$this->getContainer()->addShared( 'capabilities_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'capabilities_manager' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'capabilities_manager' ) );
}
}
9 changes: 3 additions & 6 deletions inc/Engine/CriticalPath/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ public function register(): void {
->addArgument( $processor_service )
->addArgument( $options );
$this->getContainer()->addShared( 'rest_cpcss_subscriber', RESTCSSSubscriber::class )
->addArgument( $this->getContainer()->get( 'rest_cpcss_wp_post' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'rest_cpcss_wp_post' ) );
// REST CPCSS END.

$this->getContainer()->add( 'critical_css_generation', CriticalCSSGeneration::class )
Expand All @@ -86,8 +85,7 @@ public function register(): void {
->addArgument( $options )
->addArgument( $this->getContainer()->get( 'options_api' ) )
->addArgument( $this->getContainer()->get( 'user' ) )
->addArgument( $filesystem )
->addTag( 'common_subscriber' );
->addArgument( $filesystem );

$this->getContainer()->add( 'cpcss_post', Post::class )
->addArgument( $options )
Expand All @@ -105,7 +103,6 @@ public function register(): void {
$this->getContainer()->addShared( 'critical_css_admin_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'cpcss_post' ) )
->addArgument( $this->getContainer()->get( 'cpcss_settings' ) )
->addArgument( $this->getContainer()->get( 'cpcss_admin' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'cpcss_admin' ) );
}
}
3 changes: 1 addition & 2 deletions inc/Engine/Deactivation/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ public function register(): void {
->addArgument( $this->getContainer()->get( 'options' ) )
->addArgument( $this->getContainer()->get( 'options_api' ) )
->addArgument( $this->getContainer()->get( 'beacon' ) )
->addArgument( $this->getContainer()->get( 'cloudflare_plugin_facade' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'cloudflare_plugin_facade' ) );

$this->getContainer()->add( 'advanced_cache', AdvancedCache::class )
->addArgument( $this->getContainer()->get( 'template_path' ) . '/cache/' )
Expand Down
6 changes: 2 additions & 4 deletions inc/Engine/HealthCheck/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ public function provides( string $id ): bool {
*/
public function register(): void {
$this->getContainer()->addShared( 'health_check', HealthCheck::class )
->addArgument( $this->getContainer()->get( 'options' ) )
->addTag( 'admin_subscriber' );
$this->getContainer()->addShared( 'action_scheduler_check', ActionSchedulerCheck::class )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'options' ) );
$this->getContainer()->addShared( 'action_scheduler_check', ActionSchedulerCheck::class );
}
}
3 changes: 1 addition & 2 deletions inc/Engine/Heartbeat/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public function provides( string $id ): bool {
*/
public function register(): void {
$this->getContainer()->addShared( 'heartbeat_subscriber', HeartbeatSubscriber::class )
->addArgument( $this->getContainer()->get( 'options' ) )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'options' ) );
}
}
3 changes: 1 addition & 2 deletions inc/Engine/License/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public function register(): void {
->addArgument( $views );
$this->getContainer()->addShared( 'license_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'upgrade' ) )
->addArgument( $this->getContainer()->get( 'renewal' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'renewal' ) );
}
}
15 changes: 5 additions & 10 deletions inc/Engine/Media/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,16 @@ public function register(): void {
->addArgument( $options )
->addArgument( $this->getContainer()->get( 'lazyload_assets' ) )
->addArgument( $this->getContainer()->get( 'lazyload_image' ) )
->addArgument( $this->getContainer()->get( 'lazyload_iframe' ) )
->addTag( 'lazyload_subscriber' );
$this->getContainer()->addShared( 'lazyload_admin_subscriber', LazyloadAdminSubscriber::class )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'lazyload_iframe' ) );
$this->getContainer()->addShared( 'lazyload_admin_subscriber', LazyloadAdminSubscriber::class );
$this->getContainer()->addShared( 'emojis_subscriber', EmojisSubscriber::class )
->addArgument( $options )
->addTag( 'front_subscriber' );
->addArgument( $options );
$this->getContainer()->add( 'image_dimensions', ImageDimensions::class )
->addArgument( $options );
$this->getContainer()->addShared( 'image_dimensions_subscriber', ImageDimensionsSubscriber::class )
->addArgument( $this->getContainer()->get( 'image_dimensions' ) )
->addArgument( $this->getContainer()->get( 'tests' ) )
->addTag( 'front_subscriber' );
->addArgument( $this->getContainer()->get( 'tests' ) );
$this->getContainer()->addShared( 'image_dimensions_admin_subscriber', ImageDimensionsAdminSubscriber::class )
->addArgument( $this->getContainer()->get( 'image_dimensions' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'image_dimensions' ) );
}
}
7 changes: 2 additions & 5 deletions inc/Engine/Optimization/AdminServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,14 @@ public function provides( string $id ): bool {
* @return void
*/
public function register(): void {
$this->getContainer()->addShared( 'minify_css_admin_subscriber', 'WP_Rocket\Engine\Optimization\Minify\CSS\AdminSubscriber' )
->addTag( 'admin_subscriber' );
$this->getContainer()->addShared( 'minify_css_admin_subscriber', 'WP_Rocket\Engine\Optimization\Minify\CSS\AdminSubscriber' );
$this->getContainer()->add( 'google_fonts_settings', 'WP_Rocket\Engine\Optimization\GoogleFonts\Admin\Settings' )
->addArgument( $this->getContainer()->get( 'options' ) )
->addArgument( $this->getContainer()->get( 'beacon' ) )
->addArgument( $this->getContainer()->get( 'template_path' ) );
$this->getContainer()->addShared( 'google_fonts_admin_subscriber', 'WP_Rocket\Engine\Optimization\GoogleFonts\Admin\Subscriber' )
->addArgument( $this->getContainer()->get( 'google_fonts_settings' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'google_fonts_settings' ) );
$this->getContainer()->addShared( 'minify_admin_subscriber', 'WP_Rocket\Engine\Optimization\Minify\AdminSubscriber' )
->addTag( 'admin_subscriber' )
->addArgument( $this->getContainer()->get( 'options' ) );
}
}
6 changes: 2 additions & 4 deletions inc/Engine/Optimization/DeferJS/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@ public function register(): void {
->addArgument( $this->getContainer()->get( 'options' ) )
->addArgument( $this->getContainer()->get( 'dynamic_lists_defaultlists_data_manager' ) );
$this->getContainer()->addShared( 'defer_js_admin_subscriber', AdminSubscriber::class )
->addArgument( $this->getContainer()->get( 'defer_js' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'defer_js' ) );
$this->getContainer()->addShared( 'defer_js_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'defer_js' ) )
->addTag( 'front_subscriber' );
->addArgument( $this->getContainer()->get( 'defer_js' ) );
}
}
6 changes: 2 additions & 4 deletions inc/Engine/Optimization/DelayJS/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,14 @@ public function register(): void {
->addArgument( $this->getContainer()->get( 'options_api' ) );
$this->getContainer()->addShared( 'delay_js_admin_subscriber', AdminSubscriber::class )
->addArgument( $this->getContainer()->get( 'delay_js_settings' ) )
->addArgument( $this->getContainer()->get( 'delay_js_sitelist' ) )
->addTag( 'admin_subscriber' );
->addArgument( $this->getContainer()->get( 'delay_js_sitelist' ) );
$this->getContainer()->add( 'delay_js_html', HTML::class )
->addArgument( $this->getContainer()->get( 'options' ) )
->addArgument( $this->getContainer()->get( 'dynamic_lists_defaultlists_data_manager' ) )
->addArgument( new Logger() );
$this->getContainer()->addShared( 'delay_js_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'delay_js_html' ) )
->addArgument( rocket_direct_filesystem() )
->addArgument( $this->getContainer()->get( 'options' ) )
->addTag( 'front_subscriber' );
->addArgument( $this->getContainer()->get( 'options' ) );
}
}
18 changes: 6 additions & 12 deletions inc/Engine/Optimization/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,23 @@ public function register(): void {
$this->getContainer()->add( 'buffer_optimization', Optimization::class )
->addArgument( $this->getContainer()->get( 'tests' ) );
$this->getContainer()->addShared( 'buffer_subscriber', BufferSubscriber::class )
->addArgument( $this->getContainer()->get( 'buffer_optimization' ) )
->addTag( 'front_subscriber' );
->addArgument( $this->getContainer()->get( 'buffer_optimization' ) );
$this->getContainer()->addShared( 'cache_dynamic_resource', CacheDynamicResource::class )
->addArgument( $options )
->addArgument( WP_ROCKET_CACHE_BUSTING_PATH )
->addArgument( WP_ROCKET_CACHE_BUSTING_URL )
->addTag( 'front_subscriber' );
->addArgument( WP_ROCKET_CACHE_BUSTING_URL );
$this->getContainer()->add( 'optimize_google_fonts', Combine::class );
$this->getContainer()->add( 'optimize_google_fonts_v2', CombineV2::class );
$this->getContainer()->addShared( 'combine_google_fonts_subscriber', Subscriber::class )
->addArgument( $this->getContainer()->get( 'optimize_google_fonts' ) )
->addArgument( $this->getContainer()->get( 'optimize_google_fonts_v2' ) )
->addArgument( $options )
->addTag( 'front_subscriber' );
->addArgument( $options );
$this->getContainer()->addShared( 'minify_css_subscriber', Minify\CSS\Subscriber::class )
->addArgument( $options )
->addArgument( $filesystem )
->addTag( 'front_subscriber' );
->addArgument( $filesystem );
$this->getContainer()->addShared( 'minify_js_subscriber', Minify\JS\Subscriber::class )
->addArgument( $options )
->addArgument( $filesystem )
->addTag( 'front_subscriber' );
$this->getContainer()->addShared( 'ie_conditionals_subscriber', IEConditionalSubscriber::class )
->addTag( 'front_subscriber' );
->addArgument( $filesystem );
$this->getContainer()->addShared( 'ie_conditionals_subscriber', IEConditionalSubscriber::class );
}
}
12 changes: 4 additions & 8 deletions inc/Engine/Plugin/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ public function provides( string $id ): bool {
public function register(): void {
$this->getContainer()->add( 'plugin_renewal_notice', RenewalNotice::class )
->addArgument( $this->getContainer()->get( 'user' ) )
->addArgument( $this->getContainer()->get( 'template_path' ) . '/plugins/' )
->addTag( 'common_subscriber' );
->addArgument( $this->getContainer()->get( 'template_path' ) . '/plugins/' );

$this->getContainer()->addShared( 'plugin_updater_common_subscriber', UpdaterApiCommonSubscriber::class )
->addArgument(
Expand All @@ -50,16 +49,14 @@ public function register(): void {
'settings_nonce_key' => WP_ROCKET_PLUGIN_SLUG,
'plugin_options' => $this->getContainer()->get( 'options' ),
]
)
->addTag( 'common_subscriber' );
);

$this->getContainer()->addShared( 'plugin_information_subscriber', InformationSubscriber::class )
->addArgument(
[
'plugin_file' => WP_ROCKET_FILE,
]
)
->addTag( 'common_subscriber' );
);

$this->getContainer()->addShared( 'plugin_updater_subscriber', UpdaterSubscriber::class )
->addArgument( $this->getContainer()->get( 'plugin_renewal_notice' ) )
Expand All @@ -73,7 +70,6 @@ public function register(): void {
'1x' => WP_ROCKET_ASSETS_IMG_URL . 'icon-128x128.png',
],
]
)
->addTag( 'common_subscriber' );
);
}
}
Loading

0 comments on commit de60b47

Please sign in to comment.