enmi-conf.org: comparison wp/wp-includes/class-wp-object-cache.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 * in the wp-content folder which is looked at in wp-settings. If that file
 * exists, then this file will not be included.
 *
 * @since 2.0.0
 */
+#[AllowDynamicProperties]
 class WP_Object_Cache {
 	/**
 	 * Holds the cached objects.
 	 *
 	/**
 	 * List of global cache groups.
 	 *
 	 * @since 3.0.0
-	 * @var array
+	 * @var string[]
 	 */
 	protected $global_groups = array();
 	/**
 	 * The blog prefix to prepend to keys in non-global groups.
 	 *
 	 * @param string $name Property to unset.
 	 */
 	public function __unset( $name ) {
 		unset( $this->$name );
+	}
+	/**
+	 * Serves as a utility function to determine whether a key is valid.
+	 *
+	 * @since 6.1.0
+	 *
+	 * @param int|string $key Cache key to check for validity.
+	 * @return bool Whether the key is valid.
+	 */
+	protected function is_valid_key( $key ) {
+		if ( is_int( $key ) ) {
+			return true;
+		}
+		if ( is_string( $key ) && trim( $key ) !== '' ) {
+			return true;
+		}
+		$type = gettype( $key );
+		if ( ! function_exists( '__' ) ) {
+			wp_load_translations_early();
+		}
+		$message = is_string( $key )
+			? __( 'Cache key must not be an empty string.' )
+			/* translators: %s: The type of the given cache key. */
+			: sprintf( __( 'Cache key must be an integer or a non-empty string, %s given.' ), $type );
+		_doing_it_wrong(
+			sprintf( '%s::%s', __CLASS__, debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 2 )[1]['function'] ),
+			$message,
+			'6.1.0'
+		);
+		return false;
 	}
 	/**
 	 * Serves as a utility function to determine whether a key exists in the cache.
 	 *
 	public function add( $key, $data, $group = 'default', $expire = 0 ) {
 		if ( wp_suspend_cache_addition() ) {
 			return false;
 		}
+		if ( ! $this->is_valid_key( $key ) ) {
+			return false;
+		}
 		if ( empty( $group ) ) {
 			$group = 'default';
 		}
 		$id = $key;
 	 * @param int        $expire Optional. When to expire the cache contents, in seconds.
 	 *                           Default 0 (no expiration).
 	 * @return bool True if contents were replaced, false if original value does not exist.
 	 */
 	public function replace( $key, $data, $group = 'default', $expire = 0 ) {
+		if ( ! $this->is_valid_key( $key ) ) {
+			return false;
+		}
 		if ( empty( $group ) ) {
 			$group = 'default';
 		}
 		$id = $key;
 	 * The $expire parameter is not used, because the cache will automatically
 	 * expire for each time a page is accessed and PHP finishes. The method is
 	 * more for cache plugins which use files.
 	 *
 	 * @since 2.0.0
+	 * @since 6.1.0 Returns false if cache key is invalid.
 	 *
 	 * @param int|string $key    What to call the contents in the cache.
 	 * @param mixed      $data   The contents to store in the cache.
 	 * @param string     $group  Optional. Where to group the cache contents. Default 'default'.
 	 * @param int        $expire Optional. Not used.
-	 * @return true Always returns true.
+	 * @return bool True if contents were set, false if key is invalid.
 	 */
 	public function set( $key, $data, $group = 'default', $expire = 0 ) {
+		if ( ! $this->is_valid_key( $key ) ) {
+			return false;
+		}
 		if ( empty( $group ) ) {
 			$group = 'default';
 		}
 		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 	 * @param bool       $found Optional. Whether the key was found in the cache (passed by reference).
 	 *                          Disambiguates a return of false, a storable value. Default null.
 	 * @return mixed|false The cache contents on success, false on failure to retrieve contents.
 	 */
 	public function get( $key, $group = 'default', $force = false, &$found = null ) {
+		if ( ! $this->is_valid_key( $key ) ) {
+			return false;
+		}
 		if ( empty( $group ) ) {
 			$group = 'default';
 		}
 		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 	 * @param string     $group      Optional. Where the cache contents are grouped. Default 'default'.
 	 * @param bool       $deprecated Optional. Unused. Default false.
 	 * @return bool True on success, false if the contents were not deleted.
 	 */
 	public function delete( $key, $group = 'default', $deprecated = false ) {
+		if ( ! $this->is_valid_key( $key ) ) {
+			return false;
+		}
 		if ( empty( $group ) ) {
 			$group = 'default';
 		}
 		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 	 *                           Default 1.
 	 * @param string     $group  Optional. The group the key is in. Default 'default'.
 	 * @return int|false The item's new value on success, false on failure.
 	 */
 	public function incr( $key, $offset = 1, $group = 'default' ) {
+		if ( ! $this->is_valid_key( $key ) ) {
+			return false;
+		}
 		if ( empty( $group ) ) {
 			$group = 'default';
 		}
 		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 	 *                           Default 1.
 	 * @param string     $group  Optional. The group the key is in. Default 'default'.
 	 * @return int|false The item's new value on success, false on failure.
 	 */
 	public function decr( $key, $offset = 1, $group = 'default' ) {
+		if ( ! $this->is_valid_key( $key ) ) {
+			return false;
+		}
 		if ( empty( $group ) ) {
 			$group = 'default';
 		}
 		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 	 *
 	 * @return true Always returns true.
 	 */
 	public function flush() {
 		$this->cache = array();
+		return true;
+	}
+	/**
+	 * Removes all cache items in a group.
+	 *
+	 * @since 6.1.0
+	 *
+	 * @param string $group Name of group to remove from cache.
+	 * @return true Always returns true.
+	 */
+	public function flush_group( $group ) {
+		unset( $this->cache[ $group ] );
 		return true;
 	}
 	/**

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef