Changeset 12500

Timestamp:

11/29/2019 06:06:30 AM (5 years ago)

Author:

imath

Message:

Compat classes to handle Walker_Nav_Menu::walk() changes in WP 5.3

WordPress 5.3 modified the Walker_Nav_Menu::walk() signature adding a third parameter to the method that is using the spread operator. johnjamesjacoby quickly fixed the issue in [12497] when PHP >=5.6.

As our current PHP required version is 5.3, we need to provide a temporary compatibility mechanism to make sure our BP_Walker_Nav_Menu will not generate errors when the PHP version is lower than 5.6 before raising the PHP required version in our next major release.

props timothybjacobs, boonebgorges, imath

Fixes #8163 (5.0 branch)

Location:

branches/5.0

Files:

• Gruntfile.js (modified) (1 diff)
• src/bp-core/classes/class-bp-walker-nav-menu.php (modified) (4 diffs)
• src/bp-core/compat (added)
• src/bp-core/compat/php53 (added)
• src/bp-core/compat/php53/class-bp-compat-walker-nav-menu.php (added)
• src/bp-core/compat/php56 (added)
• src/bp-core/compat/php56/class-bp-compat-walker-nav-menu.php (added)
• tests/phpunit/testcases/core/class-bp-walker-nav-menu.php (added)

branches/5.0/Gruntfile.js

@@ -270 +270 @@
         },
         phplint: {
-            good: ['src/**/*.php'].concat( BP_EXCLUDED_MISC )
+            good: ['src/**/*.php', '!src/bp-core/compat/php56/*.php'].concat( BP_EXCLUDED_MISC )
         },
         postcss: {

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

@@ -12 +12 @@
 
 /**
- * Create HTML list of BP nav items.
+ * Compatibility Class to make BP_Walker_Nav_Menu::walk() compatible
+ * from PHP 5.3 to 5.6 and up.
  *
- * @since 1.7.0
+ * @since 5.1.0
  */
-class BP_Walker_Nav_Menu extends Walker_Nav_Menu {
-
+class BP_Walker_Nav_Menu_Compat extends Walker_Nav_Menu {
     /**
      * Description of fields indexes for building markup.
@@ -48 +48 @@
      *
      * @since 1.7.0
+     * @since 5.1.0 Method was renamed from `walk` to `do_walk` to ensure PHP 5.3 compatibility
      *
      * @see Walker::walk()
@@ -53 +54 @@
      * @param array $elements  See {@link Walker::walk()}.
      * @param int   $max_depth See {@link Walker::walk()}.
+     * @param array $args      Optional additional arguments.
      * @return string See {@link Walker::walk()}.
      */
-    public function walk( $elements, $max_depth ) {
-        $args   = array_slice( func_get_args(), 2 );
+    public function do_walk( $elements, $max_depth, $args = array() ) {
         $output = '';
 
@@ -212 +213 @@
     }
 }
+
+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';
+}