Skip to content

Staging release: v20260505.1 #6941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luiztiago merged 1 commit into from
May 5, 2026
+32 −2
Merged

Staging release: v20260505.1 #6941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions files/class-vip-filesystem-local-stream-wrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,13 @@ class VIP_Filesystem_Local_Stream_Wrapper {
*/
private static $local_file_patterns = array();

/**
* HashMap of filename substrings for local files
*
* @var array
*/
private static $local_file_names = array();

/**
* File handle for local files
*
Expand Down Expand Up @@ -1152,6 +1159,8 @@ public static function add_local_file( $file_path ) {

if ( $is_pattern ) {
static::$local_file_patterns[ $file_path ] = true;
} elseif ( false === strpos( $file_path, '/' ) ) {
static::$local_file_names[ $file_path ] = true;
} else {
static::$local_files_map[ $file_path ] = true;
}
Expand All @@ -1168,16 +1177,17 @@ public static function add_local_file( $file_path ) {
public static function remove_local_file( $file_path ) {
unset( static::$local_file_patterns[ $file_path ] );
unset( static::$local_files_map[ $file_path ] );
unset( static::$local_file_names[ $file_path ] );
return true;
}

/**
* Get the list of files that should be handled locally
*
* @return array List of file paths and patterns
* @return array List of file paths, patterns and file names
*/
public static function get_local_files() {
return array_merge( static::$local_files_map, static::$local_file_patterns );
return array_merge( static::$local_files_map, static::$local_file_patterns, static::$local_file_names );
}

/**
Expand All @@ -1192,6 +1202,14 @@ public static function is_local_file( $file_path ) {
return true;
}

// Check if any filename substring is present in the filename.
$file_name = \wp_basename( $file_path );
foreach ( static::$local_file_names as $name => $value ) {
if ( false !== strpos( $file_name, $name ) ) {
return true;
}
}

// Check against wildcard patterns
foreach ( static::$local_file_patterns as $pattern => $value ) {
if ( fnmatch( $pattern, $file_path, FNM_PATHNAME ) ) {
Expand Down
12 changes: 12 additions & 0 deletions tests/files/test-vip-filesystem-local-stream-wrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,18 @@ public function test_lookup_optimization() {
}
}

public function test_filename_substring_matching() {
$this->assertFalse( VIP_Filesystem_Local_Stream_Wrapper::is_local_file( 'vip://wp-content/uploads/.htaccess' ) );

VIP_Filesystem_Local_Stream_Wrapper::add_local_file( '.htaccess' );
$this->assertTrue( VIP_Filesystem_Local_Stream_Wrapper::is_local_file( 'vip://wp-content/uploads/.htaccess' ) );
$this->assertTrue( VIP_Filesystem_Local_Stream_Wrapper::is_local_file( 'vip://wp-content/uploads/cache/.htaccess.backup' ) );
$this->assertFalse( VIP_Filesystem_Local_Stream_Wrapper::is_local_file( 'vip://wp-content/uploads/cache/htaccess.txt' ) );

VIP_Filesystem_Local_Stream_Wrapper::remove_local_file( '.htaccess' );
$this->assertFalse( VIP_Filesystem_Local_Stream_Wrapper::is_local_file( 'vip://wp-content/uploads/.htaccess' ) );
}

public function test__global_helpers__add() {
// Add files using the global helper
$result = wpvip_fs_local_file_add( 'vip://wp-content/uploads/direct.txt' );
Expand Down
Loading