Merge remote-tracking branch 'upstream' into trunk

Author: desrosj

src/wp-admin/contribute.php

@@ -13,7 +13,7 @@
 $title = __( 'Get Involved' );
 
 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
-$header_alt_text = sprintf(
+$header_alt_text         = sprintf(
 	/* translators: %s: Version number. */
 	__( 'WordPress %s' ),
 	$display_version

src/wp-admin/credits.php

@@ -14,7 +14,7 @@
 $title = __( 'Credits' );
 
 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
-$header_alt_text = sprintf(
+$header_alt_text         = sprintf(
 	/* translators: %s: Version number. */
 	__( 'WordPress %s' ),
 	$display_version

src/wp-admin/freedoms.php

@@ -19,7 +19,7 @@
 $title = __( 'Freedoms' );
 
 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
-$header_alt_text = sprintf(
+$header_alt_text         = sprintf(
 	/* translators: %s: Version number. */
 	__( 'WordPress %s' ),
 	$display_version

src/wp-admin/privacy.php

@@ -13,7 +13,7 @@
 $title = __( 'Privacy' );
 
 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
-$header_alt_text = sprintf(
+$header_alt_text         = sprintf(
 	/* translators: %s: Version number. */
 	__( 'WordPress %s' ),
 	$display_version

tests/phpunit/tests/db.php

@@ -122,28 +122,41 @@ public function test_locale_floats() {
 
 	/**
 	 * @ticket 10041
+	 *
+	 * @dataProvider data_esc_like
+	 *
+	 * @param string $input    The input string.
+	 * @param string $expected The expected escaped string.
 	 */
-	public function test_esc_like() {
+	public function test_esc_like( $input, $expected ) {
 		global $wpdb;
 
-		$inputs   = array(
-			'howdy%',              // Single percent.
-			'howdy_',              // Single underscore.
-			'howdy\\',             // Single slash.
-			'howdy\\howdy%howdy_', // The works.
-			'howdy\'"[[]*#[^howdy]!+)(*&$#@!~|}{=--`/.,<>?', // Plain text.
-		);
-		$expected = array(
-			'howdy\\%',
-			'howdy\\_',
-			'howdy\\\\',
-			'howdy\\\\howdy\\%howdy\\_',
-			'howdy\'"[[]*#[^howdy]!+)(*&$#@!~|}{=--`/.,<>?',
-		);
+		$this->assertSame( $expected, $wpdb->esc_like( $input ) );
+	}
 
-		foreach ( $inputs as $key => $input ) {
-			$this->assertSame( $expected[ $key ], $wpdb->esc_like( $input ) );
-		}
+	public function data_esc_like() {
+		return array(
+			'single percent'    => array(
+				'howdy%',
+				'howdy\\%',
+			),
+			'single underscore' => array(
+				'howdy_',
+				'howdy\\_',
+			),
+			'single slash'      => array(
+				'howdy\\',
+				'howdy\\\\',
+			),
+			'the works'         => array(
+				'howdy\\howdy%howdy_',
+				'howdy\\\\howdy\\%howdy\\_',
+			),
+			'plain text'        => array(
+				'howdy\'"[[]*#[^howdy]!+)(*&$#@!~|}{=--`/.,<>?',
+				'howdy\'"[[]*#[^howdy]!+)(*&$#@!~|}{=--`/.,<>?',
+			),
+		);
 	}
 
 	/**