Merge pull request #1072 from WordPress/enhancement/move-admin-to-inc…

…ludes Move `admin` to `includes` directory
WordPress · Mar 21, 2024 · 84762da · 84762da
2 parents b687c60 + 1059283
commit 84762da
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 7 deletions.
diff --git a/admin/js/perflab-plugin-management.js → ...des/admin/js/perflab-plugin-management.js b/admin/js/perflab-plugin-management.js → ...des/admin/js/perflab-plugin-management.js
diff --git a/admin/load.php → includes/admin/load.php b/admin/load.php → includes/admin/load.php
diff --git a/admin/plugins.php → includes/admin/plugins.php b/admin/plugins.php → includes/admin/plugins.php
diff --git a/admin/server-timing.php → includes/admin/server-timing.php b/admin/server-timing.php → includes/admin/server-timing.php
diff --git 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
@@ -3,7 +3,6 @@ includes:
 parameters:
 	level: 0
 	paths:
-		- admin/
 		- load.php
 		- includes/
 		- plugins/

diff --git 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 → tests/includes/admin/load-tests.php b/tests/admin/load-tests.php → tests/includes/admin/load-tests.php
diff --git a/tests/admin/server-timing-tests.php → tests/includes/admin/server-timing-tests.php b/tests/admin/server-timing-tests.php → tests/includes/admin/server-timing-tests.php