Clarify that it is logged-out AND admins, not logged-out OR admins

Co-authored-by: swissspidy <[email protected]>

Author: westonruter

plugins/speculation-rules/hooks.php

@@ -27,7 +27,7 @@ function plsr_is_speculative_loading_enabled(): bool {
 			||
 			'any' === $option['authentication']
 			||
-			( current_user_can( 'manage_options' ) && 'logged_out_or_admins' === $option['authentication'] )
+			( current_user_can( 'manage_options' ) && 'logged_out_and_admins' === $option['authentication'] )
 		)
 		&&
 		(

plugins/speculation-rules/settings.php

@@ -46,12 +46,12 @@ function plsr_get_eagerness_labels(): array {
  *
  * @since n.e.x.t
  *
- * @return array{ logged_out: string, logged_out_or_admins: string, any: string } Associative array of `$authentication => $label` pairs.
+ * @return array{ logged_out: string, logged_out_and_admins: string, any: string } Associative array of `$authentication => $label` pairs.
  */
 function plsr_get_authentication_labels(): array {
 	return array(
 		'logged_out'           => _x( 'Logged-out visitors only (default)', 'setting label', 'speculation-rules' ),
-		'logged_out_or_admins' => _x( 'Administrators or logged-out visitors', 'setting label', 'speculation-rules' ),
+		'logged_out_and_admins' => _x( 'Administrators and logged-out visitors', 'setting label', 'speculation-rules' ),
 		'any'                  => _x( 'Any user (logged-in or logged-out)', 'setting label', 'speculation-rules' ),
 	);
 }
@@ -82,7 +82,7 @@ function plsr_get_setting_default(): array {
  *
  * @since 1.4.0
  *
- * @return array{ mode: 'prefetch'|'prerender', eagerness: 'conservative'|'moderate'|'eager', authentication: 'logged_out'|'logged_out_or_admins'|'any' } {
+ * @return array{ mode: 'prefetch'|'prerender', eagerness: 'conservative'|'moderate'|'eager', authentication: 'logged_out'|'logged_out_and_admins'|'any' } {
  *     Stored setting value.
  *
  *     @type string $mode           Mode.
@@ -101,7 +101,7 @@ function plsr_get_stored_setting_value(): array {
  * @todo  Consider whether the JSON schema for the setting could be reused here.
  *
  * @param mixed $input Setting to sanitize.
- * @return array{ mode: 'prefetch'|'prerender', eagerness: 'conservative'|'moderate'|'eager', authentication: 'logged_out'|'logged_out_or_admins'|'any' } {
+ * @return array{ mode: 'prefetch'|'prerender', eagerness: 'conservative'|'moderate'|'eager', authentication: 'logged_out'|'logged_out_and_admins'|'any' } {
  *     Sanitized setting.
  *
  *     @type string $mode           Mode.

plugins/speculation-rules/tests/test-speculation-rules-settings.php

@@ -132,14 +132,14 @@ public function data_plsr_sanitize_setting(): array {
 					)
 				),
 			),
-			'valid auth logged_out_or_admins' => array(
+			'valid auth logged_out_and_admins' => array(
 				array(
-					'authentication' => 'logged_out_or_admins',
+					'authentication' => 'logged_out_and_admins',
 				),
 				array_merge(
 					$default_value,
 					array(
-						'authentication' => 'logged_out_or_admins',
+						'authentication' => 'logged_out_and_admins',
 					)
 				),
 			),
@@ -158,14 +158,14 @@ public function data_plsr_sanitize_setting(): array {
 				array(
 					'mode'           => 'prefetch',
 					'eagerness'      => 'conservative',
-					'authentication' => 'logged_out_or_admins',
+					'authentication' => 'logged_out_and_admins',
 				),
 				array_merge(
 					$default_value,
 					array(
 						'mode'           => 'prefetch',
 						'eagerness'      => 'conservative',
-						'authentication' => 'logged_out_or_admins',
+						'authentication' => 'logged_out_and_admins',
 					)
 				),
 			),

plugins/speculation-rules/tests/test-speculation-rules.php

@@ -60,18 +60,18 @@ public function data_provider_to_test_plsr_is_speculative_loading_enabled(): arr
 				'set_up'            => null,
 				'expected'          => true,
 			),
-			'authentication_logged_out_or_admins_auth_subscriber_auth_with_pretty_permalinks' => array(
+			'authentication_logged_out_and_admins_auth_subscriber_auth_with_pretty_permalinks' => array(
 				'settings'          => array(
-					'authentication' => 'logged_out_or_admins',
+					'authentication' => 'logged_out_and_admins',
 				),
 				'pretty_permalinks' => true,
 				'current_user_role' => 'subscriber',
 				'set_up'            => null,
 				'expected'          => false,
 			),
-			'authentication_logged_out_or_admins_auth_administrator_auth_with_pretty_permalinks' => array(
+			'authentication_logged_out_and_admins_auth_administrator_auth_with_pretty_permalinks' => array(
 				'settings'          => array(
-					'authentication' => 'logged_out_or_admins',
+					'authentication' => 'logged_out_and_admins',
 				),
 				'pretty_permalinks' => true,
 				'current_user_role' => 'administrator',