Make WordPress Core

Changeset 52996


Ignore:
Timestamp:
03/26/2022 03:26:15 PM (2 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/class-ftp.php

    r52978 r52996  
    793793    }
    794794
    795     function glob_pattern_match($pattern,$string) {
     795    function glob_pattern_match($pattern,$subject) {
    796796        $out=null;
    797797        $chunks=explode(';',$pattern);
     
    808808            $out[]=$pattern;
    809809        }
    810         if(count($out)==1) return($this->glob_regexp("^$out[0]$",$string));
     810        if(count($out)==1) return($this->glob_regexp("^$out[0]$",$subject));
    811811        else {
    812812            foreach($out as $tester)
    813                 if($this->my_regexp("^$tester$",$string)) return true;
     813                // TODO: This should probably be glob_regexp(), but needs tests.
     814                if($this->my_regexp("^$tester$",$subject)) return true;
    814815        }
    815816        return false;
    816817    }
    817818
    818     function glob_regexp($pattern,$probe) {
     819    function glob_regexp($pattern,$subject) {
    819820        $sensitive=(PHP_OS!='WIN32');
    820821        return ($sensitive?
    821             preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) :
    822             preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $probe )
     822            preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $subject ) :
     823            preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $subject )
    823824        );
    824825    }
Note: See TracChangeset for help on using the changeset viewer.