Merge pull request #328 from szepeviktor/master

Fix Travis builds

Author: pattonwebz

.travis.yml

@@ -1,4 +1,5 @@
 language: php
+dist: trusty
 
 notifications:
   email:
@@ -10,24 +11,31 @@ branches:
     - master
 
 php:
-  - 5.3
   - 5.6
   - 7.0
+  - nightly
 
 env:
   - WP_VERSION=latest WP_MULTISITE=0
+  - WP_VERSION=latest WP_MULTISITE=1
 
 matrix:
   include:
-    - php: 5.3
+    - dist: precise
+      php: 5.3
+      env: WP_VERSION=latest WP_MULTISITE=0
+    - dist: precise
+      php: 5.3
       env: WP_VERSION=latest WP_MULTISITE=1
+  allow_failures:
+    - php: nightly
 
 before_script:
-  - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
+  - bash bin/install-wp-tests.sh wordpress_test root "" localhost $WP_VERSION
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - |
-    if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then
-      composer global require "phpunit/phpunit=5.6.*"
+    if [[ ${TRAVIS_PHP_VERSION:0:1} == "7" ]]; then
+      composer global require "phpunit/phpunit=^5.6"
     else
       composer global require "phpunit/phpunit=4.8.*"
     fi
@@ -36,5 +44,9 @@ before_script:
     phpcs --config-set installed_paths $HOME/.composer/vendor/wp-coding-standards/wpcs
 
 script:
-  - phpcs --standard=phpcs.ruleset.xml $(find . -name '*.php')
+  - phpcs --standard=phpcs.ruleset.xml $(find -name "*.php")
   - phpunit
+
+cache:
+  directories:
+    - $HOME/.composer/cache

wp-bootstrap-navwalker.php

@@ -41,7 +41,7 @@ class WP_Bootstrap_Navwalker extends Walker_Nav_Menu {
 		 * @return void
 		 */
 		public function start_lvl( &$output, $depth = 0, $args = array() ) {
-			$indent = str_repeat( "\t", $depth );
+			$indent  = str_repeat( "\t", $depth );
 			$output .= "\n$indent<ul role=\"menu\" class=\" dropdown-menu\" >\n";
 		}
 
@@ -79,10 +79,10 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 			} elseif ( 0 === strcasecmp( $item->attr_title, 'disabled' ) ) {
 				$output .= $indent . '<li role="presentation" class="disabled"><a href="#">' . esc_attr( $item->title ) . '</a>';
 			} else {
-				$value = '';
+				$value       = '';
 				$class_names = $value;
-				$classes = empty( $item->classes ) ? array() : (array) $item->classes;
-				$classes[] = 'menu-item-' . $item->ID;
+				$classes     = empty( $item->classes ) ? array() : (array) $item->classes;
+				$classes[]   = 'menu-item-' . $item->ID;
 				$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args ) );
 				if ( $args->has_children ) {
 					$class_names .= ' dropdown';
@@ -91,33 +91,33 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 					$class_names .= ' active';
 				}
 				$class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
-				$id = apply_filters( 'nav_menu_item_id', 'menu-item-' . $item->ID, $item, $args );
-				$id = $id ? ' id="' . esc_attr( $id ) . '"' : '';
-				$output .= $indent . '<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"' . $id . $value . $class_names . '>';
-				$atts = array();
+				$id          = apply_filters( 'nav_menu_item_id', 'menu-item-' . $item->ID, $item, $args );
+				$id          = $id ? ' id="' . esc_attr( $id ) . '"' : '';
+				$output     .= $indent . '<li itemscope="itemscope" itemtype="https://www.schema.org/SiteNavigationElement"' . $id . $value . $class_names . '>';
+				$atts        = array();
 
 				if ( empty( $item->attr_title ) ) {
-					$atts['title']  = ! empty( $item->title )   ? strip_tags( $item->title ) : '';
+					$atts['title'] = ! empty( $item->title ) ? strip_tags( $item->title ) : '';
 				} else {
 					$atts['title'] = $item->attr_title;
 				}
 
 				$atts['target'] = ! empty( $item->target ) ? $item->target : '';
-				$atts['rel']    = ! empty( $item->xfn )    ? $item->xfn    : '';
+				$atts['rel']    = ! empty( $item->xfn ) ? $item->xfn : '';
 				// If item has_children add atts to a.
 				if ( $args->has_children && 0 === $depth ) {
-					$atts['href']           = '#';
-					$atts['data-toggle']    = 'dropdown';
-					$atts['class']          = 'dropdown-toggle';
-					$atts['aria-haspopup']  = 'true';
+					$atts['href']          = '#';
+					$atts['data-toggle']   = 'dropdown';
+					$atts['class']         = 'dropdown-toggle';
+					$atts['aria-haspopup'] = 'true';
 				} else {
 					$atts['href'] = ! empty( $item->url ) ? $item->url : '';
 				}
-				$atts = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args );
+				$atts       = apply_filters( 'nav_menu_link_attributes', $atts, $item, $args );
 				$attributes = '';
 				foreach ( $atts as $attr => $value ) {
 					if ( ! empty( $value ) ) {
-						$value = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
+						$value       = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
 						$attributes .= ' ' . $attr . '="' . $value . '"';
 					}
 				}
@@ -143,7 +143,7 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0
 				$item_output .= $args->link_before . apply_filters( 'the_title', $item->title, $item->ID ) . $args->link_after;
 				$item_output .= ( $args->has_children && 0 === $depth ) ? ' <span class="caret"></span></a>' : '</a>';
 				$item_output .= $args->after;
-				$output .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
+				$output      .= apply_filters( 'walker_nav_menu_start_el', $item_output, $item, $depth, $args );
 			} // End if().
 		}
 
@@ -192,11 +192,11 @@ public static function fallback( $args ) {
 			if ( current_user_can( 'edit_theme_options' ) ) {
 
 				/* Get Arguments. */
-				$container = $args['container'];
-				$container_id = $args['container_id'];
+				$container       = $args['container'];
+				$container_id    = $args['container_id'];
 				$container_class = $args['container_class'];
-				$menu_class = $args['menu_class'];
-				$menu_id = $args['menu_id'];
+				$menu_class      = $args['menu_class'];
+				$menu_id         = $args['menu_id'];
 
 				if ( $container ) {
 					echo '<' . esc_attr( $container );