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

Refactoring - wp-paths-sizes #7445

Closed
wants to merge 7 commits into from
Closed

Refactoring - wp-paths-sizes #7445

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
91a31e6
Refactoring - wp-paths-sizes
apermo Sep 27, 2024
f539ee3
Fixed visibility
apermo Oct 2, 2024
06e6392
Merge branch 'trunk' into refactor-wp-debug-data/paths-sizes
dmsnell Oct 4, 2024
89339ff
Return `null` from sub-method instead of conditionally calling
dmsnell Oct 4, 2024
7a9af76
Use strict `isset()` check because empty arrays are also "empty()"
dmsnell Oct 4, 2024
091368c
Merge remote-tracking branch 'upstream/trunk' into refactor-wp-debug-…
dmsnell Oct 4, 2024
c09dac0
Merge remote-tracking branch 'upstream/trunk' into refactor-wp-debug-…
dmsnell Oct 5, 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
170 changes: 93 additions & 77 deletions src/wp-admin/includes/class-wp-debug-data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static function debug_data() {
*/
$info = array(
'wp-core' => self::get_wp_core(),
'wp-paths-sizes' => array(),
'wp-paths-sizes' => self::get_wp_paths_sizes(),
'wp-dropins' => self::get_wp_dropins(),
'wp-active-theme' => array(),
'wp-parent-theme' => array(),
Expand All @@ -71,18 +71,17 @@ public static function debug_data() {
'wp-filesystem' => self::get_wp_filesystem(),
);

// Remove debug data which is only relevant on single-site installs.
if ( is_multisite() ) {
unset( $info['wp-paths-sizes'] );
}

if ( ! $is_multisite ) {
$info['wp-paths-sizes'] = array(
/* translators: Filesystem directory paths and storage sizes. */
'label' => __( 'Directories and Sizes' ),
'fields' => array(),
);
}
/*
* Remove null elements from the array. The individual methods are
* allowed to return `null`, which communicates that the category
* of debug data isn't relevant and shouldn't be passed through.
*/
$info = array_filter(
$info,
static function ( $section ) {
return isset( $section );
}
);

$info['wp-active-theme'] = array(
'label' => __( 'Active Theme' ),
Expand All @@ -100,69 +99,6 @@ public static function debug_data() {
'fields' => array(),
);

// Remove accordion for Directories and Sizes if in Multisite.
if ( ! $is_multisite ) {
$loading = __( 'Loading…' );

$info['wp-paths-sizes']['fields'] = array(
'wordpress_path' => array(
'label' => __( 'WordPress directory location' ),
'value' => untrailingslashit( ABSPATH ),
),
'wordpress_size' => array(
'label' => __( 'WordPress directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'uploads_path' => array(
'label' => __( 'Uploads directory location' ),
'value' => $upload_dir['basedir'],
),
'uploads_size' => array(
'label' => __( 'Uploads directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'themes_path' => array(
'label' => __( 'Themes directory location' ),
'value' => get_theme_root(),
),
'themes_size' => array(
'label' => __( 'Themes directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'plugins_path' => array(
'label' => __( 'Plugins directory location' ),
'value' => WP_PLUGIN_DIR,
),
'plugins_size' => array(
'label' => __( 'Plugins directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'fonts_path' => array(
'label' => __( 'Fonts directory location' ),
'value' => wp_get_font_dir()['basedir'],
),
'fonts_size' => array(
'label' => __( 'Fonts directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'database_size' => array(
'label' => __( 'Database size' ),
'value' => $loading,
'debug' => 'loading...',
),
'total_size' => array(
'label' => __( 'Total installation size' ),
'value' => $loading,
'debug' => 'loading...',
),
);
}

// Populate the section for the currently active theme.
$theme_features = array();

Expand Down Expand Up @@ -1133,7 +1069,7 @@ private static function get_wp_media(): array {


/**
* Gets the WordPress plugins section of the debug data.
* Gets the WordPress MU plugins section of the debug data.
*
* @since 6.7.0
*
Expand Down Expand Up @@ -1183,6 +1119,86 @@ private static function get_wp_mu_plugins(): array {
);
}

/**
* Gets the WordPress paths and sizes section of the debug data.
*
* @since 6.7.0
*
* @return array|null Paths and sizes debug data for single sites,
* otherwise `null` for multi-site installs.
*/
private static function get_wp_paths_sizes(): ?array {
if ( is_multisite() ) {
return null;
}

$loading = __( 'Loading…' );

$fields = array(
'wordpress_path' => array(
'label' => __( 'WordPress directory location' ),
'value' => untrailingslashit( ABSPATH ),
),
'wordpress_size' => array(
'label' => __( 'WordPress directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'uploads_path' => array(
'label' => __( 'Uploads directory location' ),
'value' => wp_upload_dir()['basedir'],
),
'uploads_size' => array(
'label' => __( 'Uploads directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'themes_path' => array(
'label' => __( 'Themes directory location' ),
'value' => get_theme_root(),
),
'themes_size' => array(
'label' => __( 'Themes directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'plugins_path' => array(
'label' => __( 'Plugins directory location' ),
'value' => WP_PLUGIN_DIR,
),
'plugins_size' => array(
'label' => __( 'Plugins directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'fonts_path' => array(
'label' => __( 'Fonts directory location' ),
'value' => wp_get_font_dir()['basedir'],
),
'fonts_size' => array(
'label' => __( 'Fonts directory size' ),
'value' => $loading,
'debug' => 'loading...',
),
'database_size' => array(
'label' => __( 'Database size' ),
'value' => $loading,
'debug' => 'loading...',
),
'total_size' => array(
'label' => __( 'Total installation size' ),
'value' => $loading,
'debug' => 'loading...',
),
);

return array(
/* translators: Filesystem directory paths and storage sizes. */
'label' => __( 'Directories and Sizes' ),
'fields' => $fields,
);
}

/**
* Gets the WordPress active plugins section of the debug data.
*
Expand Down
Loading