Version bump 4.1.0

Version 4.1.0

Author: pattonwebz

CHANGELOG.md

@@ -1,4 +1,9 @@
 #CHANGELOG
+
+## [4.1.0]
+- Prevent error `trying to get property of non-object` when no menu is set to a location using the walker.
+- Add `$depth` as 4th parameter passed to `nav_menu_link_attributes`.
+- Add support for `dropdown-item-text` linkmod type.
 ## [4.0.3]
 - Drop composer class autoload statement.
 

class-wp-bootstrap-navwalker.php

@@ -11,7 +11,7 @@
  * Plugin URI:  https://github.com/wp-bootstrap/wp-bootstrap-navwalker
  * Description: A custom WordPress nav walker class to implement the Bootstrap 4 navigation style in a custom theme using the WordPress built in menu manager.
  * Author: Edward McIntyre - @twittem, WP Bootstrap, William Patton - @pattonwebz
- * Version: 4.0.3
+ * Version: 4.1.0
  * Author URI: https://github.com/wp-bootstrap
  * GitHub Plugin URI: https://github.com/wp-bootstrap/wp-bootstrap-navwalker
  * GitHub Branch: master
@@ -133,7 +133,7 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 			$args = apply_filters( 'nav_menu_item_args', $args, $item, $depth );
 
 			// Add .dropdown or .active classes where they are needed.
-			if ( $args->has_children ) {
+			if ( isset( $args->has_children ) && $args->has_children ) {
 				$classes[] = 'dropdown';
 			}
 			if ( in_array( 'current-menu-item', $classes, true ) || in_array( 'current-menu-parent', $classes, true ) ) {
@@ -181,7 +181,7 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 			$atts['target'] = ! empty( $item->target ) ? $item->target : '';
 			$atts['rel']    = ! empty( $item->xfn ) ? $item->xfn : '';
 			// If item has_children add atts to <a>.
-			if ( $args->has_children && 0 === $depth && $args->depth > 1 ) {
+			if ( isset( $args->has_children ) && $args->has_children && 0 === $depth && $args->depth > 1 ) {
 				$atts['href']          = '#';
 				$atts['data-toggle']   = 'dropdown';
 				$atts['aria-haspopup'] = 'true';
@@ -201,7 +201,7 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 			// update atts of this item based on any custom linkmod classes.
 			$atts = self::update_atts_for_linkmod_type( $atts, $linkmod_classes );
 			// Allow filtering of the $atts array before using it.
-			$atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args );
+			$atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args, $depth );
 
 			// Build a string of html containing all the atts for the item.
 			$attributes = '';
@@ -220,8 +220,7 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 			/**
 			 * START appending the internal item contents to the output.
 			 */
-			$item_output = $args->before;
-
+			$item_output = isset( $args->before ) ? $args->before : '';
 			/**
 			 * This is the start of the internal nav item. Depending on what
 			 * kind of linkmod we have we may need different wrapper elements.
@@ -272,8 +271,7 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 			}
 
 			// Put the item contents into $output.
-			$item_output .= $args->link_before . $icon_html . $title . $args->link_after;
-
+			$item_output .= isset( $args->link_before ) ? $args->link_before . $icon_html . $title . $args->link_after : '';
 			/**
 			 * This is the end of the internal nav item. We need to close the
 			 * correct element depending on the type of link or link mod.
@@ -286,11 +284,11 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 				$item_output .= '</a>';
 			}
 
-			$item_output .= $args->after;
+			$item_output .= isset( $args->after ) ? $args->after : '';
+
 			/**
 			 * END appending the internal item contents to the output.
 			 */
-
 			$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
 
 		}
@@ -407,7 +405,7 @@ private function seporate_linkmods_and_icons_from_classes( $classes, &$linkmod_c
 					// Test for .disabled or .sr-only classes.
 					$linkmod_classes[] = $class;
 					unset( $classes[ $key ] );
-				} elseif ( preg_match( '/^dropdown-header|^dropdown-divider/i', $class ) && $depth > 0 ) {
+				} elseif ( preg_match( '/^dropdown-header|^dropdown-divider|^dropdown-item-text/i', $class ) && $depth > 0 ) {
 					// Test for .dropdown-header or .dropdown-divider and a
 					// depth greater than 0 - IE inside a dropdown.
 					$linkmod_classes[] = $class;
@@ -448,6 +446,8 @@ private function get_linkmod_type( $linkmod_classes = array() ) {
 							$linkmod_type = 'dropdown-header';
 						} elseif ( 'dropdown-divider' === $link_class ) {
 							$linkmod_type = 'dropdown-divider';
+						} elseif ( 'dropdown-item-text' === $link_class ) {
+							$linkmod_type = 'dropdown-item-text';
 						}
 					}
 				}
