Ticket #8172: 8172.patch

.travis.yml

@@ -40 +40 @@
       env: WP_VERSION=master BP_TRAVISCI=travis:grunt
     - php: 7.3
       env: WP_VERSION=master BP_TRAVISCI=travis:phpcompat
-    - php: 5.3
-      env: WP_VERSION=4.8 BP_TRAVISCI=travis:phpunit
-      dist: precise
   exclude:
     - php: 7.3
       env: WP_VERSION=4.9 BP_TRAVISCI=travis:phpunit
@@ -100 +97 @@
 
 # before_script: Failures in this section will result in build status 'errored'
 before_script:
-  - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.3" ]]; then composer global require --dev phpunit/phpunit ^4; fi
   - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then composer global require --dev phpunit/phpunit ^5; composer install; fi
   - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]]; then composer global require --dev phpunit/phpunit ^6; composer install; fi
   - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.3" ]]; then composer global require --dev phpunit/phpunit ^6; composer install; fi

Gruntfile.js

@@ -269 +269 @@
                         }
                 },
                 phplint: {
-                        good: ['src/**/*.php', '!src/bp-core/compat/php56/*.php'].concat( BP_EXCLUDED_MISC )
+                        good: ['src/**/*.php'].concat( BP_EXCLUDED_MISC )
                 },
                 postcss: {
                         options: {
@@ -325 +325 @@
                                 stdout: false
                         },
                         phpcompat: {
-                                command: './vendor/bin/phpcs -p --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 5.3- src tests',
+                                command: './vendor/bin/phpcs -p --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 5.6- src tests',
                                 stdout: true
                         },
                         rest_api: {

src/bp-core/classes/class-bp-walker-nav-menu.php

@@ -11 +11 @@
 defined( 'ABSPATH' ) || exit;
 
 /**
- * Compatibility Class to make BP_Walker_Nav_Menu::walk() compatible
- * from PHP 5.3 to 5.6 and up.
+ * Create HTML list of BP nav items.
  *
- * @since 5.1.0
+ * @since 1.7.0
  */
-class BP_Walker_Nav_Menu_Compat extends Walker_Nav_Menu {
+class BP_Walker_Nav_Menu extends Walker_Nav_Menu {
         /**
          * Description of fields indexes for building markup.
          *
@@ -131 +130 @@
                  return $output;
         }
 
+        /**
+         * 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 );
+        }
+
         /**
          * Display the current <li> that we are on.
          *
@@ -212 +225 @@
                 $output .= apply_filters( 'bp_walker_nav_menu_start_el', $item_output, $item, $depth, $args );
         }
 }
-
-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';
-}

deleted file src/bp-core/compat/php53/class-bp-compat-walker-nav-menu.php

@@ -1 @@
-<?php
-/**
- * Walker_Nav_Menu Compat for PHP 5.3 and UP.
- *
- * @package BuddyPress
- * @subpackage Core
- * @since 5.1.0
- */
-
- // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
-
-/**
- * Create HTML list of BP nav items.
- *
- * @since 1.7.0
- */
-class BP_Walker_Nav_Menu extends BP_Walker_Nav_Menu_Compat {
-        /**
-         * Compat method to extend Walker_Nav_Menu::walk() in PHP < 5.6.
-         *
-         * @since 5.1.0
-         *
-         * @param array $elements  See {@link Walker::walk()}.
-         * @param int   $max_depth See {@link Walker::walk()}.
-         */
-        public function walk( $elements, $max_depth ) {
-                $args = array_slice( func_get_args(), 2 );
-
-                return $this->do_walk( $elements, $max_depth, $args );
-        }
-}

deleted file src/bp-core/compat/php56/class-bp-compat-walker-nav-menu.php

@@ -1 @@
-<?php
-/**
- * Walker_Nav_Menu Compat for PHP 5.6 and UP.
- *
- * @package BuddyPress
- * @subpackage Core
- * @since 5.1.0
- */
-
- // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
-
-/**
- * Create HTML list of BP nav items.
- *
- * @since 1.7.0
- */
-class BP_Walker_Nav_Menu extends BP_Walker_Nav_Menu_Compat {
-        /**
-         * Compat method to extend Walker_Nav_Menu::walk() in PHP > 5.6.
-         *
-         * @since 5.1.0
-         *
-         * @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 ) { // phpcs:ignore PHPCompatibility.LanguageConstructs.NewLanguageConstructs.t_ellipsisFound
-                return $this->do_walk( $elements, $max_depth, $args );
-        }
-}

src/readme.txt

@@ -3 +3 @@
 Tags: user profiles, activity streams, messaging, friends, user groups, notifications, community, social networking, intranet
 Requires at least: 4.8
 Tested up to: 5.2
-Requires PHP: 5.3
+Requires PHP: 5.6
 Stable tag: 5.0.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html