Changeset 46220 for trunk/src/wp-includes/class-wp-widget-factory.php

Timestamp:

09/20/2019 10:33:13 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Remove workarounds for spl_object_hash().

The spl_object_hash() function was introduced in PHP 5.2.0. As of PHP 5.3, the PHP SPL extension can no longer be disabled, so these workarounds are no longer needed.

Props jrf.
See #48074.

File:

• trunk/src/wp-includes/class-wp-widget-factory.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-widget-factory.php

@@ -57 +57 @@
 
         /**
-         * Hashes an object, doing fallback of `spl_object_hash()` if not available.
-         *
-         * This can be eliminated in favor of straight spl_object_hash() when 5.3
-         * is the minimum requirement for PHP.
-         *
-         * @since 4.6.0
-         *
-         * @param WP_Widget $widget Widget.
-         * @return string Object hash.
-         */
-        private function hash_object( $widget ) {
-                if ( function_exists( 'spl_object_hash' ) ) {
-                        return spl_object_hash( $widget );
-                } else {
-                        $class_name = get_class( $widget );
-                        $hash       = $class_name;
-                        if ( ! isset( $widget->_wp_widget_factory_hash_id ) ) {
-                                if ( ! isset( $this->hashed_class_counts[ $class_name ] ) ) {
-                                        $this->hashed_class_counts[ $class_name ] = 0;
-                                }
-                                $this->hashed_class_counts[ $class_name ] += 1;
-                                $widget->_wp_widget_factory_hash_id        = $this->hashed_class_counts[ $class_name ];
-                        }
-                        $hash .= ':' . $widget->_wp_widget_factory_hash_id;
-                        return $hash;
-                }
-        }
-
-        /**
          * Registers a widget subclass.
          *
@@ -96 +67 @@
         public function register( $widget ) {
                 if ( $widget instanceof WP_Widget ) {
-                        $this->widgets[ $this->hash_object( $widget ) ] = $widget;
+                        $this->widgets[ spl_object_hash( $widget ) ] = $widget;
                 } else {
                         $this->widgets[ $widget ] = new $widget();
@@ -113 +84 @@
         public function unregister( $widget ) {
                 if ( $widget instanceof WP_Widget ) {
-                        unset( $this->widgets[ $this->hash_object( $widget ) ] );
+                        unset( $this->widgets[ spl_object_hash( $widget ) ] );
                 } else {
                         unset( $this->widgets[ $widget ] );