Use more appropriate methods in _doing_it_wrong() calls

Author: westonruter

src/wp-includes/class-wp-dependencies.php

@@ -221,7 +221,7 @@ public function all_deps( $handles, $recursion = false, $group = false ) {
 			} elseif ( count( $missing_dependencies ) > 0 ) {
 				if ( ! in_array( $handle, $this->dependencies_with_missing_dependencies, true ) ) {
 					_doing_it_wrong(
-						__METHOD__,
+						get_class( $this ) . '::add',
 						$this->get_dependency_warning_message( $handle, $missing_dependencies ),
 						'7.0.0'
 					);

src/wp-includes/class-wp-script-modules.php

@@ -737,9 +737,9 @@ private function sort_item_dependencies( string $id, array $import_types, array
 		if ( count( $missing_dependencies ) > 0 ) {
 			if ( ! in_array( $id, $this->modules_with_missing_dependencies, true ) ) {
 				_doing_it_wrong(
-					__METHOD__,
+					get_class( $this ) . '::register',
 					sprintf(
-					/* translators: 1: Script module ID, 2: Comma-separated list of missing dependency IDs. */
+						/* translators: 1: Script module ID, 2: Comma-separated list of missing dependency IDs. */
 						__( 'The script module "%1$s" was enqueued with dependencies that are not registered: %2$s.' ),
 						$id,
 						implode( ', ', $missing_dependencies )

tests/phpunit/tests/dependencies/scripts.php

@@ -4101,25 +4101,24 @@ public function test_print_translations_no_display_no_sourceurl() {
 	 * @covers WP_Dependencies::all_deps
 	 */
 	public function test_wp_scripts_doing_it_wrong_for_missing_dependencies() {
-		$expected_key = 'WP_Dependencies::all_deps';
-		$this->setExpectedIncorrectUsage( $expected_key );
+		$expected_incorrect_usage = 'WP_Scripts::add';
+		$this->setExpectedIncorrectUsage( $expected_incorrect_usage );
 
 		wp_register_script( 'registered-dep', '/registered-dep.js' );
-		wp_register_script( 'main', '/main.js', array( 'registered-dep', 'missing-dep' ) );
-		wp_enqueue_script( 'main' );
+		wp_enqueue_script( 'main', '/main.js', array( 'registered-dep', 'missing-dep' ) );
 
 		$markup = get_echo( 'wp_print_scripts' );
 		$this->assertStringNotContainsString( 'main.js', $markup, 'Expected script to be absent.' );
 
 		$this->assertArrayHasKey(
-			$expected_key,
+			$expected_incorrect_usage,
 			$this->caught_doing_it_wrong,
-			'Expected WP_Dependencies::all_deps to trigger a _doing_it_wrong() notice for missing dependency.'
+			"Expected $expected_incorrect_usage to trigger a _doing_it_wrong() notice for missing dependency."
 		);
 
 		$this->assertStringContainsString(
 			'The script with the handle "main" was enqueued with dependencies that are not registered: missing-dep',
-			$this->caught_doing_it_wrong[ $expected_key ],
+			$this->caught_doing_it_wrong[ $expected_incorrect_usage ],
 			'Expected _doing_it_wrong() notice to indicate missing dependencies for enqueued script.'
 		);
 	}

tests/phpunit/tests/dependencies/styles.php

@@ -822,29 +822,27 @@ public function test_source_url_with_concat() {
 	 * @covers WP_Dependencies::all_deps
 	 */
 	public function test_wp_style_doing_it_wrong_for_missing_dependencies() {
-		$expected_key = 'WP_Dependencies::all_deps';
-		$this->setExpectedIncorrectUsage( $expected_key );
+		$expected_incorrect_usage = 'WP_Styles::add';
+		$this->setExpectedIncorrectUsage( $expected_incorrect_usage );
 
-		wp_register_style(
+		wp_enqueue_style(
 			'main-style',
 			'/main-style.css',
 			array( 'missing-style-dep' )
 		);
 
-		wp_enqueue_style( 'main-style' );
-
 		$markup = get_echo( 'wp_print_styles' );
 		$this->assertStringNotContainsString( 'main-style.css', $markup, 'Expected style to be absent.' );
 
 		$this->assertArrayHasKey(
-			$expected_key,
+			$expected_incorrect_usage,
 			$this->caught_doing_it_wrong,
-			'Expected WP_Dependencies::all_deps to trigger a _doing_it_wrong() notice for missing dependency.'
+			"Expected $expected_incorrect_usage to trigger a _doing_it_wrong() notice for missing dependency."
 		);
 
 		$this->assertStringContainsString(
 			'The style with the handle "main-style" was enqueued with dependencies that are not registered: missing-style-dep',
-			$this->caught_doing_it_wrong[ $expected_key ],
+			$this->caught_doing_it_wrong[ $expected_incorrect_usage ],
 			'Expected _doing_it_wrong() notice to indicate missing dependencies for enqueued styles.'
 		);
 	}

tests/phpunit/tests/script-modules/wpScriptModules.php

@@ -2321,24 +2321,24 @@ public function test_static_import_dependency_with_dynamic_imports_depending_on_
 	 * @covers WP_Script_Modules::sort_item_dependencies
 	 */
 	public function test_missing_script_module_dependency_triggers_incorrect_usage() {
-		$this->setExpectedIncorrectUsage( 'WP_Script_Modules::sort_item_dependencies' );
+		$expected_incorrect_usage = 'WP_Script_Modules::register';
+		$this->setExpectedIncorrectUsage( $expected_incorrect_usage );
 
-		$this->script_modules->register( 'main-module', '/main-module.js', array( 'missing-mod-dep' ) );
-		$this->script_modules->enqueue( 'main-module' );
+		$this->script_modules->enqueue( 'main-module', '/main-module.js', array( 'missing-mod-dep' ) );
 
 		$markup = get_echo( array( $this->script_modules, 'print_enqueued_script_modules' ) );
 		$this->assertStringNotContainsString( 'main-module.js', $markup, 'Expected script module to be absent.' );
 
 		$this->assertArrayHasKey(
-			'WP_Script_Modules::sort_item_dependencies',
+			$expected_incorrect_usage,
 			$this->caught_doing_it_wrong,
-			'Expected WP_Script_Modules::sort_item_dependencies to be reported via doing_it_wrong().'
+			'Expected WP_Script_Modules::register to be reported via doing_it_wrong().'
 		);
 
 		// Assert the message mentions the missing dependency handle.
 		$this->assertStringContainsString(
 			'The script module "main-module" was enqueued with dependencies that are not registered: missing-mod-dep',
-			$this->caught_doing_it_wrong['WP_Script_Modules::sort_item_dependencies']
+			$this->caught_doing_it_wrong[ $expected_incorrect_usage ]
 		);
 	}
 }