Revert commits related to moving hello-dolly

aaronjorbin · aaronjorbin · commit de0171d18ec8 · 2025-10-14T16:05:45.000+02:00
Patch prepared in SVN by running the following commands:

svn merge -c -60725 .
svn merge -c -60721 .
svn merge -c -60716 .
svn merge -c -60770 .
svn merge -c -60666 .
diff --git a/.gitignore b/.gitignore
@@ -50,8 +50,7 @@ wp-tests-config.php
 /src/wp-content/fonts
 /src/wp-content/languages
 /src/wp-content/mu-plugins
-/src/wp-content/plugins/*
-!/src/wp-content/plugins/hello-dolly
+/src/wp-content/plugins
 /src/wp-content/themes/*
 !/src/wp-content/themes/twentyten
 !/src/wp-content/themes/twentyeleven
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -28,7 +28,7 @@ module.exports = function(grunt) {
 			'wp-content/themes/index.php',
 			'wp-content/themes/twenty*/**',
 			'wp-content/plugins/index.php',
-			'wp-content/plugins/hello-dolly/**',
+			'wp-content/plugins/hello.php',
 			'wp-content/plugins/akismet/**',
 			'!wp-content/themes/twenty*/node_modules/**',
 		],
diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php
@@ -153,6 +153,8 @@ function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup
 					load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) );
 				}
 			}
