Changeset 13718

Timestamp:

01/29/2024 06:31:34 PM (16 months ago)

Author:

imath

Message:

Raise WordPress required version to 6.1

• Do required WP version bumps.
• Remove WP function/version checks when these were about WP version < 6.1.
• Init the 14.0.0 deprecated functions file.
• Update the GH PHP Unit Action and remove the 6.0 wp-phpunit/wp-phpunit composer package downgrade that was needed when testing WP version < 6.1.

Fixes #9051
Closes ​https://github.com/buddypress/buddypress/pull/226

Location:

trunk

Files:

• .github/workflows/unit-tests.yml (modified) (2 diffs)
• bp-loader.php (modified) (1 diff)
• src/bp-core/admin/bp-core-admin-functions.php (modified) (1 diff)
• src/bp-core/bp-core-blocks.php (modified) (1 diff)
• src/bp-core/bp-core-functions.php (modified) (2 diffs)
• src/bp-core/bp-core-template-loader.php (modified) (2 diffs)
• src/bp-core/classes/class-bp-attachment.php (modified) (1 diff)
• src/bp-core/deprecated/14.0.php (added)
• src/bp-loader.php (modified) (1 diff)
• src/bp-templates/bp-nouveau/buddypress-functions.php (modified) (1 diff)
• src/bp-templates/bp-nouveau/includes/functions.php (modified) (1 diff)
• src/readme.txt (modified) (1 diff)

trunk/.github/workflows/unit-tests.yml

@@ -25 +25 @@
             wp_version: '6.4'
           - php: '7.4'
-            wp_version: '5.8'
+            wp_version: '6.1'
     env:
       WP_ENV_PHP_VERSION: ${{ matrix.php }}
@@ -66 +66 @@
           composer-options: "--ignore-platform-reqs"
 
-      - name: Adapt WP PHPUnit version for WP < 6.1
-        run: |
-          if [ ${{ env.WP_VERSION }} == '5.8' ]; then
-            composer require wp-phpunit/wp-phpunit:6.0 --dev --ignore-platform-reqs
-          fi
-
       - name: Cache node modules
         uses: actions/cache@v2

trunk/bp-loader.php

@@ -21 +21 @@
  * Domain Path:       /bp-languages/
  * Requires PHP:      5.6
- * Requires at least: 5.8
+ * Requires at least: 6.1
  * Version:           14.0.0-alpha
  */

trunk/src/bp-core/admin/bp-core-admin-functions.php

@@ -1550 +1550 @@
     );
 }
-
-/**
- * Select the right `block_categories` filter according to WP version.
- *
- * @since 8.0.0
- * @since 12.0.0 This category is left for third party plugin but not used anymmore.
- *
- * @todo deprecate.
- */
-function bp_block_init_category_filter() {
-    if ( function_exists( 'get_default_block_categories' ) ) {
-        add_filter( 'block_categories_all', 'bp_block_category', 1, 2 );
-    } else {
-        add_filter( 'block_categories', 'bp_block_category', 1, 2 );
-    }
-}
-add_action( 'bp_init', 'bp_block_init_category_filter' );
+add_filter( 'block_categories_all', 'bp_block_category', 1, 2 );
 
 /**

trunk/src/bp-core/bp-core-blocks.php

@@ -156 +156 @@
     return $editor_settings;
 }
-
-/**
- * Select the right `block_editor_settings` filter according to WP version.
- *
- * @since 8.0.0
- */
-function bp_block_init_editor_settings_filter() {
-    if ( function_exists( 'get_block_editor_settings' ) ) {
-        add_filter( 'block_editor_settings_all', 'bp_blocks_editor_settings' );
-    } else {
-        add_filter( 'block_editor_settings', 'bp_blocks_editor_settings' );
-    }
-}
-add_action( 'bp_init', 'bp_block_init_editor_settings_filter' );
+add_filter( 'block_editor_settings_all', 'bp_blocks_editor_settings' );
 
 /**

trunk/src/bp-core/bp-core-functions.php

@@ -4700 +4700 @@
 function bp_is_large_install() {
     // Use the Multisite function if available.
-    if ( function_exists( 'wp_is_large_network' ) ) {
+    if ( is_multisite() ) {
         $is_large = wp_is_large_network( 'users' );
     } else {
@@ -4871 +4871 @@
         11.0,
         12.0,
+        14.0,
     );
 

trunk/src/bp-core/bp-core-template-loader.php

@@ -465 +465 @@
      * BuddyPress then needs to use the WordPress template canvas to retrieve the community content.
      */
-    if ( bp_is_running_wp( '5.9.0', '>=' ) && wp_is_block_theme() ) {
+    if ( wp_is_block_theme() ) {
         $template = ABSPATH . WPINC . '/template-canvas.php';
     }
@@ -834 +834 @@
  */
 function bp_set_block_theme_compat() {
-    if ( bp_is_running_wp( '5.9.0', '>=' ) && wp_is_block_theme() && current_theme_supports( 'buddypress' ) ) {
+    if ( wp_is_block_theme() && current_theme_supports( 'buddypress' ) ) {
         bp_deregister_template_stack( 'get_stylesheet_directory', 10 );
         bp_deregister_template_stack( 'get_template_directory', 12 );

trunk/src/bp-core/classes/class-bp-attachment.php

@@ -644 +644 @@
         );
 
-        /**
-         * Make sure the wp_read_image_metadata function is reachable for the old Avatar UI
-         * or if WordPress < 3.9 (New Avatar UI is not available in this case)
-         */
+        // Make sure the wp_read_image_metadata function is reachable.
         if ( ! function_exists( 'wp_read_image_metadata' ) ) {
             require_once( ABSPATH . 'wp-admin/includes/image.php' );

trunk/src/bp-loader.php

@@ -21 +21 @@
  * Domain Path:       /bp-languages/
  * Requires PHP:      5.6
- * Requires at least: 5.8
+ * Requires at least: 6.1
  * Version:           14.0.0-alpha
  */

trunk/src/bp-templates/bp-nouveau/buddypress-functions.php

@@ -84 +84 @@
         $this->directory_nav  = new BP_Core_Nav( bp_get_root_blog_id() );
         $this->is_block_theme = false;
-
-        if ( bp_is_running_wp( '5.9.0', '>=' ) ) {
-            $this->is_block_theme = wp_is_block_theme();
-        }
+        $this->is_block_theme = wp_is_block_theme();
     }
 

trunk/src/bp-templates/bp-nouveau/includes/functions.php

@@ -1663 +1663 @@
     }
 
-    // `wp_get_global_settings()` has been introduced in WordPress 5.9
-    if ( function_exists( 'wp_get_global_settings' ) ) {
+    // Use Block Theme global settings for Block Themes.
+    if ( wp_is_block_theme() ) {
         $theme_layouts = wp_get_global_settings( array( 'layout' ) );
 

trunk/src/readme.txt

@@ -6 +6 @@
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 Requires PHP:      5.6
-Requires at least: 5.8
+Requires at least: 6.1
 Tested up to:      6.4
 Stable tag:        12.2.0