Changeset 31136

Timestamp:

01/10/2015 11:27:00 PM (12 years ago)

Author:

wonderboymusic

Message:

In WP_MatchesMapRegex:

• Exactly one method was made private in [28516], and is only used internally.
• 2 properties were made private, but they just store variables passed to the constructor.
• Instances of this class are never created in core. WP_MatchesMapRegex::apply() is called statically in WP->parse_request() and url_to_postid().

The chances that:
1) this class is used as an instance somewhere and
2) the properties that have always been marked @access private and begin with _ were used publicly

...is extremely low.

Remove the magic methods, I should not have added them.

While we're at it, use the PHP5-style __construct() instead of the class name.

See #30891.

File:

• trunk/src/wp-includes/class-wp.php (modified) (2 diffs)

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

@@ -663 +663 @@
 
         /**
-         * 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 );
-        }
-
-        /**
-         * Make private/protected methods readable for backwards compatibility.
-         *
-         * @since 4.0.0
-         * @access public
-         *
-         * @param callable $name      Method to call.
-         * @param array    $arguments Arguments to pass when calling.
-         * @return mixed|bool Return value of the callback, false otherwise.
-         */
-        public function __call( $name, $arguments ) {
-                return call_user_func_array( array( $this, $name ), $arguments );
-        }
-
-        /**
          * constructor
          *
@@ -735 +669 @@
          * @return self
          */
-        public function WP_MatchesMapRegex($subject, $matches) {
+        public function __construct($subject, $matches) {
                 $this->_subject = $subject;
                 $this->_matches = $matches;