Ticket #8687: 8687.branch-10.0.patch

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

@@ -31 +31 @@
                 return buddypress()->version;
         }
 
+/**
+ * Output the BuddyPress version used for its first install.
+ *
+ * @since 10.3.0
+ */
+function bp_initial_version() {
+        echo bp_get_initial_version();
+}
+
+        /**
+         * Return the BuddyPress version used for its first install.
+         *
+         * @since 10.3.0
+         *
+         * @return string The BuddyPress version used for its first install.
+         */
+        function bp_get_initial_version() {
+                return bp_get_option( '_bp_initial_major_version', '0' );
+        }
+
 /**
  * Output the BuddyPress database version.
  *

src/class-buddypress.php

@@ -359 +359 @@
                  *
                  * @since 2.0.0 Defaults to false always
                  * @since 2.8.0 Defaults to true on upgrades, false for new installs.
+                 * @since 10.3.0 Defaults to true, unless the BP_IGNORE_DEPRECATED constant says otherwise.
                  */
-                $this->load_deprecated = false;
+                $this->load_deprecated = defined( 'BP_IGNORE_DEPRECATED' ) ? ! BP_IGNORE_DEPRECATED : true;
 
                 /** Toolbar */
 
@@ -463 +464 @@
                  * @param string $value Email type taxonomy slug.
                  */
                 $this->email_taxonomy_type = apply_filters( 'bp_email_tax_type', 'bp-email-type' );
+
+                /**
+                 * Are PHPUnit tests running?
+                 *
+                 * @since 10.3.0
+                 *
+                 * @param bool $value True if PHPUnit tests are running, false otherwise.
+                 */
+                $this->is_phpunit_running = function_exists( 'tests_add_filter' );
         }
 
         /**
@@ -484 +494 @@
                 if ( ! defined( 'BP_DB_VERSION' ) ) {
                         define( 'BP_DB_VERSION', $this->db_version );
                 }
-
-                // Define if deprecated functions should be ignored.
-                if ( ! defined( 'BP_IGNORE_DEPRECATED' ) ) {
-                        define( 'BP_IGNORE_DEPRECATED', true );
-                }
         }
 
         /**
@@ -535 +540 @@
                 require $this->plugin_dir . 'bp-core/bp-core-rest-api.php';
                 require $this->plugin_dir . 'bp-core/bp-core-blocks.php';
 
-                // Maybe load deprecated functionality (this double negative is proof positive!).
-                if ( ! bp_get_option( '_bp_ignore_deprecated_code', ! $this->load_deprecated ) ) {
-                        require $this->plugin_dir . 'bp-core/deprecated/1.2.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/1.5.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/1.6.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/1.7.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/1.9.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.0.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.1.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.2.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.3.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.4.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.5.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.6.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.7.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.8.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/2.9.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/3.0.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/4.0.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/6.0.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/7.0.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/8.0.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/9.0.php';
-                        require $this->plugin_dir . 'bp-core/deprecated/10.0.php';
+                // Load deprecated functionality.
+                if ( $this->load_deprecated && ! $this->is_phpunit_running ) {
+                        // Get the initial major version.
+                        $first_major_version = bp_get_initial_version();
+
+                        // List of versions containing deprecated functions.
+                        $deprecated_versions = array(
+                                '1.2',
+                                '1.5',
+                                '1.6',
+                                '1.7',
+                                '1.9',
+                                '2.0',
+                                '2.1',
+                                '2.2',
+                                '2.3',
+                                '2.4',
+                                '2.5',
+                                '2.6',
+                                '2.7',
+                                '2.8',
+                                '2.9',
+                                '3.0',
+                                '4.0',
+                                '6.0',
+                                '7.0',
+                                '8.0',
+                                '9.0',
+                                '10.0',
+                        );
+
+                        foreach ( $deprecated_versions as $deprecated_version ) {
+                                if ( 1 === version_compare( $first_major_version, $deprecated_version ) ) {
+                                        continue;
+                                }
+
+                                // Only load deprecated versions that are equals or higher than the first major version.
+                                require $this->plugin_dir . sprintf( 'bp-core/deprecated/%s.php', $deprecated_version );
+                        }
                 }
 
                 // Load wp-cli module if PHP 5.6+.
@@ -719 +739 @@
                 if (
                         ! in_array( $component, array( 'core', 'members' ), true ) &&
                         ! bp_is_active( $component ) &&
-                        ! function_exists( 'tests_add_filter' )
+                        ! $this->is_phpunit_running
                 ) {
                         return;
                 }