Changeset 13417

Timestamp:

02/10/2023 04:01:49 AM (3 years ago)

Author:

imath

Message:

Raise WordPress required version to 5.8

Closes ​https://github.com/buddypress/buddypress/pull/61
Fixes #8822

Location:

trunk

Files:

• .github/workflows/unit-tests.yml (modified) (2 diffs)
• bp-loader.php (modified) (1 diff)
• src/bp-core/bp-core-attachments.php (modified) (2 diffs)
• src/bp-core/bp-core-template.php (modified) (1 diff)
• src/bp-core/bp-core-widgets.php (modified) (1 diff)
• src/bp-loader.php (modified) (1 diff)
• tests/phpunit/testcases/core/avatars.php (modified) (1 diff)
• tests/phpunit/testcases/core/functions.php (modified) (1 diff)

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

@@ -21 +21 @@
             wp_version: '6.1'
           - php: '7.4'
-            wp_version: '5.7'
+            wp_version: '5.8'
     env:
       WP_ENV_PHP_VERSION: ${{ matrix.php }}
@@ -59 +59 @@
       - name: Adapt WP PHPUnit version for WP < 6.1
         run: |
-          if [ ${{ env.WP_VERSION }} == '5.7' ]; then
+          if [ ${{ env.WP_VERSION }} == '5.8' ]; then
             composer require wp-phpunit/wp-phpunit:6.0 --dev --ignore-platform-reqs
           fi

trunk/bp-loader.php

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

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

@@ -165 +165 @@
 function bp_attachments_get_allowed_types( $type = 'avatar' ) {
         // Defaults to BuddyPress supported image extensions.
-        $exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
-        if ( bp_is_running_wp( '5.8.0', '>=' ) ) {
-                $exts[] = 'webp';
-        }
+        $exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
 
         // Avatar and cover image are images.
@@ -787 +784 @@
 
         // Check if WebP images can be edited.
-        if ( bp_is_running_wp( '5.8.0', '>=' ) && ! wp_image_editor_supports( array( 'mime_type' => 'image/webp' ) ) ) {
+        if ( ! wp_image_editor_supports( array( 'mime_type' => 'image/webp' ) ) ) {
                 $defaults['webp_upload_error'] = true;
         }

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

@@ -3889 +3889 @@
         );
 
-        if ( $block_name && bp_is_running_wp( '5.8.0', '>=' ) ) {
+        if ( $block_name ) {
                 $widget_blocks = get_option( 'widget_block', array() );
                 $sidebars      = wp_get_sidebars_widgets();

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

@@ -20 +20 @@
 function bp_core_retain_legacy_widgets() {
         $theme_supports = current_theme_supports( 'widgets-block-editor' );
-        $wp_supports    = bp_is_running_wp( '5.8.0' );
 
         /** This filter is documented in wp-includes/widgets.php */
-        $block_widgets_enabled = $theme_supports && apply_filters( 'use_widgets_block_editor', $wp_supports );
+        $block_widgets_enabled = $theme_supports && apply_filters( 'use_widgets_block_editor', true );
 
         $retain_legacy_widgets = true;

trunk/src/bp-loader.php

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

trunk/tests/phpunit/testcases/core/avatars.php

@@ -6 +6 @@
 class BP_Tests_Avatars extends BP_UnitTestCase {
         private $params = array();
-        protected $allowed_image_types = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
-        protected $allowed_image_mimes = array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png' );
+        protected $allowed_image_types = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
+        protected $allowed_image_mimes = array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp' );
 
         public function set_up() {
                 parent::set_up();
-
-                if ( bp_is_running_wp( '5.8.0', '>=' ) ) {
-                        $this->allowed_image_types[] = 'webp';
-                        $this->allowed_image_mimes[] = 'image/webp';
-                }
         }
 

trunk/tests/phpunit/testcases/core/functions.php

@@ -785 +785 @@
          */
         public function test_bp_attachments_get_allowed_types() {
-                $supported = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
-                if ( bp_is_running_wp( '5.8.0', '>=' ) ) {
-                        $supported[] = 'webp';
-                }
+                $supported = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
 
                 $avatar = bp_attachments_get_allowed_types( 'avatar' );