Changeset 42343 for trunk/src/wp-includes/class-wp-matchesmapregex.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

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

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

@@ -47 +47 @@
      * @param array  $matches data to use in map
      */
-    public function __construct($subject, $matches) {
+    public function __construct( $subject, $matches ) {
         $this->_subject = $subject;
         $this->_matches = $matches;
-        $this->output = $this->_map();
+        $this->output   = $this->_map();
     }
 
@@ -64 +64 @@
      * @return string
      */
-    public static function apply($subject, $matches) {
-        $oSelf = new WP_MatchesMapRegex($subject, $matches);
+    public static function apply( $subject, $matches ) {
+        $oSelf = new WP_MatchesMapRegex( $subject, $matches );
         return $oSelf->output;
     }
@@ -75 +75 @@
      */
     private function _map() {
-        $callback = array($this, 'callback');
-        return preg_replace_callback($this->_pattern, $callback, $this->_subject);
+        $callback = array( $this, 'callback' );
+        return preg_replace_callback( $this->_pattern, $callback, $this->_subject );
     }
 
@@ -85 +85 @@
      * @return string
      */
-    public function callback($matches) {
-        $index = intval(substr($matches[0], 9, -1));
-        return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
+    public function callback( $matches ) {
+        $index = intval( substr( $matches[0], 9, -1 ) );
+        return ( isset( $this->_matches[ $index ] ) ? urlencode( $this->_matches[ $index ] ) : '' );
     }
 }