@@ -479,7 +479,7 @@ private function update_atts_for_linkmod_type( $atts = array(), $linkmod_classes
 							// Convert link to '#' and unset open targets.
 							$atts['href'] = '#';
 							unset( $atts['target'] );
-						} elseif ( 'dropdown-header' === $link_class || 'dropdown-divider' === $link_class ) {
+						} elseif ( 'dropdown-header' === $link_class || 'dropdown-divider' === $link_class || 'dropdown-item-text' === $link_class ) {
 							// Store a type flag and unset href and target.
 							unset( $atts['href'] );
 							unset( $atts['target'] );
@@ -517,7 +517,9 @@ private function wrap_for_screen_reader( $text = '' ) {
 		 */
 		private function linkmod_element_open( $linkmod_type, $attributes = '' ) {
 			$output = '';
-			if ( 'dropdown-header' === $linkmod_type ) {
+			if ( 'dropdown-item-text' === $linkmod_type ) {
+				$output .= '<span class="dropdown-item-text"' . $attributes . '>';
+			} elseif ( 'dropdown-header' === $linkmod_type ) {
 				// For a header use a span with the .h6 class instead of a real
 				// header tag so that it doesn't confuse screen readers.
 				$output .= '<span class="dropdown-header h6"' . $attributes . '>';
@@ -539,7 +541,7 @@ private function linkmod_element_open( $linkmod_type, $attributes = '' ) {
 		 */
 		private function linkmod_element_close( $linkmod_type ) {
 			$output = '';
-			if ( 'dropdown-header' === $linkmod_type ) {
+			if ( 'dropdown-header' === $linkmod_type || 'dropdown-item-text' === $linkmod_type ) {
 				// For a header use a span with the .h6 class instead of a real
 				// header tag so that it doesn't confuse screen readers.
 				$output .= '</span>';

tests/test-navwalker.php

@@ -39,6 +39,7 @@ public function setUp() {
 		$this->valid_linkmod_typeflags = array(
 			'dropdown-header',
 			'dropdown-divider',
+			'dropdown-item-text'
 		);
 
 		// array of all possible linkmods, including the valid typeflags.
@@ -592,6 +593,8 @@ public function test_linkmod_elements_open_and_close_successfully() {
 		$this->assertNotEmpty( $header_open, 'Got empty string for opener of ' . $this->valid_linkmod_typeflags[0] );
 		$divider_open = $method_open->invokeArgs( $wp_bootstrap_navwalker, array( $this->valid_linkmod_typeflags[1], 'stringOfAttributes' ) );
 		$this->assertNotEmpty( $divider_open, 'Got empty string for opener of ' . $this->valid_linkmod_typeflags[1] );
+		$text_open = $method_open->invokeArgs( $wp_bootstrap_navwalker, array( $this->valid_linkmod_typeflags[2], 'stringOfAttributes' ) );
+		$this->assertNotEmpty( $divider_open, 'Got empty string for opener of ' . $this->valid_linkmod_typeflags[2] );
 
 		// test that that an unknown linkmod type being passed results in no output.
 		$nonexistent_linkmod_type_open = $method_open->invokeArgs( $wp_bootstrap_navwalker, array( 'nonexistentlinkmodtype', 'stringOfAttributes' ) );
@@ -605,21 +608,30 @@ public function test_linkmod_elements_open_and_close_successfully() {
 		$this->assertNotEmpty( $header_close, 'Got empty string for closer of ' . $this->valid_linkmod_typeflags[0] );
 		$divider_close = $method_close->invokeArgs( $wp_bootstrap_navwalker, array( $this->valid_linkmod_typeflags[1] ) );
 		$this->assertNotEmpty( $divider_close, 'Got empty string for closer of ' . $this->valid_linkmod_typeflags[1] );
+		$text_close = $method_close->invokeArgs( $wp_bootstrap_navwalker, array( $this->valid_linkmod_typeflags[2] ) );
+		$this->assertNotEmpty( $divider_close, 'Got empty string for closer of ' . $this->valid_linkmod_typeflags[2] );
 
 		// test that that an unknown linkmod type being passed results in no output.
 		$nonexistent_linkmod_type_close = $method_open->invokeArgs( $wp_bootstrap_navwalker, array( 'nonexistentlinkmodtype' ) );
 		$this->assertEmpty( $nonexistent_linkmod_type_close, 'Expected empty string when using non-existent linkmod type.' );
 
+		// dropdown-header should be a span.
 		$this->assertRegExp(
 			'/^(<span(.*?)>)(.*?)(<\/span>)$/',
 			$header_open . $header_close,
 			'The opener and closer for ' . $this->valid_linkmod_typeflags[0] . ' does not seem to match expected elements.'
 		);
-
+		// dropdown-divider should be a div.
 		$this->assertRegExp(
 			'/^(<div(.*?)>)(.*?)(<\/div>)$/',
 			$divider_open . $divider_close,
-			'The opener and closer for ' . $this->valid_linkmod_typeflags[1] . ' linkmods does not seem to match expected elements.'
+			'The opener and closer for ' . $this->valid_linkmod_typeflags[1] . ' does not seem to match expected elements.'
+		);
+		// dropdown-item-text should be a span.
+		$this->assertRegExp(
+			'/^(<span(.*?)>)(.*?)(<\/span>)$/',
+			$text_open . $text_close,
+			'The opener and closer for ' . $this->valid_linkmod_typeflags[2] . ' does not seem to match expected elements.'
 		);
 	}
 }