Skip to content
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

Improved formatting of the code #8368

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
+52 −3
Open

Improved formatting of the code #8368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4524757
Feat: Handles opcache invalidation across different PHP SAPIs and con…
snehapatil2001 Feb 13, 2025
5aecf97
Improved formatting of the code
anand346 Feb 20, 2025
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
55 changes: 52 additions & 3 deletions src/wp-admin/includes/file.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2742,11 +2742,48 @@ function wp_opcache_invalidate( $filepath, $force = false ) {
* @param bool $will_invalidate Whether WordPress will invalidate `$filepath`. Default true.
* @param string $filepath The path to the PHP file to invalidate.
*/
if ( apply_filters( 'wp_opcache_invalidate_file', true, $filepath ) ) {
return opcache_invalidate( $filepath, $force );
if ( ! apply_filters( 'wp_opcache_invalidate_file', true, $filepath ) ) {
return false;
}

return false;
$success = opcache_invalidate( $filepath, $force );

// Handle CLI scenario.
if ( 'cli' === php_sapi_name() ) {
// Create a flag file to signal FPM processes.
$flag_file = WP_CONTENT_DIR . '/opcache-reset-' . md5( $filepath ) . '.flag';
file_put_contents( $flag_file, time() );
}

// Handle file cache scenario.
if ( ini_get( 'opcache.file_cache' ) ) {
// If file cache is enabled, we need to ensure complete invalidation.
if ( function_exists( 'opcache_reset' ) ) {
opcache_reset();
$success = true;
}
}

// Check for reset flags in FPM context.
if ( 'cli' !== php_sapi_name() ) {
$flags = glob( WP_CONTENT_DIR . '/opcache-reset-*.flag' );
if ( ! empty( $flags ) ) {
foreach ( $flags as $flag_file ) {
$flag_time = (int) file_get_contents( $flag_file );

// If flag is recent (within last minute).
if ( time() - $flag_time < 60 ) {
if ( function_exists( 'opcache_reset' ) ) {
opcache_reset();
$success = true;
}
}
@unlink( $flag_file );
}
}
}

return $success;
}

/**
Expand Down Expand Up @@ -2782,6 +2819,18 @@ function wp_opcache_invalidate_directory( $dir ) {
return;
}

// Handle CLI scenario for directory invalidation
if ( 'cli' === php_sapi_name() ) {
$flag_file = WP_CONTENT_DIR . '/opcache-reset-dir-' . md5( $dir ) . '.flag';
file_put_contents( $flag_file, time() );
}

// Handle file cache for directory invalidation
$has_file_cache = ini_get( 'opcache.file_cache' );
if ( $has_file_cache && function_exists( 'opcache_reset' ) ) {
opcache_reset();
}

/*
* Recursively invalidate opcache of files in a directory.
*
Expand Down
Loading