Skip to content

Harden error message on failed cache directory creation #5520

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
schlessera merged 1 commit into from
May 5, 2021
Merged

Harden error message on failed cache directory creation #5520

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
11 changes: 8 additions & 3 deletions php/WP_CLI/FileCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
namespace WP_CLI;

use Symfony\Component\Finder\Finder;
use WP_CLI;
use WP_CLI\Utils;

/**
Expand Down Expand Up @@ -224,7 +225,7 @@ public function clean() {
try {
$expire = new \DateTime();
} catch ( \Exception $e ) {
\WP_CLI::error( $e->getMessage() );
WP_CLI::error( $e->getMessage() );
}
$expire->modify( '-' . $ttl . ' seconds' );

Expand Down Expand Up @@ -321,8 +322,12 @@ protected function ensure_dir_exists( $dir ) {
}

if ( ! @mkdir( $dir, 0777, true ) ) {
$error = error_get_last();
\WP_CLI::warning( sprintf( "Failed to create directory '%s': %s.", $dir, $error['message'] ) );
$message = "Failed to create directory '{$dir}'";
$error = error_get_last();
if ( is_array( $error ) && array_key_exists( 'message', $error ) ) {
$message .= ": {$error['message']}";
}
WP_CLI::warning( "{$message}." );
return false;
}
}
Expand Down