Changeset 47107

Timestamp:

01/23/2020 12:25:38 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Cache API: Remove WP_Object_Cache::__destruct() and wpdb::__destruct().

Originally added in [4686], these constructor/destructor pairings were designed to prevent the objects from being destroyed before shutdown, when output buffers are flushed.

A deeper investigation reveals that this approach didn't quite work as expected and was later made redundant by introducing wp_ob_end_flush_all() in [5462].

Props wonderboymusic, nacin, Mte90, SergeyBiryukov.
Fixes #21402.

Location:

trunk/src/wp-includes

Files:

• cache.php (modified) (2 diffs)
• wp-db.php (modified) (2 diffs)

trunk/src/wp-includes/cache.php

@@ -337 +337 @@
 
     /**
+     * Sets up object properties; PHP 5 style constructor.
+     *
+     * @since 2.0.8
+     */
+    public function __construct() {
+        $this->multisite   = is_multisite();
+        $this->blog_prefix = $this->multisite ? get_current_blog_id() . ':' : '';
+    }
+
+    /**
      * Makes private properties readable for backward compatibility.
      *
@@ -727 +737 @@
         return isset( $this->cache[ $group ] ) && ( isset( $this->cache[ $group ][ $key ] ) || array_key_exists( $key, $this->cache[ $group ] ) );
     }
-
-    /**
-     * Sets up object properties; PHP 5 style constructor.
-     *
-     * @since 2.0.8
-     */
-    public function __construct() {
-        $this->multisite   = is_multisite();
-        $this->blog_prefix = $this->multisite ? get_current_blog_id() . ':' : '';
-
-        /**
-         * @todo This should be moved to the PHP4 style constructor, PHP5
-         * already calls __destruct()
-         */
-        register_shutdown_function( array( $this, '__destruct' ) );
-    }
-
-    /**
-     * Saves the object cache before object is completely destroyed.
-     *
-     * Called upon object destruction, which should be when PHP ends.
-     *
-     * @since 2.0.8
-     *
-     * @return true Always returns true.
-     */
-    public function __destruct() {
-        return true;
-    }
-}
+}

trunk/src/wp-includes/wp-db.php

@@ -605 +605 @@
      */
     public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
-        register_shutdown_function( array( $this, '__destruct' ) );
-
         if ( WP_DEBUG && WP_DEBUG_DISPLAY ) {
             $this->show_errors();
@@ -631 +629 @@
 
         $this->db_connect();
-    }
-
-    /**
-     * PHP5 style destructor and will run when database object is destroyed.
-     *
-     * @see wpdb::__construct()
-     * @since 2.0.8
-     * @return true
-     */
-    public function __destruct() {
-        return true;
     }