Changeset 64746

Timestamp:

10/26/2026 09:29:23 PM (4 days ago)

Author:

lancewillett

Message:

Tests: Make remaining utility data providers static.

Declare 20 data providers in the secrets, cache, database, script dependency and locale tests as public static for compatibility with newer PHPUnit versions. Preserve their datasets and assertions.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/14670, ​https://github.com/WordPress/wordpress-develop/pull/14799, ​https://github.com/WordPress/wordpress-develop/pull/14800, ​https://github.com/WordPress/wordpress-develop/pull/14802, ​https://github.com/WordPress/wordpress-develop/pull/14804, ​https://github.com/WordPress/wordpress-develop/pull/14806

Props ravipatel, shailu25, mukesh27.
See #66211.

Location:

trunk/tests/phpunit/tests

Files:

• cache.php (modified) (1 diff)
• db/realEscape.php (modified) (1 diff)
• dependencies.php (modified) (1 diff)
• dependencies/jquery.php (modified) (1 diff)
• locale.php (modified) (2 diffs)
• secrets/capabilities.php (modified) (1 diff)
• secrets/errorCodes.php (modified) (1 diff)
• secrets/wpSecret.php (modified) (2 diffs)
• secrets/wpSecretsCipher.php (modified) (4 diffs)
• secrets/wpSecretsConfigKeyProvider.php (modified) (2 diffs)
• secrets/wpSecretsKeyManager.php (modified) (1 diff)
• secrets/wpSecretsValidateName.php (modified) (3 diffs)

trunk/tests/phpunit/tests/cache.php

@@ -58 +58 @@
          * }
          */
-        public function data_is_valid_key() {
+        public static function data_is_valid_key() {
                 return array(
                         'false'          => array( false, false ),

trunk/tests/phpunit/tests/db/realEscape.php

@@ -34 +34 @@
          * @var array
          */
-        public function data_real_escape_input_type_handling() {
+        public static function data_real_escape_input_type_handling() {
                 return array(
                         'null'             => array(

trunk/tests/phpunit/tests/dependencies.php

@@ -155 +155 @@
          * @return array[]
          */
-        public function data_provider_get_etag() {
+        public static function data_provider_get_etag() {
                 return array(
                         'should accept one dependency'              => array(

trunk/tests/phpunit/tests/dependencies/jquery.php

@@ -58 +58 @@
          * @return array<non-falsy-string, array{ 0: non-falsy-string }>
          */
-        public function data_jquery_files_exist(): array {
+        public static function data_jquery_files_exist(): array {
                 return array(
                         'jquery'             => array( 'jquery.js' ),

trunk/tests/phpunit/tests/locale.php

@@ -36 +36 @@
          * @return array
          */
-        public function data_property_initializes_to_array() {
+        public static function data_property_initializes_to_array() {
                 return array(
                         'weekday'         => array( 'weekday' ),
@@ -202 +202 @@
          * @return array[]
          */
-        public function data_get_word_count_type() {
+        public static function data_get_word_count_type() {
                 return array(
                         'default'                   => array(

trunk/tests/phpunit/tests/secrets/capabilities.php

@@ -90 +90 @@
          * @return array<string, array{0: int, 1: bool}>
          */
-        public function data_upgrade_720_gate() {
+        public static function data_upgrade_720_gate() {
                 return array(
                         'upgrading from 7.0'              => array( 61644, true ),

trunk/tests/phpunit/tests/secrets/errorCodes.php

@@ -21 +21 @@
          * @return array<string, array{0: string, 1: string}>
          */
-        public function data_published_error_codes() {
+        public static function data_published_error_codes() {
                 return array(
                         'decryption failed'  => array( 'WP_SECRETS_ERROR_DECRYPTION_FAILED', 'secret_decryption_failed' ),

trunk/tests/phpunit/tests/secrets/wpSecret.php

@@ -91 +91 @@
          * @return array<string, array{0: callable( WP_Secret ): ( string|false )}>
          */
-        public function data_masking_surfaces() {
+        public static function data_masking_surfaces() {
                 return array(
                         '(string) cast'        => array(
@@ -206 +206 @@
          * @return array<string, array{0: string, 1: array<int, mixed>}>
          */
-        public function data_refusing_magic_methods() {
+        public static function data_refusing_magic_methods() {
                 return array(
                         '__sleep'       => array( '__sleep', array() ),

trunk/tests/phpunit/tests/secrets/wpSecretsCipher.php

@@ -91 +91 @@
          * @return array<string, array{0: string}>
          */
-        public function data_bad_master_keys() {
+        public static function data_bad_master_keys() {
                 return array(
                         'too short' => array( str_repeat( 'a', 31 ) ),
@@ -168 +168 @@
          * @return array<string, array{0: string, 1: int, 2: string, 3: string}>
          */
-        public function data_mismatched_context() {
+        public static function data_mismatched_context() {
                 return array(
                         'different scope'   => array( 'network', 1, self::NAME, WP_Secret_Version::CURRENT ),
@@ -215 +215 @@
          * @return array<string, array{0: string}>
          */
-        public function data_tamperable_fields() {
+        public static function data_tamperable_fields() {
                 return array(
                         'ciphertext'       => array( 'ct' ),
@@ -241 +241 @@
          * @return array<string, array{0: mixed}>
          */
-        public function data_malformed_records() {
+        public static function data_malformed_records() {
                 return array(
                         'not an array'       => array( 'just a string' ),

trunk/tests/phpunit/tests/secrets/wpSecretsConfigKeyProvider.php

@@ -132 +132 @@
          * @return array<string, array{0: string|int, 1: bool}>
          */
-        public function data_canonical_base64_32(): array {
+        public static function data_canonical_base64_32(): array {
                 return array(
                         'exactly 32 bytes, canonical encoding' => array( base64_encode( str_repeat( 'A', 32 ) ), true ),
@@ -160 +160 @@
          * @return array<string, array{0: string|int|null, 1: string, 2: bool}>
          */
-        public function data_usable_salt_values(): array {
+        public static function data_usable_salt_values(): array {
                 return array(
                         'both usable'             => array( 'a real key', 'a real salt', true ),

trunk/tests/phpunit/tests/secrets/wpSecretsKeyManager.php

@@ -122 +122 @@
          * @return array<string, array{0: int}>
          */
-        public function data_invalid_site_ids(): array {
+        public static function data_invalid_site_ids(): array {
                 return array(
                         'zero'     => array( 0 ),

trunk/tests/phpunit/tests/secrets/wpSecretsValidateName.php

@@ -17 +17 @@
          * @return array<string, array{0: string}>
          */
-        public function data_valid_names(): array {
+        public static function data_valid_names(): array {
                 return array(
                         'simple'                      => array( 'myplugin/api-key' ),
@@ -61 +61 @@
          * @return array<string, array{0: string}>
          */
-        public function data_unnamespaced_names(): array {
+        public static function data_unnamespaced_names(): array {
                 return array(
                         'simple'      => array( 'api_key' ),
@@ -85 +85 @@
          * @return array<string, array{0: string}>
          */
-        public function data_invalid_names(): array {
+        public static function data_invalid_names(): array {
                 return array(
                         'empty string'                 => array( '' ),