Changeset 61006

Timestamp:

10/21/2025 04:31:04 AM (7 weeks ago)

Author:

peterwilsoncc

Message:

Upgrade/Install: Revert relocation of Hello Dolly plugin.

Reverts Hello Dolly changes moving the plugin to a containing folder. Removes the upgrade_690() function in it's entirety as the upgrade routine is no longer required.

Fully reverted commits: [60666], [60670], [60716], [60725]; partially reverts [60721].

Porps johnbillion, whyisjake, SirLouen, mindctrl, afragen, jorbin, Otto42, swissspidy, welcher, davidbaumwald.
See #53323.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• Gruntfile.js (modified) (1 diff)
• src/wp-admin/includes/plugin.php (modified) (2 diffs)
• src/wp-admin/includes/update-core.php (modified) (2 diffs)
• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• src/wp-content/plugins/hello.php (moved) (moved from trunk/src/wp-content/plugins/hello-dolly/hello.php)
• src/wp-includes/class-wp-plugin-dependencies.php (modified) (1 diff)
• tests/phpunit/data/plugins/hello.php (moved) (moved from trunk/tests/phpunit/data/plugins/hello-dolly/hello.php)
• tests/phpunit/tests/admin/includesPlugin.php (modified) (6 diffs)
• tests/phpunit/tests/admin/plugin-dependencies/hasDependents.php (modified) (1 diff)
• tests/phpunit/tests/admin/plugin-dependencies/initialize.php (modified) (1 diff)
• tests/phpunit/tests/ajax/wpAjaxUpdatePlugin.php (modified) (2 diffs)
• tests/phpunit/tests/dependencies/scripts.php (modified) (1 diff)
• tests/phpunit/tests/multisite/network.php (modified) (4 diffs)

trunk/.gitignore

@@ -51 +51 @@
 /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

trunk/Gruntfile.js

@@ -29 +29 @@
             '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/**',

trunk/src/wp-admin/includes/plugin.php

@@ -154 +154 @@
                 }
             }
+        } elseif ( 'hello.php' === basename( $plugin_file ) ) {
+            $textdomain = 'default';
         }
         if ( $textdomain ) {
@@ -1006 +1008 @@
 
         $plugin_slug = dirname( $plugin_file );
+
+        if ( 'hello.php' === $plugin_file ) {
+            $plugin_slug = 'hello-dolly';
+        }
 
         // Remove language files, silently.

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

@@ -842 +842 @@
     'wp-includes/js/dist/fields.min.js',
     'wp-includes/js/dist/fields.js',
-    // 6.9
-    'wp-content/plugins/hello.php',
 );
 
@@ -976 +974 @@
     'themes/twentytwentyfour/'  => '6.4',
     'themes/twentytwentyfive/'  => '6.7',
-    'plugins/hello-dolly/'      => '6.9',
 );
 

trunk/src/wp-admin/includes/upgrade.php

@@ -887 +887 @@
     }
 
-    if ( $wp_current_db_version < 60717 ) {
-        upgrade_690();
-    }
-
     maybe_disable_link_manager();
 
@@ -2487 +2483 @@
 
 /**
- * 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.
  *

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

@@ -871 +871 @@
      */
     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 );
     }

trunk/tests/phpunit/tests/admin/includesPlugin.php

@@ -23 +23 @@
 
     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(
@@ -375 +375 @@
 
     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' );
     }
 
@@ -406 +406 @@
      */
     public function test_get_plugin_files_single() {
-        $name = 'hello-dolly/hello.php';
+        $name = 'hello.php';
         $this->assertSame( array( $name ), get_plugin_files( $name ) );
     }
@@ -551 +551 @@
      */
     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' ) );
     }
 
@@ -571 +571 @@
      */
     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 ) );
@@ -581 +581 @@
      */
     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 ) );

trunk/tests/phpunit/tests/admin/plugin-dependencies/hasDependents.php

@@ -54 +54 @@
     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' ) );
     }
 }

trunk/tests/phpunit/tests/admin/plugin-dependencies/initialize.php

@@ -282 +282 @@
         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;

trunk/tests/phpunit/tests/ajax/wpAjaxUpdatePlugin.php

@@ -139 +139 @@
 
         $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
-        $_POST['plugin']      = 'hello-dolly/hello.php';
+        $_POST['plugin']      = 'hello.php';
         $_POST['slug']        = 'hello-dolly';
 
@@ -164 +164 @@
                 '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.' ),

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -2995 +2995 @@
      */
     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 );

trunk/tests/phpunit/tests/multisite/network.php

@@ -274 +274 @@
 
     public function test_active_network_plugins() {
-        $path = 'hello-dolly/hello.php';
+        $path = 'hello.php';
 
         // Local activate, should be invisible for the network.
@@ -286 +286 @@
         activate_plugin( $path, '', true ); // Enable the plugin for all sites in the network.
         $active_plugins = wp_get_active_network_plugins();
-        $this->assertSame( array( WP_PLUGIN_DIR . '/hello-dolly/hello.php' ), $active_plugins );
+        $this->assertSame( array( WP_PLUGIN_DIR . '/hello.php' ), $active_plugins );
 
         // Deactivate the plugin.
@@ -305 +305 @@
      */
     public function test_duplicate_network_active_plugin() {
-        $path = 'hello-dolly/hello.php';
+        $path = 'hello.php';
         $mock = new MockAction();
         add_action( 'activate_' . $path, array( $mock, 'action' ) );
@@ -325 +325 @@
 
     public function test_is_plugin_active_for_network_true() {
-        activate_plugin( 'hello-dolly/hello.php', '', true );
-        $this->assertTrue( is_plugin_active_for_network( 'hello-dolly/hello.php' ) );
+        activate_plugin( 'hello.php', '', true );
+        $this->assertTrue( is_plugin_active_for_network( 'hello.php' ) );
     }
 
     public function test_is_plugin_active_for_network_false() {
-        deactivate_plugins( 'hello-dolly/hello.php', false, true );
-        $this->assertFalse( is_plugin_active_for_network( 'hello-dolly/hello.php' ) );
+        deactivate_plugins( 'hello.php', false, true );
+        $this->assertFalse( is_plugin_active_for_network( 'hello.php' ) );
     }