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

Jump to bottom

Move admin to includes directory #1072

Merged
merged 5 commits into from
Mar 21, 2024
Merged

Move admin to includes directory #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b47585c
Move admin directory to includes
thelovekesh Mar 21, 2024
14afc6c
Move admin tests directory to tests/includes
thelovekesh Mar 21, 2024
ac7172e
Update path to admin files
thelovekesh Mar 21, 2024
949c6c5
Remove admin directory from PHPStan config
thelovekesh Mar 21, 2024
1059283
Merge branch 'trunk' into enhancement/move-admin-to-includes
thelovekesh Mar 21, 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
0 admin/js/perflab-plugin-management.js → ...des/admin/js/perflab-plugin-management.js
View file
Open in desktop
File renamed without changes.
0 admin/load.php → includes/admin/load.php
View file
Open in desktop
File renamed without changes.
0 admin/plugins.php → includes/admin/plugins.php
View file
Open in desktop
File renamed without changes.
0 admin/server-timing.php → includes/admin/server-timing.php
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions load.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ function perflab_cleanup_option() {

// Only load admin integration when in admin.
if ( is_admin() ) {
require_once PERFLAB_PLUGIN_DIR_PATH . 'admin/load.php';
require_once PERFLAB_PLUGIN_DIR_PATH . 'admin/server-timing.php';
require_once PERFLAB_PLUGIN_DIR_PATH . 'admin/plugins.php';
require_once PERFLAB_PLUGIN_DIR_PATH . 'includes/admin/load.php';
require_once PERFLAB_PLUGIN_DIR_PATH . 'includes/admin/server-timing.php';
require_once PERFLAB_PLUGIN_DIR_PATH . 'includes/admin/plugins.php';
}
1 change: 0 additions & 1 deletion phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ includes:
parameters:
level: 0
paths:
- admin/
- load.php
- includes/
- plugins/
Expand Down
6 changes: 3 additions & 3 deletions tests/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ static function () use ( $plugin_test_path, $plugin_name ) {
tests_add_filter(
'plugins_loaded',
static function () {
require_once TESTS_PLUGIN_DIR . '/admin/load.php';
require_once TESTS_PLUGIN_DIR . '/admin/server-timing.php';
require_once TESTS_PLUGIN_DIR . '/admin/plugins.php';
require_once TESTS_PLUGIN_DIR . '/includes/admin/load.php';
require_once TESTS_PLUGIN_DIR . '/includes/admin/server-timing.php';
require_once TESTS_PLUGIN_DIR . '/includes/admin/plugins.php';
$module_files = glob( TESTS_PLUGIN_DIR . '/modules/*/*/load.php' );
if ( $module_files ) {
foreach ( $module_files as $module_file ) {
Expand Down
0 tests/admin/load-tests.php → tests/includes/admin/load-tests.php
View file
Open in desktop
File renamed without changes.
0 tests/admin/server-timing-tests.php → tests/includes/admin/server-timing-tests.php
View file
Open in desktop
File renamed without changes.
Loading