Merge branch 'trunk' into bundled-themes-7-0

Author: shail-mehta

src/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -59,7 +59,7 @@ public function __construct( $args = array() ) {
 
 		$page = $this->get_pagenum();
 
-		$this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
+		$this->is_site_themes = 'site-themes-network' === $this->screen->id;
 
 		if ( $this->is_site_themes ) {
 			$this->site_id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;

src/wp-admin/includes/upgrade.php

@@ -3282,7 +3282,7 @@ function dbDelta( $queries = '', $execute = true ) { // phpcs:ignore WordPress.N
 					'fieldname' => $tableindex->Column_name,
 					'subpart'   => $tableindex->Sub_part,
 				);
-				$index_ary[ $keyname ]['unique']     = ( '0' === (string) $tableindex->Non_unique ) ? true : false;
+				$index_ary[ $keyname ]['unique']     = '0' === (string) $tableindex->Non_unique;
 				$index_ary[ $keyname ]['index_type'] = $tableindex->Index_type;
 			}
 

src/wp-admin/nav-menus.php

@@ -549,9 +549,9 @@
 $menu_count = count( $nav_menus );
 
 // Are we on the add new screen?
-$add_new_screen = ( isset( $_GET['menu'] ) && 0 === (int) $_GET['menu'] ) ? true : false;
+$add_new_screen = isset( $_GET['menu'] ) && 0 === (int) $_GET['menu'];
 
-$locations_screen = ( isset( $_GET['action'] ) && 'locations' === $_GET['action'] ) ? true : false;
+$locations_screen = isset( $_GET['action'] ) && 'locations' === $_GET['action'];
 
 $page_count = wp_count_posts( 'page' );
 

tests/phpunit/tests/pomo/pluralForms.php

@@ -39,25 +39,26 @@ protected static function parenthesize_plural_expression( $expression ) {
 
 	/**
 	 * @ticket 41562
-	 * @dataProvider data_locales
 	 * @group external-http
 	 */
-	public function test_regression( $lang, $nplurals, $expression ) {
+	public function test_regression(): void {
 		require_once dirname( __DIR__, 2 ) . '/includes/plural-form-function.php';
 
-		$parenthesized = self::parenthesize_plural_expression( $expression );
-		$old_style     = tests_make_plural_form_function( $nplurals, $parenthesized );
-		$plural_forms  = new Plural_Forms( $expression );
+		foreach ( self::data_locales() as list( $lang, $nplurals, $expression ) ) {
+			$parenthesized = self::parenthesize_plural_expression( $expression );
+			$old_style     = tests_make_plural_form_function( $nplurals, $parenthesized );
+			$plural_forms  = new Plural_Forms( $expression );
 
-		$generated_old = array();
-		$generated_new = array();
+			$generated_old = array();
+			$generated_new = array();
 
-		foreach ( range( 0, 200 ) as $i ) {
-			$generated_old[] = $old_style( $i );
-			$generated_new[] = $plural_forms->get( $i );
-		}
+			foreach ( range( 0, 200 ) as $i ) {
+				$generated_old[] = $old_style( $i );
+				$generated_new[] = $plural_forms->get( $i );
+			}
 
-		$this->assertSame( $generated_old, $generated_new );
+			$this->assertSame( $generated_old, $generated_new );
+		}
 	}
 
 	/**
@@ -70,7 +71,15 @@ public function test_locales_file_not_empty() {
 		$this->assertNotEmpty( $locales, 'Unable to retrieve GP_Locales file' );
 	}
 
-	public static function data_locales() {
+	/**
+	 * Gets locale data.
+	 *
+	 * Note: Do not use this method directly as a data provider, or else it may cause an unconditional HTTP request
+	 * during PHPUnit initialization. See <https://core.trac.wordpress.org/ticket/64963>.
+	 *
+	 * @return array<int, array{ 0: string, 1: int, 2: string }>
+	 */
+	public static function data_locales(): array {
 		if ( ! class_exists( 'GP_Locales' ) ) {
 			$filename = download_url( 'https://raw.githubusercontent.com/GlotPress/GlotPress-WP/develop/locales/locales.php' );
 			if ( is_wp_error( $filename ) ) {