From 4074e6b798a1fb8914dedb9ecc34b90801bf6b75 Mon Sep 17 00:00:00 2001 From: Khadreal Date: Tue, 18 Feb 2025 15:12:00 +0100 Subject: [PATCH] Update feature name --- .../Activation/ServiceProvider.php | 4 +-- .../PerformanceHints/Cron/CronTrait.php | 30 ----------------- .../PerformanceHints/ServiceProvider.php | 2 +- .../Table/PreconnectExternalDomains.php | 2 +- .../PreconnectExternalDomains/Factory.php | 19 ++++++++--- .../ServiceProvider.php | 32 ++++++++++--------- 6 files changed, 35 insertions(+), 54 deletions(-) delete mode 100644 inc/Engine/Common/PerformanceHints/Cron/CronTrait.php diff --git a/inc/Engine/Common/PerformanceHints/Activation/ServiceProvider.php b/inc/Engine/Common/PerformanceHints/Activation/ServiceProvider.php index 8715bc2785..be31a91dba 100644 --- a/inc/Engine/Common/PerformanceHints/Activation/ServiceProvider.php +++ b/inc/Engine/Common/PerformanceHints/Activation/ServiceProvider.php @@ -31,7 +31,7 @@ class ServiceProvider extends AbstractServiceProvider { 'atf_activation_factory', 'lrc_context', 'lrc_activation_factory', - 'preconnect_context', + 'preconnect_external_domains_context', ]; /** @@ -70,7 +70,7 @@ public function register(): void { ] ); - $this->getContainer()->add( 'preconnect_context', PreconnectContext::class ); + $this->getContainer()->add( 'preconnect_external_domains_context', PreconnectContext::class ); $factories = []; diff --git a/inc/Engine/Common/PerformanceHints/Cron/CronTrait.php b/inc/Engine/Common/PerformanceHints/Cron/CronTrait.php deleted file mode 100644 index 3e98df6c97..0000000000 --- a/inc/Engine/Common/PerformanceHints/Cron/CronTrait.php +++ /dev/null @@ -1,30 +0,0 @@ -queries; - } - - return $this->queries->set_cleanup_interval( $delete_interval ); - } -} diff --git a/inc/Engine/Common/PerformanceHints/ServiceProvider.php b/inc/Engine/Common/PerformanceHints/ServiceProvider.php index ca1ea0d157..dafa41f193 100644 --- a/inc/Engine/Common/PerformanceHints/ServiceProvider.php +++ b/inc/Engine/Common/PerformanceHints/ServiceProvider.php @@ -75,7 +75,7 @@ public function register(): void { $factory_array = [ $this->getContainer()->get( 'atf_factory' ), $this->getContainer()->get( 'lrc_factory' ), - $this->getContainer()->get( 'preconnect_factory' ), + $this->getContainer()->get( 'preconnect_external_domains_factory' ), ]; foreach ( $factory_array as $factory ) { diff --git a/inc/Engine/Media/PreconnectExternalDomains/Database/Table/PreconnectExternalDomains.php b/inc/Engine/Media/PreconnectExternalDomains/Database/Table/PreconnectExternalDomains.php index 4f34da47e5..b43fde7b9c 100644 --- a/inc/Engine/Media/PreconnectExternalDomains/Database/Table/PreconnectExternalDomains.php +++ b/inc/Engine/Media/PreconnectExternalDomains/Database/Table/PreconnectExternalDomains.php @@ -3,7 +3,7 @@ namespace WP_Rocket\Engine\Media\PreconnectExternalDomains\Database\Table; -use WP_Rocket\Engine\Common\Database\Tables\AbstractTable; +use WP_Rocket\Engine\Common\PerformanceHints\Database\Table\AbstractTable; class PreconnectExternalDomains extends AbstractTable { /** diff --git a/inc/Engine/Media/PreconnectExternalDomains/Factory.php b/inc/Engine/Media/PreconnectExternalDomains/Factory.php index 1668e725dc..6f96a7ac0c 100644 --- a/inc/Engine/Media/PreconnectExternalDomains/Factory.php +++ b/inc/Engine/Media/PreconnectExternalDomains/Factory.php @@ -49,12 +49,21 @@ class Factory implements FactoryInterface { /** * Instantiate the class. * - * @param QueriesInterface $queries Preconnect external domains Queries instance. - * @param ContextInterface $context Preconnect external domains Context instance. + * @param QueriesInterface $queries Preconnect external domains Queries instance. + * @param ContextInterface $context Preconnect external domains Context instance. + * @param AjaxControllerInterface $ajax_controller Preconnect AJAX Controller instance. + * @param TableInterface $table Preconnect Table instance. */ - public function __construct( QueriesInterface $queries, ContextInterface $context ) { - $this->context = $context; - $this->queries = $queries; + public function __construct( + QueriesInterface $queries, + ContextInterface $context, + AjaxControllerInterface $ajax_controller, + TableInterface $table + ) { + $this->context = $context; + $this->queries = $queries; + $this->ajax_controller = $ajax_controller; + $this->table = $table; } /** diff --git a/inc/Engine/Media/PreconnectExternalDomains/ServiceProvider.php b/inc/Engine/Media/PreconnectExternalDomains/ServiceProvider.php index 9f0e87d95a..42e84962b5 100644 --- a/inc/Engine/Media/PreconnectExternalDomains/ServiceProvider.php +++ b/inc/Engine/Media/PreconnectExternalDomains/ServiceProvider.php @@ -21,12 +21,12 @@ class ServiceProvider extends AbstractServiceProvider { * @var array */ protected $provides = [ - 'preconnect_factory', - 'preconnect_query', - 'preconnect_context', - 'preconnect_ajax_controller', + 'preconnect_external_domains_factory', + 'preconnect_external_domains_query', + 'preconnect_external_domains_context', + 'preconnect_external_domains_ajax_controller', 'preconnect_frontend_subscriber', - 'preconnect_table', + 'preconnect_external_domains_table', ]; /** @@ -47,29 +47,31 @@ public function provides( string $id ): bool { * @return void */ public function register(): void { - $this->getContainer()->add( 'preconnect_query', Query::class ); - $this->getContainer()->addShared( 'preconnect_table', PreconnectTable::class ); + $this->getContainer()->add( 'preconnect_external_domains_query', Query::class ); + $this->getContainer()->addShared( 'preconnect_external_domains_table', PreconnectTable::class ); - $this->getContainer()->get( 'preconnect_table' ); + $this->getContainer()->get( 'preconnect_external_domains_table' ); - $this->getContainer()->add( 'preconnect_context', Context::class ) + $this->getContainer()->add( 'preconnect_external_domains_context', Context::class ) ->addArgument( $this->getContainer()->get( 'options' ) ); - $this->getContainer()->addShared( 'preconnect_factory', Factory::class ) + $this->getContainer()->add( 'preconnect_external_domains_ajax_controller', AJAXController::class ) ->addArguments( [ - $this->getContainer()->get( 'preconnect_query' ), - $this->getContainer()->get( 'preconnect_context' ), + $this->getContainer()->get( 'preconnect_external_domains_query' ), + $this->getContainer()->get( 'preconnect_external_domains_context' ), ] ); - $this->getContainer()->add( 'preconnect_ajax_controller', AJAXController::class ) + $this->getContainer()->addShared( 'preconnect_external_domains_factory', Factory::class ) ->addArguments( [ - $this->getContainer()->get( 'preconnect_query' ), - $this->getContainer()->get( 'preconnect_context' ), + $this->getContainer()->get( 'preconnect_external_domains_query' ), + $this->getContainer()->get( 'preconnect_external_domains_context' ), + $this->getContainer()->get( 'preconnect_external_domains_ajax_controller' ), + $this->getContainer()->get( 'preconnect_external_domains_table' ), ] );