Fix passing filter name to _doing_it_wrong()

Author: westonruter

plugins/optimization-detective/storage/data.php

@@ -37,7 +37,7 @@ function od_get_url_metric_freshness_ttl(): int {
 
 	if ( $freshness_ttl < 0 ) {
 		_doing_it_wrong(
-			__FUNCTION__,
+			esc_html( "Filter: 'od_url_metric_freshness_ttl'" ),
 			esc_html(
 				sprintf(
 					/* translators: %s is the TTL freshness */
@@ -382,15 +382,13 @@ function od_get_maximum_viewport_aspect_ratio(): float {
  * @return positive-int[] Breakpoint max widths, sorted in ascending order.
  */
 function od_get_breakpoint_max_widths(): array {
-	$function_name = __FUNCTION__;
-
 	$breakpoint_max_widths = array_map(
-		static function ( $original_breakpoint ) use ( $function_name ): int {
+		static function ( $original_breakpoint ): int {
 			$breakpoint = $original_breakpoint;
 			if ( $breakpoint <= 0 ) {
 				$breakpoint = 1;
 				_doing_it_wrong(
-					esc_html( $function_name ),
+					esc_html( "Filter: 'od_breakpoint_max_widths'" ),
 					esc_html(
 						sprintf(
 							/* translators: %s is the actual breakpoint max width */
@@ -447,7 +445,7 @@ function od_get_url_metrics_breakpoint_sample_size(): int {
 
 	if ( $sample_size <= 0 ) {
 		_doing_it_wrong(
-			__FUNCTION__,
+			esc_html( "Filter: 'od_url_metrics_breakpoint_sample_size'" ),
 			esc_html(
 				sprintf(
 					/* translators: %s is the sample size */

plugins/optimization-detective/tests/storage/test-data.php

@@ -48,10 +48,10 @@ static function (): int {
 	/**
 	 * Test bad od_get_url_metric_freshness_ttl().
 	 *
-	 * @expectedIncorrectUsage od_get_url_metric_freshness_ttl
 	 * @covers ::od_get_url_metric_freshness_ttl
 	 */
 	public function test_bad_od_get_url_metric_freshness_ttl(): void {
+		$this->setExpectedIncorrectUsage( 'Filter: 'od_url_metric_freshness_ttl'' );
 		add_filter(
 			'od_url_metric_freshness_ttl',
 			static function (): int {
@@ -728,13 +728,13 @@ public function data_provider_test_bad_od_get_breakpoint_max_widths(): array {
 	 *
 	 * @covers ::od_get_breakpoint_max_widths
 	 *
-	 * @expectedIncorrectUsage od_get_breakpoint_max_widths
 	 * @dataProvider data_provider_test_bad_od_get_breakpoint_max_widths
 	 *
 	 * @param int[] $breakpoints Breakpoints.
 	 * @param int[] $expected Expected breakpoints.
 	 */
 	public function test_bad_od_get_breakpoint_max_widths( array $breakpoints, array $expected ): void {
+		$this->setExpectedIncorrectUsage( 'Filter: 'od_breakpoint_max_widths'' );
 		add_filter(
 			'od_breakpoint_max_widths',
 			static function () use ( $breakpoints ): array {
@@ -766,10 +766,10 @@ static function (): string {
 	/**
 	 * Test bad od_get_url_metrics_breakpoint_sample_size().
 	 *
-	 * @expectedIncorrectUsage od_get_url_metrics_breakpoint_sample_size
 	 * @covers ::od_get_url_metrics_breakpoint_sample_size
 	 */
 	public function test_bad_od_get_url_metrics_breakpoint_sample_size(): void {
+		$this->setExpectedIncorrectUsage( 'Filter: 'od_url_metrics_breakpoint_sample_size'' );
 		add_filter(
 			'od_url_metrics_breakpoint_sample_size',
 			static function (): int {