Skip to content

Fix uses of 'Plugin not found' string #1651

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
merged 6 commits into from
Nov 13, 2024
+14 −5
Merged

Fix uses of 'Plugin not found' string #1651

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68cf691
Fix PHPStan error with the use of empty()
westonruter Nov 12, 2024
a372507
Reuse default text domain for 'Plugin not found.' string
westonruter Nov 13, 2024
afab567
Add error code to plugin not found error message
westonruter Nov 13, 2024
84c7cfb
Restore original transient key
westonruter Nov 13, 2024
49cb889
Replace 'code' with 'line'
westonruter Nov 13, 2024
762df74
Eliminate error line number in favor of unique translation strings
westonruter Nov 13, 2024
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
19 changes: 14 additions & 5 deletions plugins/performance-lab/includes/admin/plugins.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@
* @return array{name: string, slug: string, short_description: string, requires: string|false, requires_php: string|false, requires_plugins: string[], download_link: string, version: string}|WP_Error Array of plugin data or WP_Error if failed.
*/
function perflab_query_plugin_info( string $plugin_slug ) {
$transient_key = 'perflab_plugins_info-v2';
$transient_key = 'perflab_plugins_info';
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was changed in #1613 to account for the format change. Since the transient only lasts for 1 day anyway, we can now restore the original transient key.

$plugins = get_transient( $transient_key );

if ( is_array( $plugins ) ) {
// If the specific plugin_slug is not in the cache, return an error.
if ( ! isset( $plugins[ $plugin_slug ] ) ) {
return new WP_Error( 'plugin_not_found', __( 'Plugin not found.', 'performance-lab' ) );
return new WP_Error(
'plugin_not_found',
__( 'Plugin not found in cached API response.', 'performance-lab' )
);
}
return $plugins[ $plugin_slug ]; // Return cached plugin info if found.
}
Expand Down Expand Up @@ -83,7 +86,10 @@ function perflab_query_plugin_info( string $plugin_slug ) {
set_transient( $transient_key, $plugins, HOUR_IN_SECONDS );

if ( ! isset( $plugins[ $plugin_slug ] ) ) {
return new WP_Error( 'plugin_not_found', __( 'Plugin not found.', 'performance-lab' ) );
return new WP_Error(
'plugin_not_found',
__( 'Plugin not found in API response.', 'performance-lab' )
);
}

/**
Expand Down Expand Up @@ -359,8 +365,11 @@ function perflab_install_and_activate_plugin( string $plugin_slug, array &$proce
}

$plugins = get_plugins( '/' . $plugin_slug );
if ( empty( $plugins ) ) {
return new WP_Error( 'plugin_not_found', __( 'Plugin not found.', 'default' ) );
if ( count( $plugins ) === 0 ) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The replacement of empty() with count() is part of #1219

return new WP_Error(
'plugin_not_found',
__( 'Plugin not found among installed plugins.', 'performance-lab' )
);
}

$plugin_file_names = array_keys( $plugins );
Expand Down