<!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][12552] trunk: Bump PHP required version to 5.6</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/12552">12552</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/12552","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>2020-02-27 22:30:30 +0000 (Thu, 27 Feb 2020)</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'>Bump PHP required version to 5.6
This commit also tries to fix failing tests with PHP 7.2
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8172">#8172</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktravisyml">trunk/.travis.yml</a></li>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpwalkernavmenuphp">trunk/src/bp-core/classes/class-bp-walker-nav-menu.php</a></li>
<li><a href="#trunksrcreadmetxt">trunk/src/readme.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/src/bp-core/compat/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktravisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.travis.yml 2020-02-25 23:51:13 UTC (rev 12551)
+++ trunk/.travis.yml 2020-02-27 22:30:30 UTC (rev 12552)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Use new Travis container-based infrastructure
</span><span class="cx" style="display: block; padding: 0 10px"> # http://docs.travis-ci.com/user/workers/container-based-infrastructure/
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-sudo: false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+os: linux
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> language: php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> php:
</span><span class="cx" style="display: block; padding: 0 10px"> - 7.3
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - 7.2
</del><span class="cx" style="display: block; padding: 0 10px"> - 5.6
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # WordPress comes from the Git mirror, where 'master' mirrors svn 'trunk' and
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,9 +39,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> env: WP_VERSION=master BP_TRAVISCI=travis:grunt
</span><span class="cx" style="display: block; padding: 0 10px"> - php: 7.3
</span><span class="cx" style="display: block; padding: 0 10px"> env: WP_VERSION=master BP_TRAVISCI=travis:phpcompat
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - php: 5.3
- env: WP_VERSION=4.8 BP_TRAVISCI=travis:phpunit
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - php: 7.2
+ env: WP_VERSION=master BP_TRAVISCI=travis:phpunit
</ins><span class="cx" style="display: block; padding: 0 10px"> dist: precise
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - php: 7.2
+ env: WP_VERSION=5.3 BP_TRAVISCI=travis:phpunit
+ dist: precise
+ - php: 7.2
+ env: WP_VERSION=5.2 BP_TRAVISCI=travis:phpunit
+ dist: precise
+ - php: 7.2
+ env: WP_VERSION=5.1 BP_TRAVISCI=travis:phpunit
+ dist: precise
+ - php: 7.2
+ env: WP_VERSION=5.0 BP_TRAVISCI=travis:phpunit
+ dist: precise
</ins><span class="cx" style="display: block; padding: 0 10px"> exclude:
</span><span class="cx" style="display: block; padding: 0 10px"> - php: 7.3
</span><span class="cx" style="display: block; padding: 0 10px"> env: WP_VERSION=4.9 BP_TRAVISCI=travis:phpunit
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +111,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # before_script: Failures in this section will result in build status 'errored'
</span><span class="cx" style="display: block; padding: 0 10px"> before_script:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.3" ]]; then composer global require --dev phpunit/phpunit ^4; fi
</del><span class="cx" style="display: block; padding: 0 10px"> - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then composer global require --dev phpunit/phpunit ^5; composer install; fi
</span><span class="cx" style="display: block; padding: 0 10px"> - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]]; then composer global require --dev phpunit/phpunit ^6; composer install; fi
</span><span class="cx" style="display: block; padding: 0 10px"> - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.3" ]]; then composer global require --dev phpunit/phpunit ^6; composer install; fi
</span></span></pre></div>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2020-02-25 23:51:13 UTC (rev 12551)
+++ trunk/Gruntfile.js 2020-02-27 22:30:30 UTC (rev 12552)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,7 +269,7 @@
</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"> phplint: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- good: ['src/**/*.php', '!src/bp-core/compat/php56/*.php'].concat( BP_EXCLUDED_MISC )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ good: ['src/**/*.php'].concat( BP_EXCLUDED_MISC )
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> postcss: {
</span><span class="cx" style="display: block; padding: 0 10px"> options: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,7 +325,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> stdout: false
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> phpcompat: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- command: './vendor/bin/phpcs -p --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 5.3- src tests',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ command: './vendor/bin/phpcs -p --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 5.6- src tests',
</ins><span class="cx" style="display: block; padding: 0 10px"> stdout: true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> rest_api: {
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpwalkernavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/classes/class-bp-walker-nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-walker-nav-menu.php 2020-02-25 23:51:13 UTC (rev 12551)
+++ trunk/src/bp-core/classes/class-bp-walker-nav-menu.php 2020-02-27 22:30:30 UTC (rev 12552)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,12 +11,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'ABSPATH' ) || exit;
</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">- * Compatibility Class to make BP_Walker_Nav_Menu::walk() compatible
- * from PHP 5.3 to 5.6 and up.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Create HTML list of BP nav items.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 1.7.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class BP_Walker_Nav_Menu_Compat extends Walker_Nav_Menu {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class BP_Walker_Nav_Menu extends Walker_Nav_Menu {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Description of fields indexes for building markup.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,6 +131,20 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Overrides Walker::walk() method.
+ *
+ * @since 6.0.0 Formalized the existing `...$args` parameter by adding it
+ * to the function signature to match WordPress 5.3.
+ *
+ * @param array $elements See {@link Walker::walk()}.
+ * @param int $max_depth See {@link Walker::walk()}.
+ * @param mixed ...$args See {@link Walker::walk()}.
+ */
+ public function walk( $elements, $max_depth, ...$args ) {
+ return $this->do_walk( $elements, $max_depth, $args );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Display the current <li> that we are on.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see Walker::start_el() for complete description of parameters.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,9 +225,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= apply_filters( 'bp_walker_nav_menu_start_el', $item_output, $item, $depth, $args );
</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">-
-if ( PHP_VERSION_ID >= 50600 ) {
- require_once dirname( __DIR__ ) . '/compat/php56/class-bp-compat-walker-nav-menu.php';
-} else {
- require_once dirname( __DIR__ ) . '/compat/php53/class-bp-compat-walker-nav-menu.php';
-}
</del></span></pre></div>
<a id="trunksrcreadmetxt"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/readme.txt</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/readme.txt 2020-02-25 23:51:13 UTC (rev 12551)
+++ trunk/src/readme.txt 2020-02-27 22:30:30 UTC (rev 12552)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Tags: user profiles, activity streams, messaging, friends, user groups, notifications, community, social networking, intranet
</span><span class="cx" style="display: block; padding: 0 10px"> Requires at least: 4.8
</span><span class="cx" style="display: block; padding: 0 10px"> Tested up to: 5.2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Requires PHP: 5.3
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Requires PHP: 5.6
</ins><span class="cx" style="display: block; padding: 0 10px"> Stable tag: 5.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> License: GPLv2 or later
</span><span class="cx" style="display: block; padding: 0 10px"> License URI: https://www.gnu.org/licenses/gpl-2.0.html
</span></span></pre>
</div>
</div>
</body>
</html>