From 9cf7385eb34f17f2fef899e14bbb407d59daf9cd Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 8 Jan 2018 10:35:13 +0000 Subject: [PATCH] Formatting: Fix capital_P_dangit() not capital P-ing, dangit. Unfortunately, in my overzealous desire to fix all the un-capitalised Ps, [42343] capitalled some Ps that intentionally should not be capitals. This commit fixes the incorrectly capitalling of Ps, as well as including unit tests and PHPCS instructions to ensure we never capitulate to capitalisationing them again. Props superdav42. Fixes #43040. Fixes #43041. git-svn-id: https://develop.svn.wordpress.org/trunk@42429 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/formatting.php | 6 ++++-- .../tests/formatting/CapitalPDangit.php | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 tests/phpunit/tests/formatting/CapitalPDangit.php diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php index ce2c851bc5..f9795fdaec 100644 --- a/src/wp-includes/formatting.php +++ b/src/wp-includes/formatting.php @@ -5077,8 +5077,9 @@ function wp_basename( $path, $suffix = '' ) { return urldecode( basename( str_replace( array( '%2F', '%5C' ), '/', urlencode( $path ) ), $suffix ) ); } +// phpcs:disable WordPress.WP.CapitalPDangit.Misspelled, WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid -- 8-) /** - * Forever eliminate "WordPress" from the planet (or at least the little bit we can influence). + * Forever eliminate "Wordpress" from the planet (or at least the little bit we can influence). * * Violating our coding standards for a good function name. * @@ -5093,7 +5094,7 @@ function capital_P_dangit( $text ) { // Simple replacement for titles $current_filter = current_filter(); if ( 'the_title' === $current_filter || 'wp_title' === $current_filter ) { - return str_replace( 'WordPress', 'WordPress', $text ); + return str_replace( 'Wordpress', 'WordPress', $text ); } // Still here? Use the more judicious replacement static $dblq = false; @@ -5106,6 +5107,7 @@ function capital_P_dangit( $text ) { $text ); } +// phpcs:enable /** * Sanitize a mime type diff --git a/tests/phpunit/tests/formatting/CapitalPDangit.php b/tests/phpunit/tests/formatting/CapitalPDangit.php new file mode 100644 index 0000000000..06aec81b49 --- /dev/null +++ b/tests/phpunit/tests/formatting/CapitalPDangit.php @@ -0,0 +1,20 @@ +assertEquals( 'Something about WordPress', capital_P_dangit( 'Something about Wordpress' ) ); + $this->assertEquals( 'Something about (WordPress', capital_P_dangit( 'Something about (Wordpress' ) ); + $this->assertEquals( 'Something about ‘WordPress', capital_P_dangit( 'Something about ‘Wordpress' ) ); + $this->assertEquals( 'Something about “WordPress', capital_P_dangit( 'Something about “Wordpress' ) ); + $this->assertEquals( 'Something about >WordPress', capital_P_dangit( 'Something about >Wordpress' ) ); + $this->assertEquals( 'Wordpress', capital_P_dangit( 'Wordpress' ) ); + + $wp_current_filter = array( 'the_title' ); + $this->assertEquals( 'WordPress', capital_P_dangit( 'Wordpress' ) ); + } +}