clean the branch

Author: aaronjorbin

.gitignore

@@ -50,7 +50,8 @@ 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/*
+!/src/wp-content/plugins/hello-dolly
 /src/wp-content/themes/*
 !/src/wp-content/themes/twentyten
 !/src/wp-content/themes/twentyeleven

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.php',
+			'wp-content/plugins/hello-dolly/**',
 			'wp-content/plugins/akismet/**',
 			'!wp-content/themes/twenty*/node_modules/**',
 		],

src/wp-admin/includes/plugin.php

@@ -153,8 +153,6 @@ 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 ) {
@@ -1008,10 +1006,6 @@ 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 ];

src/wp-admin/includes/update-core.php

@@ -841,6 +841,8 @@
 	'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',
 );
 
 /**
@@ -973,6 +975,7 @@
 	'themes/twentytwentythree/' => '6.1',
 	'themes/twentytwentyfour/'  => '6.4',
 	'themes/twentytwentyfive/'  => '6.7',
+	'plugins/hello-dolly/'      => '6.9',
 );
 
 /**

src/wp-admin/includes/upgrade.php

@@ -886,6 +886,10 @@ function upgrade_all() {
 		upgrade_682();
 	}
 
+	if ( $wp_current_db_version < 60717 ) {
+		upgrade_690();
+	}
+
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
@@ -2414,6 +2418,7 @@ function upgrade_650() {
 		wp_set_option_autoload_values( $autoload );
 	}
 }
+
 /**
  * Executes changes made in WordPress 6.7.0.
  *
@@ -2480,6 +2485,31 @@ function ( $url ) {
 	}
 }
 
+/**
+ * Executes changes made in WordPress 6.9.0.
+ *
+ * @ignore
+ * @since 6.9.0
+ *
+ * @global int $wp_current_db_version The old (current) database version.
+ */
+function upgrade_690() {
+	global $wp_current_db_version;
+
+	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 );
+
+		if ( $key ) {
+			$active_plugins[ $key ] = $new_plugin;
+			update_option( 'active_plugins', $active_plugins );
+		}
+	}
+}
+
 /**
  * Executes network-level upgrade routines.
  *

src/wp-content/plugins/hello-dolly/hello.php

@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package Hello_Dolly
+ * @version 1.7.2
+ */
+/*
+Plugin Name: Hello Dolly
+Plugin URI: http://wordpress.org/plugins/hello-dolly/
+Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
+Author: Matt Mullenweg
+Version: 1.7.2
+Author URI: http://ma.tt/
+Text Domain: hello-dolly
+*/
+
+// Do not load directly.
+if ( ! defined( 'ABSPATH' ) ) {
+	die();
+}
+
+function hello_dolly_get_lyric() {
+	/** These are the lyrics to Hello Dolly */
+	$lyrics = "Hello, Dolly
+Well, hello, Dolly
+It's so nice to have you back where you belong
+You're lookin' swell, Dolly
+I can tell, Dolly
+You're still glowin', you're still crowin'
+You're still goin' strong
+I feel the room swayin'
+While the band's playin'
+One of our old favorite songs from way back when
+So, take her wrap, fellas
+Dolly, never go away again
+Hello, Dolly
+Well, hello, Dolly
+It's so nice to have you back where you belong
+You're lookin' swell, Dolly
+I can tell, Dolly
+You're still glowin', you're still crowin'
+You're still goin' strong
+I feel the room swayin'
+While the band's playin'
+One of our old favorite songs from way back when
+So, golly, gee, fellas
+Have a little faith in me, fellas
+Dolly, never go away
+Promise, you'll never go away
+Dolly'll never go away again";
+
+	// Here we split it into lines.
+	$lyrics = explode( "\n", $lyrics );
+
+	// And then randomly choose a line.
+	return wptexturize( $lyrics[ mt_rand( 0, count( $lyrics ) - 1 ) ] );
+}
+
+// This just echoes the chosen line, we'll position it later.
+function hello_dolly() {
+	$chosen = hello_dolly_get_lyric();
+	$lang   = '';
+	if ( 'en_' !== substr( get_user_locale(), 0, 3 ) ) {
+		$lang = ' lang="en"';
+	}
+
+	printf(
+		'<p id="dolly"><span class="screen-reader-text">%s </span><span dir="ltr"%s>%s</span></p>',
+		__( 'Quote from Hello Dolly song, by Jerry Herman:' ),
+		$lang,
+		$chosen
+	);
+}
+
+// Now we set that function up to execute when the admin_notices action is called.
+add_action( 'admin_notices', 'hello_dolly' );
+
+// We need some CSS to position the paragraph.
+function dolly_css() {
+	echo "
+	<style type='text/css'>
+	#dolly {
+		float: right;
+		padding: 5px 10px;
+		margin: 0;
+		font-size: 12px;
+		line-height: 1.6666;
+	}
+	.rtl #dolly {
+		float: left;
+	}
+	.block-editor-page #dolly {
+		display: none;
+	}
+	@media screen and (max-width: 782px) {
+		#dolly,
+		.rtl #dolly {
+			float: none;
+			padding-left: 0;
+			padding-right: 0;
+		}
+	}
+	</style>
+	";
+}
+
+add_action( 'admin_head', 'dolly_css' );

