<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][13706] branches/12.0: Use the current major version to decide about deprecated code to load</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13706">13706</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13706","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-01-22 04:06:39 +0000 (Mon, 22 Jan 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Use the current major version to decide about deprecated code to load
Using the current version in case of a minor version was preventing deprecated code to be loaded when this minor version was used to first activate BuddyPress.
Props vapvarun, emaralive
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/9075">#9075</a> (branch 12.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches120srcbpcorebpcorefunctionsphp">branches/12.0/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#branches120srcclassbuddypressphp">branches/12.0/src/class-buddypress.php</a></li>
<li><a href="#branches120testsphpunittestcasescorefunctionsphp">branches/12.0/tests/phpunit/testcases/core/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches120srcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/12.0/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/12.0/src/bp-core/bp-core-functions.php 2024-01-22 03:50:51 UTC (rev 13705)
+++ branches/12.0/src/bp-core/bp-core-functions.php 2024-01-22 04:06:39 UTC (rev 13706)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4846,30 +4846,30 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // List of versions containing deprecated functions.
</span><span class="cx" style="display: block; padding: 0 10px"> $deprecated_functions_versions = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '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',
- '11.0',
- '12.0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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,
+ 11.0,
+ 12.0,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4893,8 +4893,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 2 last versions deprecated functions will be loaded for upgraded installs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $initial_version = (float) bp_get_initial_version();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_version = (float) bp_get_version();
- $load_latest_deprecated = $initial_version < $current_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_major_version = (float) bp_get_major_version( bp_get_version() );
+ $load_latest_deprecated = $initial_version < $current_major_version;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // New installs.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $load_latest_deprecated ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4904,7 +4904,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array_map(
</span><span class="cx" style="display: block; padding: 0 10px"> function( $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $file, '.php' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return str_replace( '.php', '', $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (float) str_replace( '.php', '', $file );
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> scandir( buddypress()->plugin_dir . 'bp-core/deprecated' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4917,16 +4917,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only load 12.0 deprecated functions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array( '12.0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array( 12.0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Try to get the first major version that was in used when BuddyPress was fist installed.
- $first_major = '';
- if ( $initial_version ) {
- $first_major = bp_get_major_version( $initial_version );
- }
-
- $index_first_major = array_search( $first_major, $deprecated_functions_versions, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index_first_major = array_search( $initial_version, $deprecated_functions_versions, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $index_first_major ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array_splice( $deprecated_functions_versions, -2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4937,7 +4931,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $latest_deprecated_functions_versions = array_splice( $latest_deprecated_functions_versions, -2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $index_initial_version = array_search( $first_major, $latest_deprecated_functions_versions, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index_initial_version = array_search( $initial_version, $latest_deprecated_functions_versions, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $index_initial_version ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $latest_deprecated_functions_versions[ $index_initial_version ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches120srcclassbuddypressphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/12.0/src/class-buddypress.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/12.0/src/class-buddypress.php 2024-01-22 03:50:51 UTC (rev 13705)
+++ branches/12.0/src/class-buddypress.php 2024-01-22 04:06:39 UTC (rev 13706)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,7 +654,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $deprecated_functions_versions as $deprecated_functions_version ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Load all or last 2 deprecated versions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require $this->plugin_dir . sprintf( 'bp-core/deprecated/%s.php', $deprecated_functions_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require $this->plugin_dir . sprintf( 'bp-core/deprecated/%s.php', number_format( $deprecated_functions_version, 1 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches120testsphpunittestcasescorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/12.0/tests/phpunit/testcases/core/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/12.0/tests/phpunit/testcases/core/functions.php 2024-01-22 03:50:51 UTC (rev 13705)
+++ branches/12.0/tests/phpunit/testcases/core/functions.php 2024-01-22 04:06:39 UTC (rev 13706)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -869,15 +869,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket BP8687
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket BP9075
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_get_deprecated_functions_versions() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_version = (float) bp_get_version();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_version = bp_get_version();
</ins><span class="cx" style="display: block; padding: 0 10px"> $versions = bp_get_deprecated_functions_versions();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // When current version is the initial version, we should only load 12.0 deprecated functions file.
- $this->assertSame( $versions, array( '12.0' ), 'Please check the list of `$deprecated_functions_versions` in `bp_get_deprecated_functions_versions()`. There should be one for each file of the `/src/bp-core/deprecated` directory.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // When current major version is the initial version, we should only load 12.0 deprecated functions file.
+ $this->assertSame( $versions, array( 12.0 ), 'Please check the list of `$deprecated_functions_versions` in `bp_get_deprecated_functions_versions()`. There should be one for each file of the `/src/bp-core/deprecated` directory.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp->version = '12.1.1';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // We should load the 2 lasts deprecated functions files.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->bp_initial_version = '12.0';
+
+ add_filter( 'pre_option__bp_initial_major_version', array( $this, 'override_initial_version' ), 10, 0 );
+
+ $versions = bp_get_deprecated_functions_versions();
+
+ $this->assertContains( 12.0, $versions, '12.0 deprecated functions should be loaded when 12.1.1 was the first installed version.' );
+
+ $this->bp_initial_version = '9.0';
+
+ $versions = bp_get_deprecated_functions_versions();
+
+ $this->assertContains( 12.0, $versions, '12.0 deprecated functions should be loaded when 12.0 was updated for a minor release' );
+
+ remove_filter( 'pre_option__bp_initial_major_version', array( $this, 'override_initial_version' ), 10, 0 );
+
+ $bp->version = $current_version;
+
+ // We should load the 2 lasts deprecated functions files.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->bp_initial_version = '8.0';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_option__bp_initial_major_version', array( $this, 'override_initial_version' ), 10, 0 );
</span></span></pre>
</div>
</div>
</body>
</html>