Merge branch 'WordPress:trunk' into trunk

Author: dd32

tests/phpunit/tests/compat/mbStrlen.php

@@ -13,8 +13,9 @@ class Tests_Compat_mbStrlen extends WP_UnitTestCase {
 	 * Test that the native mb_strlen() is available.
 	 */
 	public function test_mb_strlen_availability() {
-		$this->assertTrue(
-			in_array( 'mb_strlen', get_defined_functions()['internal'], true ),
+		$this->assertContains(
+			'mb_strlen',
+			get_defined_functions()['internal'],
 			'Test runner should have `mbstring` extension active but doesn’t.'
 		);
 	}

tests/phpunit/tests/compat/mbSubstr.php

@@ -13,8 +13,9 @@ class Tests_Compat_mbSubstr extends WP_UnitTestCase {
 	 * Test that mb_substr() is always available (either from PHP or WP).
 	 */
 	public function test_mb_substr_availability() {
-		$this->assertTrue(
-			in_array( 'mb_substr', get_defined_functions()['internal'], true ),
+		$this->assertContains(
+			'mb_substr',
+			get_defined_functions()['internal'],
 			'Test runner should have `mbstring` extension active but doesn’t.'
 		);
 	}

tests/phpunit/tests/post/types.php

@@ -343,7 +343,7 @@ public function test_unregister_post_type_removes_query_vars() {
 
 		$this->assertIsInt( array_search( 'bar', $wp->public_query_vars, true ) );
 		$this->assertTrue( unregister_post_type( 'foo' ) );
-		$this->assertFalse( array_search( 'bar', $wp->public_query_vars, true ) );
+		$this->assertNotContains( 'bar', $wp->public_query_vars );
 	}
 
 	/**
@@ -463,8 +463,8 @@ public function test_unregister_post_type_removes_post_type_from_taxonomies() {
 		$this->assertIsInt( array_search( 'foo', $wp_taxonomies['category']->object_type, true ) );
 		$this->assertIsInt( array_search( 'foo', $wp_taxonomies['post_tag']->object_type, true ) );
 		$this->assertTrue( unregister_post_type( 'foo' ) );
-		$this->assertFalse( array_search( 'foo', $wp_taxonomies['category']->object_type, true ) );
-		$this->assertFalse( array_search( 'foo', $wp_taxonomies['post_tag']->object_type, true ) );
+		$this->assertNotContains( 'foo', $wp_taxonomies['category']->object_type );
+		$this->assertNotContains( 'foo', $wp_taxonomies['post_tag']->object_type );
 		$this->assertEmpty( get_object_taxonomies( 'foo' ) );
 	}
 

tests/phpunit/tests/post/wpPostType.php

@@ -171,8 +171,8 @@ public function test_adds_rewrite_rules() {
 		$post_type_object->remove_rewrite_rules();
 		$rewrite_tags_after = $wp_rewrite->rewritecode;
 
-		$this->assertNotFalse( array_search( "%$post_type%", $rewrite_tags, true ) );
-		$this->assertFalse( array_search( "%$post_type%", $rewrite_tags_after, true ) );
+		$this->assertContains( "%$post_type%", $rewrite_tags );
+		$this->assertNotContains( "%$post_type%", $rewrite_tags_after );
 	}
 
 	public function test_register_meta_boxes() {

tests/phpunit/tests/taxonomy.php

@@ -895,7 +895,7 @@ public function test_unregister_taxonomy_removes_query_vars() {
 
 		$this->assertIsInt( array_search( 'bar', $wp->public_query_vars, true ) );
 		$this->assertTrue( unregister_taxonomy( 'foo' ) );
-		$this->assertFalse( array_search( 'bar', $wp->public_query_vars, true ) );
+		$this->assertNotContains( 'bar', $wp->public_query_vars );
 	}
 
 	/**

tests/phpunit/tests/term/wpTaxonomy.php

@@ -74,8 +74,8 @@ public function test_adds_rewrite_rules() {
 		$taxonomy_object->remove_rewrite_rules();
 		$rewrite_tags_after = $wp_rewrite->rewritecode;
 
-		$this->assertNotFalse( array_search( "%$taxonomy%", $rewrite_tags, true ) );
-		$this->assertFalse( array_search( "%$taxonomy%", $rewrite_tags_after, true ) );
+		$this->assertContains( "%$taxonomy%", $rewrite_tags );
+		$this->assertNotContains( "%$taxonomy%", $rewrite_tags_after );
 	}
 
 	public function test_adds_ajax_callback() {

tests/phpunit/tests/theme.php

@@ -457,7 +457,7 @@ public function test_switch_theme() {
 				$this->assertSame( $theme['Stylesheet'], get_stylesheet() );
 
 				$root_fs = $theme->get_theme_root();
-				$this->assertTrue( is_dir( $root_fs ) );
+				$this->assertDirectoryExists( $root_fs );
 
 				$root_uri = $theme->get_theme_root_uri();
 				$this->assertNotEmpty( $root_uri );