vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@52996 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2022-03-26 15:26:15 +00:00
parent 3758272327
commit 6244d515b1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wp-admin/includes/class-ftp.php
View File

@ -792,7 +792,7 @@ class ftp_base {
return false;
}
function glob_pattern_match($pattern,$string) {
function glob_pattern_match($pattern,$subject) {
$out=null;
$chunks=explode(';',$pattern);
foreach($chunks as $pattern) {
@ -807,19 +807,20 @@ class ftp_base {
str_replace('?','.{1,1}',$pattern))));
$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 )
);
}