WordPress 4.1.4-scripts

[autoinstalls/wordpress.git] / wp-includes / cache.php

diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index bcc9aca0e7503fe656b875e2ebc55c3fa45270a9..3cd344bb09ceb1125c7078d2b5a2b326775ec5f2 100644 (file)
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -268,7 +268,7 @@ class WP_Object_Cache {
         * @access private
         * @since 2.0.0
         */
-       var $cache = array ();
+       private $cache = array();
 
        /**
         * The amount of times the cache data was already stored in the cache.
@@ -277,7 +277,7 @@ class WP_Object_Cache {
         * @access private
         * @var int
         */
-       var $cache_hits = 0;
+       private $cache_hits = 0;
 
        /**
         * Amount of times the cache did not have the request in cache
@@ -286,7 +286,7 @@ class WP_Object_Cache {
         * @access public
         * @since 2.0.0
         */
-       var $cache_misses = 0;
+       public $cache_misses = 0;
 
        /**
         * List of global groups
@@ -295,7 +295,7 @@ class WP_Object_Cache {
         * @access protected
         * @since 3.0.0
         */
-       var $global_groups = array();
+       protected $global_groups = array();
 
        /**
         * The blog prefix to prepend to keys in non-global groups.
@@ -304,7 +304,59 @@ class WP_Object_Cache {
         * @access private
         * @since 3.5.0
         */
-       var $blog_prefix;
+       private $blog_prefix;
+
+       /**
+        * Make private properties readable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param string $name Property to get.
+        * @return mixed Property.
+        */
+       public function __get( $name ) {
+               return $this->$name;
+       }
+
+       /**
+        * Make private properties settable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param string $name  Property to set.
+        * @param mixed  $value Property value.
+        * @return mixed Newly-set property.
+        */
+       public function __set( $name, $value ) {
+               return $this->$name = $value;
+       }
+
+       /**
+        * Make private properties checkable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param string $name Property to check if set.
+        * @return bool Whether the property is set.
+        */
+       public function __isset( $name ) {
+               return isset( $this->$name );
+       }
+
+       /**
+        * Make private properties un-settable for backwards compatibility.
+        *
+        * @since 4.0.0
+        * @access public
+        *
+        * @param string $name Property to unset.
+        */
+       public function __unset( $name ) {
+               unset( $this->$name );
+       }
 
        /**
         * Adds data to the cache if it doesn't already exist.
@@ -321,7 +373,7 @@ class WP_Object_Cache {
         * @param int $expire When to expire the cache contents
         * @return bool False if cache key and group already exist, true on success
         */
-       function add( $key, $data, $group = 'default', $expire = 0 ) {
+       public function add( $key, $data, $group = 'default', $expire = 0 ) {
                if ( wp_suspend_cache_addition() )
                        return false;
 
@@ -345,7 +397,7 @@ class WP_Object_Cache {
         *
         * @param array $groups List of groups that are global.
         */
-       function add_global_groups( $groups ) {
+       public function add_global_groups( $groups ) {
                $groups = (array) $groups;
 
                $groups = array_fill_keys( $groups, true );
@@ -362,7 +414,7 @@ class WP_Object_Cache {
         * @param string $group The group the key is in.
         * @return false|int False on failure, the item's new value on success.
         */
-       function decr( $key, $offset = 1, $group = 'default' ) {
+       public function decr( $key, $offset = 1, $group = 'default' ) {
                if ( empty( $group ) )
                        $group = 'default';
 
@@ -398,7 +450,7 @@ class WP_Object_Cache {
         *
         * @return bool False if the contents weren't deleted and true on success
         */
-       function delete( $key, $group = 'default', $deprecated = false ) {
+       public function delete( $key, $group = 'default', $deprecated = false ) {
                if ( empty( $group ) )
                        $group = 'default';
 
@@ -419,7 +471,7 @@ class WP_Object_Cache {
         *
         * @return bool Always returns true
         */
-       function flush() {
+       public function flush() {
                $this->cache = array ();
 
                return true;
@@ -442,7 +494,7 @@ class WP_Object_Cache {
         * @return bool|mixed False on failure to retrieve contents or the cache
         *              contents on success
         */
-       function get( $key, $group = 'default', $force = false, &$found = null ) {
+       public function get( $key, $group = 'default', $force = false, &$found = null ) {
                if ( empty( $group ) )
                        $group = 'default';
 
@@ -473,7 +525,7 @@ class WP_Object_Cache {
         * @param string $group The group the key is in.
         * @return false|int False on failure, the item's new value on success.
         */
-       function incr( $key, $offset = 1, $group = 'default' ) {
+       public function incr( $key, $offset = 1, $group = 'default' ) {
                if ( empty( $group ) )
                        $group = 'default';
 
@@ -508,7 +560,7 @@ class WP_Object_Cache {
         * @param int $expire When to expire the cache contents
         * @return bool False if not exists, true if contents were replaced
         */
-       function replace( $key, $data, $group = 'default', $expire = 0 ) {
+       public function replace( $key, $data, $group = 'default', $expire = 0 ) {
                if ( empty( $group ) )
                        $group = 'default';
 
@@ -528,7 +580,7 @@ class WP_Object_Cache {
         * @since 3.0.0
         * @deprecated 3.5.0
         */
-       function reset() {
+       public function reset() {
                _deprecated_function( __FUNCTION__, '3.5', 'switch_to_blog()' );
 
                // Clear out non-global caches since the blog ID has changed.
@@ -558,7 +610,7 @@ class WP_Object_Cache {
         * @param int $expire Not Used
         * @return bool Always returns true
         */
-       function set( $key, $data, $group = 'default', $expire = 0 ) {
+       public function set( $key, $data, $group = 'default', $expire = 0 ) {
                if ( empty( $group ) )
                        $group = 'default';
 
@@ -580,7 +632,7 @@ class WP_Object_Cache {
         *
         * @since 2.0.0
         */
-       function stats() {
+       public function stats() {
                echo "<p>";
                echo "<strong>Cache Hits:</strong> {$this->cache_hits}<br />";
                echo "<strong>Cache Misses:</strong> {$this->cache_misses}<br />";
@@ -601,7 +653,7 @@ class WP_Object_Cache {
         *
         * @param int $blog_id Blog ID
         */
-       function switch_to_blog( $blog_id ) {
+       public function switch_to_blog( $blog_id ) {
                $blog_id = (int) $blog_id;
                $this->blog_prefix = $this->multisite ? $blog_id . ':' : '';
        }
@@ -612,6 +664,9 @@ class WP_Object_Cache {
         * @since 3.4.0
         *
         * @access protected
+        * @param string $key
+        * @param string $group
+        * @return bool
         */
        protected function _exists( $key, $group ) {
                return isset( $this->cache[ $group ] ) && ( isset( $this->cache[ $group ][ $key ] ) || array_key_exists( $key, $this->cache[ $group ] ) );
@@ -623,7 +678,7 @@ class WP_Object_Cache {
         * @since 2.0.8
         * @return null|WP_Object_Cache If cache is disabled, returns null.
         */
-       function __construct() {
+       public function __construct() {
                global $blog_id;
 
                $this->multisite = is_multisite();
@@ -646,7 +701,7 @@ class WP_Object_Cache {
         *
         * @return bool True value. Won't be used by PHP
         */
-       function __destruct() {
+       public function __destruct() {
                return true;
        }
 }