Skip to content

Commit 5ec9dfe

Browse files
wordpressfantransifex-integration[bot]KhadrealMathieuLamiotjeawhanlee
authored
Release v3.18.2 (#7307)
Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> Co-authored-by: Opeyemi Ibrahim <opeyemi.khadri@gmail.com> Co-authored-by: Mathieu Lamiot <mathieu.lamiot@free.fr> Co-authored-by: wordpressfan <wordpressfan@users.noreply.github.com> Co-authored-by: jeawhanlee <jeawhanlee@users.noreply.github.com> Co-authored-by: Michael Lee <michaelleemichaellee408@gmail.com> Co-authored-by: Khadreal <Khadreal@users.noreply.github.com> Co-authored-by: Gaël Robin <robin.gael@gmail.com> Co-authored-by: Rémy Perona <remy@wp-media.me> Co-authored-by: WP Media GitHub Actions Bot <bot@wp-media.com>
1 parent 80eb913 commit 5ec9dfe

File tree

83 files changed

+5564
-3597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+5564
-3597
lines changed

‎dynamic-lists-delayjs.json

+1-1
Large diffs are not rendered by default.

‎dynamic-lists.json

+1-1
Large diffs are not rendered by default.

‎inc/Addon/Cloudflare/ServiceProvider.php

+19-15
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class ServiceProvider extends AbstractServiceProvider {
2020
* @var array
2121
*/
2222
protected $provides = [
23+
'cloudflare_api_key_factory',
2324
'cloudflare_client',
2425
'cloudflare_endpoints',
2526
'cloudflare',
@@ -42,26 +43,29 @@ public function provides( string $id ): bool {
4243
* Registers items with the container
4344
*/
4445
public function register(): void {
45-
$options = $this->getContainer()->get( 'options' );
46-
47-
$this->getContainer()->add( 'cloudflare_auth_factory', APIKeyFactory::class )->addArgument( $options );
46+
$this->getContainer()->add( 'cloudflare_api_key_factory', APIKeyFactory::class )->addArgument( 'options' );
4847

4948
$this->getContainer()->add( 'cloudflare_client', Client::class )
50-
->addArgument( $this->getContainer()->get( 'cloudflare_auth_factory' )->create() );
49+
->addArgument( $this->getContainer()->get( 'cloudflare_api_key_factory' )->create() );
5150
$this->getContainer()->add( 'cloudflare_endpoints', Endpoints::class )
52-
->addArgument( $this->getContainer()->get( 'cloudflare_client' ) );
51+
->addArgument( 'cloudflare_client' );
5352

5453
$this->getContainer()->add( 'cloudflare', Cloudflare::class )
55-
->addArgument( $options )
56-
->addArgument( $this->getContainer()->get( 'cloudflare_endpoints' ) );
54+
->addArguments(
55+
[
56+
'options',
57+
'cloudflare_endpoints',
58+
]
59+
);
5760
$this->getContainer()->addShared( 'cloudflare_subscriber', CloudflareSubscriber::class )
58-
->addArgument( $this->getContainer()->get( 'cloudflare' ) )
59-
->addArgument( $options )
60-
->addArgument( $this->getContainer()->get( 'options_api' ) )
61-
->addArgument( $this->getContainer()->get( 'cloudflare_auth_factory' ) );
62-
$this->getContainer()->addShared(
63-
'cloudflare_admin_subscriber',
64-
CloudflareAdminSubscriber::class
65-
);
61+
->addArguments(
62+
[
63+
'cloudflare',
64+
'options',
65+
'options_api',
66+
'cloudflare_api_key_factory',
67+
]
68+
);
69+
$this->getContainer()->addShared( 'cloudflare_admin_subscriber', CloudflareAdminSubscriber::class );
6670
}
6771
}

‎inc/Addon/ServiceProvider.php

+17-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
declare(strict_types=1);
3+
24
namespace WP_Rocket\Addon;
35

46
use WP_Rocket\Addon\Sucuri\Subscriber as SucuriSubscriber;
@@ -36,20 +38,25 @@ public function provides( string $id ): bool {
3638
* Registers items with the container
3739
*/
3840
public function register(): void {
39-
$options = $this->getContainer()->get( 'options' );
40-
41-
// Sucuri Addon.
4241
$this->getContainer()->addShared( 'sucuri_subscriber', SucuriSubscriber::class )
43-
->addArgument( $options );
42+
->addArgument( 'options' );
4443

4544
$this->getContainer()->addShared( 'webp_admin_subscriber', WebPAdminSubscriber::class )
46-
->addArgument( $options )
47-
->addArgument( $this->getContainer()->get( 'cdn_subscriber' ) )
48-
->addArgument( $this->getContainer()->get( 'beacon' ) );
45+
->addArguments(
46+
[
47+
'options',
48+
'cdn_subscriber',
49+
'beacon',
50+
]
51+
);
4952

5053
$this->getContainer()->addShared( 'webp_subscriber', WebPSubscriber::class )
51-
->addArgument( $options )
52-
->addArgument( $this->getContainer()->get( 'options_api' ) )
53-
->addArgument( $this->getContainer()->get( 'cdn_subscriber' ) );
54+
->addArguments(
55+
[
56+
'options',
57+
'options_api',
58+
'cdn_subscriber',
59+
]
60+
);
5461
}
5562
}

‎inc/Addon/Varnish/ServiceProvider.php

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
declare(strict_types=1);
3+
24
namespace WP_Rocket\Addon\Varnish;
35

46
use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
@@ -36,7 +38,11 @@ public function provides( string $id ): bool {
3638
public function register(): void {
3739
$this->getContainer()->add( 'varnish', Varnish::class );
3840
$this->getContainer()->addShared( 'varnish_subscriber', Subscriber::class )
39-
->addArgument( $this->getContainer()->get( 'varnish' ) )
40-
->addArgument( $this->getContainer()->get( 'options' ) );
41+
->addArguments(
42+
[
43+
'varnish',
44+
'options',
45+
]
46+
);
4147
}
4248
}

‎inc/Engine/Activation/Activation.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace WP_Rocket\Engine\Activation;
44

55
use WP_Rocket\Admin\Options;
6+
use WP_Rocket\Dependencies\League\Container\Argument\Literal\StringArgument;
67
use WP_Rocket\Dependencies\League\Container\Container;
78
use WP_Rocket\Engine\Common\PerformanceHints\Activation\ServiceProvider as PerformanceHintsActivationServiceProvider;
89
use WP_Rocket\Engine\License\ServiceProvider as LicenseServiceProvider;
@@ -44,7 +45,7 @@ public static function activate_plugin() {
4445
$container = new Container();
4546
$event_manager = new Event_Manager();
4647

47-
$container->add( 'template_path', WP_ROCKET_PATH . 'views' );
48+
$container->add( 'template_path', new StringArgument( rocket_get_constant( 'WP_ROCKET_PATH', '' ) . 'views' ) );
4849
$options_api = new Options( 'wp_rocket_' );
4950
$container->add( 'options_api', $options_api );
5051
$container->addServiceProvider( new OptionsServiceProvider() );

‎inc/Engine/Activation/ServiceProvider.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?php
2+
declare(strict_types=1);
3+
24
namespace WP_Rocket\Engine\Activation;
35

6+
use WP_Rocket\Dependencies\League\Container\Argument\Literal\StringArgument;
47
use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
58
use WP_Rocket\Dependencies\League\Container\ServiceProvider\BootableServiceProviderInterface;
69
use WP_Rocket\Engine\Cache\AdvancedCache;
@@ -53,8 +56,12 @@ public function register(): void {
5356
$filesystem = rocket_direct_filesystem();
5457

5558
$this->getContainer()->add( 'advanced_cache', AdvancedCache::class )
56-
->addArgument( $this->getContainer()->get( 'template_path' ) . '/cache/' )
57-
->addArgument( $filesystem );
59+
->addArguments(
60+
[
61+
new StringArgument( $this->getContainer()->get( 'template_path' ) . '/cache/' ),
62+
$filesystem,
63+
]
64+
);
5865
$this->getContainer()->add( 'capabilities_manager', Manager::class );
5966
$this->getContainer()->add( 'wp_cache', WPCache::class )
6067
->addArgument( $filesystem );

‎inc/Engine/Admin/API/ServiceProvider.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace WP_Rocket\Engine\Admin\API;
45

‎inc/Engine/Admin/Beacon/ServiceProvider.php

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?php
2+
declare(strict_types=1);
3+
24
namespace WP_Rocket\Engine\Admin\Beacon;
35

6+
use WP_Rocket\Dependencies\League\Container\Argument\Literal\StringArgument;
47
use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
58

69
/**
@@ -34,8 +37,12 @@ public function provides( string $id ): bool {
3437
*/
3538
public function register(): void {
3639
$this->getContainer()->addShared( 'beacon', Beacon::class )
37-
->addArgument( $this->getContainer()->get( 'options' ) )
38-
->addArgument( $this->getContainer()->get( 'template_path' ) . '/settings' )
39-
->addArgument( $this->getContainer()->get( 'support_data' ) );
40+
->addArguments(
41+
[
42+
'options',
43+
new StringArgument( $this->getContainer()->get( 'template_path' ) . '/settings' ),
44+
'support_data',
45+
]
46+
);
4047
}
4148
}

‎inc/Engine/Admin/Database/ServiceProvider.php

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?php
2+
declare(strict_types=1);
3+
24
namespace WP_Rocket\Engine\Admin\Database;
35

6+
use WP_Rocket\Admin\Options_Data;
47
use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
58

69
/**
@@ -37,9 +40,13 @@ public function provides( string $id ): bool {
3740
public function register(): void {
3841
$this->getContainer()->add( 'db_optimization_process', OptimizationProcess::class );
3942
$this->getContainer()->add( 'db_optimization', Optimization::class )
40-
->addArgument( $this->getContainer()->get( 'db_optimization_process' ) );
43+
->addArgument( 'db_optimization_process' );
4144
$this->getContainer()->addShared( 'db_optimization_subscriber', Subscriber::class )
42-
->addArgument( $this->getContainer()->get( 'db_optimization' ) )
43-
->addArgument( $this->getContainer()->get( 'options' ) );
45+
->addArguments(
46+
[
47+
'db_optimization',
48+
'options',
49+
]
50+
);
4451
}
4552
}

‎inc/Engine/Admin/DomainChange/ServiceProvider.php

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace WP_Rocket\Engine\Admin\DomainChange;
45

56
use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
7+
68
use WP_Rocket\Engine\Common\Ajax\AjaxHandler;
79

810
class ServiceProvider extends AbstractServiceProvider {
@@ -34,8 +36,12 @@ public function provides( string $id ): bool {
3436
*/
3537
public function register(): void {
3638
$this->getContainer()->add( 'ajax_handler', AjaxHandler::class );
37-
$this->getContainer()->add( 'domain_change_subscriber', Subscriber::class )
38-
->addArgument( $this->getContainer()->get( 'ajax_handler' ) )
39-
->addArgument( $this->getContainer()->get( 'beacon' ) );
39+
$this->getContainer()->addShared( 'domain_change_subscriber', Subscriber::class )
40+
->addArguments(
41+
[
42+
'ajax_handler',
43+
'beacon',
44+
]
45+
);
4046
}
4147
}

‎inc/Engine/Admin/ServiceProvider.php

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<?php
2+
declare(strict_types=1);
3+
24
namespace WP_Rocket\Engine\Admin;
35

46
use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
7+
use WP_Rocket\Dependencies\League\Container\Argument\Literal\StringArgument;
58
use WP_Rocket\Engine\Admin\Deactivation\{DeactivationIntent, Subscriber};
69
use WP_Rocket\Engine\Admin\Metaboxes\PostEditOptionsSubscriber;
710
use WP_Rocket\ThirdParty\Plugins\Optimization\Hummingbird;
@@ -40,19 +43,25 @@ public function provides( string $id ): bool {
4043
* @return void
4144
*/
4245
public function register(): void {
43-
$options = $this->getContainer()->get( 'options' );
44-
4546
$this->getContainer()->add( 'deactivation_intent', DeactivationIntent::class )
46-
->addArgument( $this->getContainer()->get( 'template_path' ) . '/deactivation-intent' )
47-
->addArgument( $this->getContainer()->get( 'options_api' ) )
48-
->addArgument( $options );
47+
->addArguments(
48+
[
49+
new StringArgument( $this->getContainer()->get( 'template_path' ) . '/deactivation-intent' ),
50+
'options_api',
51+
'options',
52+
]
53+
);
4954
$this->getContainer()->addShared( 'deactivation_intent_subscriber', Subscriber::class )
5055
->addArgument( $this->getContainer()->get( 'deactivation_intent' ) );
5156
$this->getContainer()->addShared( 'hummingbird_subscriber', Hummingbird::class )
52-
->addArgument( $options );
57+
->addArgument( 'options' );
5358
$this->getContainer()->addShared( 'actionscheduler_admin_subscriber', ActionSchedulerSubscriber::class );
5459
$this->getContainer()->addShared( 'post_edit_options_subscriber', PostEditOptionsSubscriber::class )
55-
->addArgument( $options )
56-
->addArgument( $this->getContainer()->get( 'template_path' ) . '/metaboxes' );
60+
->addArguments(
61+
[
62+
'options',
63+
new StringArgument( $this->getContainer()->get( 'template_path' ) . '/metaboxes' ),
64+
]
65+
);
5766
}
5867
}

‎inc/Engine/Admin/Settings/ServiceProvider.php

+27-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?php
2+
declare(strict_types=1);
3+
24
namespace WP_Rocket\Engine\Admin\Settings;
35

6+
use WP_Rocket\Dependencies\League\Container\Argument\Literal\{ArrayArgument, StringArgument};
47
use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
58
use WP_Rocket\Dependencies\WPMedia\PluginFamily\Model\PluginFamily as PluginFamilyModel;
69
use WP_Rocket\Dependencies\WPMedia\PluginFamily\Controller\PluginFamily as PluginFamilyController;
@@ -15,6 +18,8 @@ class ServiceProvider extends AbstractServiceProvider {
1518
* @var array
1619
*/
1720
protected $provides = [
21+
'plugin_family_model',
22+
'plugin_family_controller',
1823
'settings',
1924
'settings_render',
2025
'settings_page',
@@ -42,28 +47,38 @@ public function register(): void {
4247
$this->getContainer()->add( 'plugin_family_controller', PluginFamilyController::class );
4348

4449
$this->getContainer()->add( 'settings', Settings::class )
45-
->addArgument( $this->getContainer()->get( 'options' ) );
50+
->addArgument( 'options' );
4651
$this->getContainer()->add( 'settings_render', Render::class )
4752
->addArguments(
4853
[
49-
$this->getContainer()->get( 'template_path' ) . '/settings',
54+
new StringArgument( $this->getContainer()->get( 'template_path' ) . '/settings' ),
5055
'plugin_family_model',
5156
]
5257
);
5358
$this->getContainer()->add( 'settings_page', Page::class )
54-
->addArgument( $this->getContainer()->get( 'settings_page_config' ) )
55-
->addArgument( $this->getContainer()->get( 'settings' ) )
56-
->addArgument( $this->getContainer()->get( 'settings_render' ) )
57-
->addArgument( $this->getContainer()->get( 'beacon' ) )
58-
->addArgument( $this->getContainer()->get( 'db_optimization' ) )
59-
->addArgument( $this->getContainer()->get( 'user_client' ) )
60-
->addArgument( $this->getContainer()->get( 'delay_js_sitelist' ) )
61-
->addArgument( $this->getContainer()->get( 'template_path' ) )
62-
->addArgument( $this->getContainer()->get( 'options' ) );
59+
->addArguments(
60+
[
61+
new ArrayArgument(
62+
[
63+
'slug' => WP_ROCKET_PLUGIN_SLUG,
64+
'title' => WP_ROCKET_PLUGIN_NAME,
65+
'capability' => 'rocket_manage_options',
66+
]
67+
),
68+
'settings',
69+
'settings_render',
70+
'beacon',
71+
'db_optimization',
72+
'user_client',
73+
'delay_js_sitelist',
74+
'template_path',
75+
'options',
76+
]
77+
);
6378
$this->getContainer()->addShared( 'settings_page_subscriber', Subscriber::class )
6479
->addArguments(
6580
[
66-
$this->getContainer()->get( 'settings_page' ),
81+
'settings_page',
6782
'plugin_family_controller',
6883
]
6984
);

0 commit comments

Comments
 (0)