Changeset 52996

Timestamp:

03/26/2022 03:26:15 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Rename parameters that use reserved keywords in wp-admin/includes/class-ftp.php.

While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.

This commit renames the $string parameter of ftp_base::glob_pattern_match() to $subject.

Follow-up to [52946].

Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #55327.

File:

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

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

@@ -793 +793 @@
     }
 
-    function glob_pattern_match($pattern,$string) {
+    function glob_pattern_match($pattern,$subject) {
         $out=null;
         $chunks=explode(';',$pattern);
@@ -808 +808 @@
             $out[]=$pattern;
         }
-        if(count($out)==1) return($this->glob_regexp("^$out[0]$",$string));
+        if(count($out)==1) return($this->glob_regexp("^$out[0]$",$subject));
         else {
             foreach($out as $tester)
-                if($this->my_regexp("^$tester$",$string)) return true;
+                // TODO: This should probably be glob_regexp(), but needs tests.
+                if($this->my_regexp("^$tester$",$subject)) return true;
         }
         return false;
     }
 
-    function glob_regexp($pattern,$probe) {
+    function glob_regexp($pattern,$subject) {
         $sensitive=(PHP_OS!='WIN32');
         return ($sensitive?
-            preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) :
-            preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $probe )
+            preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $subject ) :
+            preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $subject )
         );
     }