Plugin: Move files from lib to the compat subfolder

WordPress · Mar 31, 2022 · a7bcdc9 · a7bcdc9
1 parent 2a2938f
commit a7bcdc9
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/lib/class-wp-rest-menu-items-controller.php → ...9/class-wp-rest-menu-items-controller.php b/lib/class-wp-rest-menu-items-controller.php → ...9/class-wp-rest-menu-items-controller.php
diff --git a/...ass-wp-rest-menu-locations-controller.php → ...ass-wp-rest-menu-locations-controller.php b/...ass-wp-rest-menu-locations-controller.php → ...ass-wp-rest-menu-locations-controller.php
diff --git a/lib/class-wp-rest-menus-controller.php → ...ss-5.9/class-wp-rest-menus-controller.php b/lib/class-wp-rest-menus-controller.php → ...ss-5.9/class-wp-rest-menus-controller.php
diff --git a/lib/class-wp-rest-url-details-controller.php → .../class-wp-rest-url-details-controller.php b/lib/class-wp-rest-url-details-controller.php → .../class-wp-rest-url-details-controller.php
diff --git a/lib/block-patterns.php → ...t/wordpress-6.0/block-patterns-update.php b/lib/block-patterns.php → ...t/wordpress-6.0/block-patterns-update.php
diff --git a/...rimental/block-editor-settings-mobile.php → ...rimental/block-editor-settings-mobile.php b/...rimental/block-editor-settings-mobile.php → ...rimental/block-editor-settings-mobile.php
diff --git a/lib/compat/experimental/blocks.php → lib/experimental/blocks.php b/lib/compat/experimental/blocks.php → lib/experimental/blocks.php
diff --git a/...rest-block-editor-settings-controller.php → ...rest-block-editor-settings-controller.php b/...rest-block-editor-settings-controller.php → ...rest-block-editor-settings-controller.php
diff --git a/...est-block-navigation-areas-controller.php → ...est-block-navigation-areas-controller.php b/...est-block-navigation-areas-controller.php → ...est-block-navigation-areas-controller.php
diff --git a/lib/class-wp-rest-customizer-nonces.php → ...ental/class-wp-rest-customizer-nonces.php b/lib/class-wp-rest-customizer-nonces.php → ...ental/class-wp-rest-customizer-nonces.php
diff --git a/lib/load.php b/lib/load.php
@@ -32,27 +32,27 @@ function gutenberg_is_experiment_enabled( $name ) {
 // which this class will exist if that is the case.
 if ( class_exists( 'WP_REST_Controller' ) ) {
 	if ( ! class_exists( 'WP_REST_Menus_Controller' ) ) {
-		require_once __DIR__ . '/class-wp-rest-menus-controller.php';
+		require_once __DIR__ . '/compat/wordpress-5.9/class-wp-rest-menus-controller.php';
 	}
 	if ( ! class_exists( 'WP_REST_Menu_Items_Controller' ) ) {
-		require_once __DIR__ . '/class-wp-rest-menu-items-controller.php';
+		require_once __DIR__ . '/compat/wordpress-5.9/class-wp-rest-menu-items-controller.php';
 	}
 	if ( ! class_exists( 'WP_REST_Block_Navigation_Areas_Controller' ) ) {
-		require_once __DIR__ . '/class-wp-rest-block-navigation-areas-controller.php';
+		require_once __DIR__ . '/experimental/class-wp-rest-block-navigation-areas-controller.php';
 	}
 	if ( ! class_exists( 'WP_REST_Menu_Locations_Controller' ) ) {
-		require_once __DIR__ . '/class-wp-rest-menu-locations-controller.php';
+		require_once __DIR__ . '/compat/wordpress-5.9/class-wp-rest-menu-locations-controller.php';
 	}
 	if ( ! class_exists( 'WP_Rest_Customizer_Nonces' ) ) {
-		require_once __DIR__ . '/class-wp-rest-customizer-nonces.php';
+		require_once __DIR__ . '/experimental/class-wp-rest-customizer-nonces.php';
 	}
 	require_once __DIR__ . '/compat/wordpress-5.9/class-gutenberg-rest-templates-controller.php';
 	if ( ! class_exists( 'WP_REST_Block_Editor_Settings_Controller' ) ) {
-		require_once dirname( __FILE__ ) . '/class-wp-rest-block-editor-settings-controller.php';
+		require_once __DIR__ . '/experimental/class-wp-rest-block-editor-settings-controller.php';
 	}
 
 	if ( ! class_exists( 'WP_REST_URL_Details_Controller' ) ) {
-		require_once __DIR__ . '/class-wp-rest-url-details-controller.php';
+		require_once __DIR__ . '/compat/wordpress-5.9/class-wp-rest-url-details-controller.php';
 	}
 
 	require __DIR__ . '/rest-api.php';
@@ -68,7 +68,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-5.9/register-global-styles-cpt.php';
 require __DIR__ . '/compat/wordpress-5.9/script-loader.php';
 require __DIR__ . '/compat/wordpress-6.0/block-editor-settings.php';
-require __DIR__ . '/compat/experimental/block-editor-settings-mobile.php';
+require __DIR__ . '/experimental/block-editor-settings-mobile.php';
 require __DIR__ . '/compat/wordpress-6.0/get-global-styles-and-settings.php';
 require __DIR__ . '/compat/wordpress-5.9/render-svg-filters.php';
 require __DIR__ . '/compat/wordpress-5.9/json-file-decode.php';
@@ -110,10 +110,10 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.0/class-wp-webfonts-provider-local.php';
 require __DIR__ . '/compat/wordpress-6.0/webfonts.php';
 require __DIR__ . '/compat/wordpress-6.0/edit-form-blocks.php';
-require __DIR__ . '/compat/experimental/blocks.php';
+require __DIR__ . '/experimental/blocks.php';
 
 require __DIR__ . '/blocks.php';
-require __DIR__ . '/block-patterns.php';
+require __DIR__ . '/compat/wordpress-6.0/block-patterns-update.php';
 require __DIR__ . '/client-assets.php';
 require __DIR__ . '/demo.php';
 require __DIR__ . '/navigation.php';