Changeset 28502

Timestamp:

05/19/2014 05:15:20 AM (12 years ago)

Author:

wonderboymusic

Message:

Add access modifiers to methods/members in WP_Object_Cache. Add a magic __get() method for BC.

See #27881.

File:

• trunk/src/wp-includes/cache.php (modified) (19 diffs)

trunk/src/wp-includes/cache.php

@@ -269 +269 @@
          * @since 2.0.0
          */
-        var $cache = array ();
+        private $cache = array ();
 
         /**
@@ -278 +278 @@
          * @var int
          */
-        var $cache_hits = 0;
+        private $cache_hits = 0;
 
         /**
@@ -287 +287 @@
          * @since 2.0.0
          */
-        var $cache_misses = 0;
+        public $cache_misses = 0;
 
         /**
@@ -296 +296 @@
          * @since 3.0.0
          */
-        var $global_groups = array();
+        protected $global_groups = array();
 
         /**
@@ -305 +305 @@
          * @since 3.5.0
          */
-        var $blog_prefix;
+        private $blog_prefix;
+
+        /**
+         * Make private properties readable for backwards compatibility
+         *
+         * @since 4.0.0
+         * @param string $name
+         * @return mixed
+         */
+        public function __get( $name ) {
+                return $this->$name;
+        }
 
         /**
@@ -322 +333 @@
          * @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;
@@ -346 +357 @@
          * @param array $groups List of groups that are global.
          */
-        function add_global_groups( $groups ) {
+        public function add_global_groups( $groups ) {
                 $groups = (array) $groups;
 
@@ -363 +374 @@
          * @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';
@@ -399 +410 @@
          * @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';
@@ -420 +431 @@
          * @return bool Always returns true
          */
-        function flush() {
+        public function flush() {
                 $this->cache = array ();
 
@@ -443 +454 @@
          *              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';
@@ -474 +485 @@
          * @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';
@@ -509 +520 @@
          * @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';
@@ -529 +540 @@
          * @deprecated 3.5.0
          */
-        function reset() {
+        public function reset() {
                 _deprecated_function( __FUNCTION__, '3.5', 'switch_to_blog()' );
 
@@ -559 +570 @@
          * @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';
@@ -581 +592 @@
          * @since 2.0.0
          */
-        function stats() {
+        public function stats() {
                 echo "<p>";
                 echo "<strong>Cache Hits:</strong> {$this->cache_hits}<br />";
@@ -602 +613 @@
          * @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 . ':' : '';
@@ -624 +635 @@
          * @return null|WP_Object_Cache If cache is disabled, returns null.
          */
-        function __construct() {
+        public function __construct() {
                 global $blog_id;
 
@@ -647 +658 @@
          * @return bool True value. Won't be used by PHP
          */
-        function __destruct() {
+        public function __destruct() {
                 return true;
         }