src/wp-includes/class-wp-plugin-dependencies.php

@@ -870,9 +870,6 @@ 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 );
 	}
 }

tests/phpunit/data/plugins/hello.php …punit/data/plugins/hello-dolly/hello.phptests/phpunit/data/plugins/hello.php renamed to tests/phpunit/data/plugins/hello-dolly/hello.php tests/phpunit/data/plugins/hello.php renamed to tests/phpunit/data/plugins/hello-dolly/hello.php

@@ -22,7 +22,7 @@ public static function wpTearDownAfterClass() {
 	}
 
 	public function test_get_plugin_data() {
-		$data = get_plugin_data( DIR_TESTDATA . '/plugins/hello.php' );
+		$data = get_plugin_data( DIR_TESTDATA . '/plugins/hello-dolly/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.php' );
-		$test = is_plugin_active( 'hello.php' );
+		activate_plugin( 'hello-dolly/hello.php' );
+		$test = is_plugin_active( 'hello-dolly/hello.php' );
 		$this->assertTrue( $test );
 
-		deactivate_plugins( 'hello.php' );
+		deactivate_plugins( 'hello-dolly/hello.php' );
 	}
 
 	public function test_is_plugin_active_false() {
-		deactivate_plugins( 'hello.php' );
-		$test = is_plugin_active( 'hello.php' );
+		deactivate_plugins( 'hello-dolly/hello.php' );
+		$test = is_plugin_active( 'hello-dolly/hello.php' );
 		$this->assertFalse( $test );
 	}
 
 	public function test_is_plugin_inactive_true() {
-		deactivate_plugins( 'hello.php' );
-		$test = is_plugin_inactive( 'hello.php' );
+		deactivate_plugins( 'hello-dolly/hello.php' );
+		$test = is_plugin_inactive( 'hello-dolly/hello.php' );
 		$this->assertTrue( $test );
 	}
 
 	public function test_is_plugin_inactive_false() {
-		activate_plugin( 'hello.php' );
-		$test = is_plugin_inactive( 'hello.php' );
+		activate_plugin( 'hello-dolly/hello.php' );
+		$test = is_plugin_inactive( 'hello-dolly/hello.php' );
 		$this->assertFalse( $test );
 
-		deactivate_plugins( 'hello.php' );
+		deactivate_plugins( 'hello-dolly/hello.php' );
 	}
 
 	/**
 	 * @covers ::get_plugin_files
 	 */
 	public function test_get_plugin_files_single() {
-		$name = 'hello.php';
+		$name = 'hello-dolly/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.php' ) );
+		$this->assertFalse( is_network_only_plugin( 'hello-dolly/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.php';
+		$name = 'hello-dolly/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.php';
+		$name = 'hello-dolly/hello.php';
 		activate_plugins( array( $name ) );
 		$this->assertTrue( is_plugin_active( $name ) );
 		deactivate_plugins( $name );

tests/phpunit/tests/admin/includesPlugin.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.php' ) );
+		$this->assertTrue( self::$instance::has_dependents( 'hello-dolly/hello.php' ) );
 	}
 }