+		} elseif ( 'hello.php' === basename( $plugin_file ) ) {
+			$textdomain = 'default';
 		}
 		if ( $textdomain ) {
 			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field ) {
@@ -1006,6 +1008,10 @@ function delete_plugins( $plugins, $deprecated = '' ) {
 
 		$plugin_slug = dirname( $plugin_file );
 
+		if ( 'hello.php' === $plugin_file ) {
+			$plugin_slug = 'hello-dolly';
+		}
+
 		// Remove language files, silently.
 		if ( '.' !== $plugin_slug && ! empty( $plugin_translations[ $plugin_slug ] ) ) {
 			$translations = $plugin_translations[ $plugin_slug ];
diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php
@@ -841,8 +841,6 @@
 	'wp-includes/js/dist/undo-manager.min.js',
 	'wp-includes/js/dist/fields.min.js',
 	'wp-includes/js/dist/fields.js',
-	// 6.9
-	'wp-content/plugins/hello.php',
 );
 
 /**
@@ -975,7 +973,6 @@
 	'themes/twentytwentythree/' => '6.1',
 	'themes/twentytwentyfour/'  => '6.4',
 	'themes/twentytwentyfive/'  => '6.7',
-	'plugins/hello-dolly/'      => '6.9',
 );
 
 /**
diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
@@ -886,10 +886,6 @@ function upgrade_all() {
 		upgrade_682();
 	}
 
-	if ( $wp_current_db_version < 60717 ) {
-		upgrade_690();
-	}
-
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
@@ -2418,7 +2414,6 @@ function upgrade_650() {
 		wp_set_option_autoload_values( $autoload );
 	}
 }
-
 /**
  * Executes changes made in WordPress 6.7.0.
  *
@@ -2491,22 +2486,25 @@ function ( $url ) {
  * @ignore
  * @since 6.9.0
  *
- * @global int $wp_current_db_version The old (current) database version.
+ * @global int  $wp_current_db_version The old (current) database version.
+ * @global wpdb $wpdb                  WordPress database abstraction object.
  */
 function upgrade_690() {
-	global $wp_current_db_version;
+	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 60717 ) {
-		// Switch Hello Dolly from file to directory format. See #53323
-		$active_plugins = (array) get_option( 'active_plugins', array() );
-		$old_plugin     = 'hello.php';
-		$new_plugin     = 'hello-dolly/hello.php';
-		$key            = array_search( $old_plugin, $active_plugins, true );
+	// Switch Hello Dolly from file to directory format. See #53323
+	$active_plugins = get_option( 'active_plugins' );
+	$old_plugin     = 'hello.php';
+	$new_plugin     = 'hello-dolly/hello.php';
+	$key            = array_search( $old_plugin, $active_plugins, true );
 
-		if ( $key ) {
-			$active_plugins[ $key ] = $new_plugin;
-			update_option( 'active_plugins', $active_plugins );
-		}
+	if ( $key ) {
+		$active_plugins[ $key ] = $new_plugin;
+		update_option( 'active_plugins', $active_plugins );
+	}
+
+	if ( $wp_current_db_version < 60717 ) {
+		$wpdb->query( "ALTER TABLE $wpdb->posts ADD INDEX type_status_author (post_type,post_status,post_author)" );
 	}
 }
 
diff --git a/src/wp-content/plugins/hello-dolly/hello.php b/src/wp-content/plugins/hello-dolly/hello.php
diff --git a/src/wp-includes/class-wp-plugin-dependencies.php b/src/wp-includes/class-wp-plugin-dependencies.php
@@ -870,6 +870,9 @@ protected static function check_for_circular_dependencies( $dependents, $depende
 	 * @return string The plugin's slug.
 	 */
 	protected static function convert_to_slug( $plugin_file ) {
+		if ( 'hello.php' === $plugin_file ) {
+			return 'hello-dolly';
+		}
 		return str_contains( $plugin_file, '/' ) ? dirname( $plugin_file ) : str_replace( '.php', '', $plugin_file );
 	}
 }
diff --git a/tests/phpunit/tests/admin/includesPlugin.php b/tests/phpunit/tests/admin/includesPlugin.php
@@ -22,7 +22,7 @@ public static function wpTearDownAfterClass() {
 	}
 
 	public function test_get_plugin_data() {
-		$data = get_plugin_data( DIR_TESTDATA . '/plugins/hello-dolly/hello.php' );
+		$data = get_plugin_data( DIR_TESTDATA . '/plugins/hello.php' );
 
 		$default_headers = array(
 			'Name'        => 'Hello Dolly',
@@ -374,38 +374,38 @@ public function test_passing_float_as_position_does_not_override_int() {
 	}
 
 	public function test_is_plugin_active_true() {
-		activate_plugin( 'hello-dolly/hello.php' );
-		$test = is_plugin_active( 'hello-dolly/hello.php' );
+		activate_plugin( 'hello.php' );
+		$test = is_plugin_active( 'hello.php' );
 		$this->assertTrue( $test );
 
-		deactivate_plugins( 'hello-dolly/hello.php' );
+		deactivate_plugins( 'hello.php' );
 	}
 
 	public function test_is_plugin_active_false() {
-		deactivate_plugins( 'hello-dolly/hello.php' );
-		$test = is_plugin_active( 'hello-dolly/hello.php' );
+		deactivate_plugins( 'hello.php' );
+		$test = is_plugin_active( 'hello.php' );
 		$this->assertFalse( $test );
 	}
 
 	public function test_is_plugin_inactive_true() {
-		deactivate_plugins( 'hello-dolly/hello.php' );
-		$test = is_plugin_inactive( 'hello-dolly/hello.php' );
+		deactivate_plugins( 'hello.php' );
+		$test = is_plugin_inactive( 'hello.php' );
 		$this->assertTrue( $test );
 	}
 
 	public function test_is_plugin_inactive_false() {
-		activate_plugin( 'hello-dolly/hello.php' );
-		$test = is_plugin_inactive( 'hello-dolly/hello.php' );
+		activate_plugin( 'hello.php' );
+		$test = is_plugin_inactive( 'hello.php' );
 		$this->assertFalse( $test );
 
-		deactivate_plugins( 'hello-dolly/hello.php' );
+		deactivate_plugins( 'hello.php' );
 	}
 
 	/**
 	 * @covers ::get_plugin_files
 	 */
 	public function test_get_plugin_files_single() {
-		$name = 'hello-dolly/hello.php';
+		$name = 'hello.php';
 		$this->assertSame( array( $name ), get_plugin_files( $name ) );
 	}
 
@@ -550,7 +550,7 @@ public function test_get_dropins_not_empty() {
 	 * @covers ::is_network_only_plugin
 	 */
 	public function test_is_network_only_plugin_hello() {
-		$this->assertFalse( is_network_only_plugin( 'hello-dolly/hello.php' ) );
+		$this->assertFalse( is_network_only_plugin( 'hello.php' ) );
 	}
 
 	/**
@@ -570,7 +570,7 @@ public function test_is_network_only_plugin() {
 	 * @covers ::activate_plugins
 	 */
 	public function test_activate_plugins_single_no_array() {
-		$name = 'hello-dolly/hello.php';
+		$name = 'hello.php';
 		activate_plugins( $name );
 		$this->assertTrue( is_plugin_active( $name ) );
 		deactivate_plugins( $name );
@@ -580,7 +580,7 @@ public function test_activate_plugins_single_no_array() {
 	 * @covers ::activate_plugins
 	 */
 	public function test_activate_plugins_single_array() {
-		$name = 'hello-dolly/hello.php';
+		$name = 'hello.php';
 		activate_plugins( array( $name ) );
 		$this->assertTrue( is_plugin_active( $name ) );
 		deactivate_plugins( $name );
diff --git a/tests/phpunit/tests/admin/plugin-dependencies/hasDependents.php b/tests/phpunit/tests/admin/plugin-dependencies/hasDependents.php
@@ -53,6 +53,6 @@ public function test_should_return_false_when_a_plugin_has_no_dependents() {
 	 */
 	public function test_should_convert_hellophp_to_hello_dolly() {
 		$this->set_property_value( 'dependency_slugs', array( 'hello-dolly' ) );
-		$this->assertTrue( self::$instance::has_dependents( 'hello-dolly/hello.php' ) );
+		$this->assertTrue( self::$instance::has_dependents( 'hello.php' ) );
 	}
 }
diff --git a/tests/phpunit/tests/admin/plugin-dependencies/initialize.php b/tests/phpunit/tests/admin/plugin-dependencies/initialize.php
@@ -281,7 +281,11 @@ public function test_should_slugify_dependent_files() {
 		$expected_slugs = array();
 		foreach ( $plugins as $plugin_file => &$headers ) {
 			// Create the expected slugs.
-			$slug = str_replace( '.php', '', explode( '/', $plugin_file )[0] );
+			if ( 'hello.php' === $plugin_file ) {
+				$slug = 'hello-dolly';
+			} else {
+				$slug = str_replace( '.php', '', explode( '/', $plugin_file )[0] );
+			}
 
 			$expected_slugs[ $plugin_file ] = $slug;
 
diff --git a/tests/phpunit/tests/ajax/wpAjaxUpdatePlugin.php b/tests/phpunit/tests/ajax/wpAjaxUpdatePlugin.php
@@ -138,7 +138,7 @@ public function test_update_plugin() {
 		$this->_setRole( 'administrator' );
 
 		$_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
-		$_POST['plugin']      = 'hello-dolly/hello.php';
+		$_POST['plugin']      = 'hello.php';
 		$_POST['slug']        = 'hello-dolly';
 
 		// Prevent wp_update_plugins() from running.
@@ -163,7 +163,7 @@ public function test_update_plugin() {
 				'slug'         => 'hello-dolly',
 				'oldVersion'   => 'Version 1.7.2',
 				'newVersion'   => '',
-				'plugin'       => 'hello-dolly/hello.php',
+				'plugin'       => 'hello.php',
 				'pluginName'   => 'Hello Dolly',
 				'debug'        => array( 'The plugin is at the latest version.' ),
 				'errorMessage' => 'The plugin is at the latest version.',
diff --git a/tests/phpunit/tests/block-templates/base.php b/tests/phpunit/tests/block-templates/base.php
@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @group block-templates
  * @covers ::get_template_hierarchy
  */
 abstract class WP_Block_Templates_UnitTestCase extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/dependencies/scripts.php b/tests/phpunit/tests/dependencies/scripts.php
@@ -3024,7 +3024,7 @@ public function test_wp_set_script_translations_dependency() {
 	 * @covers ::wp_enqueue_code_editor
 	 */
 	public function test_wp_enqueue_code_editor_when_php_file_will_be_passed() {
-		$real_file              = WP_PLUGIN_DIR . '/hello-dolly/hello.php';
+		$real_file              = WP_PLUGIN_DIR . '/hello.php';
 		$wp_enqueue_code_editor = wp_enqueue_code_editor( array( 'file' => $real_file ) );
 		$this->assertNonEmptyMultidimensionalArray( $wp_enqueue_code_editor );
 
diff --git a/tests/phpunit/tests/image/base.php b/tests/phpunit/tests/image/base.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Base class for testing image manipulation functionality.
+ * @group image
  */
 abstract class WP_Image_UnitTestCase extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/image/resize.php b/tests/phpunit/tests/image/resize.php
@@ -1,7 +1,10 @@
 <?php
 
 /**
- * Base class for testing image resize functionality.
+ * @group image
+ * @group media
+ * @group upload
+ * @group resize
  */
 require_once __DIR__ . '/base.php';
 
diff --git a/tests/phpunit/tests/multisite/network.php b/tests/phpunit/tests/multisite/network.php

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,8 @@ function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup`
`153`	`153`	`load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) );`
`154`	`154`	`}`
`155`	`155`	`}`
	`156`	`+ } elseif ( 'hello.php' === basename( $plugin_file ) ) {`
	`157`	`+ $textdomain = 'default';`
`156`	`158`	`}`
`157`	`159`	`if ( $textdomain ) {`
`158`	`160`	`foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field ) {`
`@@ -1006,6 +1008,10 @@ function delete_plugins( $plugins, $deprecated = '' ) {`
`1006`	`1008`
`1007`	`1009`	`$plugin_slug = dirname( $plugin_file );`
`1008`	`1010`
	`1011`	`+ if ( 'hello.php' === $plugin_file ) {`
	`1012`	`+ $plugin_slug = 'hello-dolly';`
	`1013`	`+ }`
	`1014`	`+`
`1009`	`1015`	`// Remove language files, silently.`
`1010`	`1016`	`if ( '.' !== $plugin_slug && ! empty( $plugin_translations[ $plugin_slug ] ) ) {`
`1011`	`1017`	`$translations = $plugin_translations[ $plugin_slug ];`
Original file line number	Diff line number	Diff line change
`@@ -870,6 +870,9 @@ protected static function check_for_circular_dependencies( $dependents, $depende`
`870`	`870`	`* @return string The plugin's slug.`
`871`	`871`	`*/`
`872`	`872`	`protected static function convert_to_slug( $plugin_file ) {`
	`873`	`+ if ( 'hello.php' === $plugin_file ) {`
	`874`	`+ return 'hello-dolly';`
	`875`	`+ }`
`873`	`876`	`return str_contains( $plugin_file, '/' ) ? dirname( $plugin_file ) : str_replace( '.php', '', $plugin_file );`
`874`	`877`	`}`
`875`	`878`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,6 @@ public function test_should_return_false_when_a_plugin_has_no_dependents() {`
`53`	`53`	`*/`
`54`	`54`	`public function test_should_convert_hellophp_to_hello_dolly() {`
`55`	`55`	`$this->set_property_value( 'dependency_slugs', array( 'hello-dolly' ) );`
`56`		`- $this->assertTrue( self::$instance::has_dependents( 'hello-dolly/hello.php' ) );`
	`56`	`+ $this->assertTrue( self::$instance::has_dependents( 'hello.php' ) );`
`57`	`57`	`}`
`58`	`58`	`}`