diff --git a/admin/js/perflab-plugin-management.js b/includes/admin/js/perflab-plugin-management.js similarity index 100% rename from admin/js/perflab-plugin-management.js rename to includes/admin/js/perflab-plugin-management.js diff --git a/admin/load.php b/includes/admin/load.php similarity index 100% rename from admin/load.php rename to includes/admin/load.php diff --git a/admin/plugins.php b/includes/admin/plugins.php similarity index 100% rename from admin/plugins.php rename to includes/admin/plugins.php diff --git a/admin/server-timing.php b/includes/admin/server-timing.php similarity index 100% rename from admin/server-timing.php rename to includes/admin/server-timing.php diff --git a/load.php b/load.php index 45d7cab1ab..54641911fc 100644 --- a/load.php +++ b/load.php @@ -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'; } diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 13084b48f0..b1caff17b0 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -3,7 +3,6 @@ includes: parameters: level: 0 paths: - - admin/ - load.php - includes/ - plugins/ diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 5d2a512344..017ecd7af1 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -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 ) { diff --git a/tests/admin/load-tests.php b/tests/includes/admin/load-tests.php similarity index 100% rename from tests/admin/load-tests.php rename to tests/includes/admin/load-tests.php diff --git a/tests/admin/server-timing-tests.php b/tests/includes/admin/server-timing-tests.php similarity index 100% rename from tests/admin/server-timing-tests.php rename to tests/includes/admin/server-timing-tests.php