From 347570a8a51a94a55645166e8bbeda0bb3141395 Mon Sep 17 00:00:00 2001
From: Matt Bernhardt <mjbernha@mit.edu>
Date: Tue, 13 Sep 2016 15:53:38 -0400
Subject: [PATCH 1/2] Adds newer PHP and Wordpress releases to Travis linting

---
 .travis.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95d75ab..206d836 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,12 @@ language: php
 
 # Declare versions of PHP to use. Use one decimal max.
 php:
+  # aliased to a recent 7.0.x version
+  - "7.0"
+  # aliased to a recent 5.6.x version
+  - "5.6"
   # aliased to a recent 5.5.x version
-  # "5.5"
+  - "5.5"
   # aliased to a recent 5.4.x version
   - "5.4"
   # aliased to a recent 5.3.x version
@@ -26,6 +30,10 @@ env:
   # @link https://github.com/WordPress/WordPress
   # WP_VERSION=master WP_MULTISITE=0
   # WP_VERSION=master WP_MULTISITE=1
+  # WordPress 4.6
+  # @link https://github.com/WordPress/WordPress/tree/4.6-branch
+  # WP_VERSION=4.6 WP_MULTISITE=0
+  - WP_VERSION=4.6 WP_MULTISITE=1
   # WordPress 4.5
   # @link https://github.com/WordPress/WordPress/tree/4.5-branch
   # WP_VERSION=4.5 WP_MULTISITE=0
@@ -41,7 +49,11 @@ env:
 matrix:
   allow_failures:
     - php: "5.4"
-    - env: WP_VERSION=4.5 WP_MULTISITE=1
+    - php: "5.5"
+    - php: "5.6"
+    - php: "7.0"
+    - env: "WP_VERSION=4.5 WP_MULTISITE=1"
+    - env: "WP_VERSION=4.6 WP_MULTISITE=1"
   fast_finish: true
 
 # Use this to prepare the system to install prerequisites or dependencies.

From 2e045c7b8b86a3cc602c638198058f5017e24f43 Mon Sep 17 00:00:00 2001
From: Matt Bernhardt <mjbernha@mit.edu>
Date: Tue, 13 Sep 2016 16:15:49 -0400
Subject: [PATCH 2/2] Updates inline comments per
 Squiz.Commenting.LongConditionClosingComment

---
 additionalPosts-biblio.php | 2 +-
 additionalPosts-cat.php    | 4 ++--
 additionalPosts-search.php | 2 +-
 category.php               | 2 +-
 functions.php              | 2 +-
 inc/events.php             | 2 +-
 index.php                  | 2 +-
 page-biblio-archive.php    | 2 +-
 page-bibliotech.php        | 2 +-
 single.php                 | 2 +-
 test-template.php          | 4 ++--
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/additionalPosts-biblio.php b/additionalPosts-biblio.php
index de5feb2..9968347 100644
--- a/additionalPosts-biblio.php
+++ b/additionalPosts-biblio.php
@@ -62,7 +62,7 @@
 </script>
 
 
-<?php } // Removes button end. ?>
+<?php } // End if(). ?>
 	
 	
 	
diff --git a/additionalPosts-cat.php b/additionalPosts-cat.php
index bffe643..45669c8 100644
--- a/additionalPosts-cat.php
+++ b/additionalPosts-cat.php
@@ -69,7 +69,7 @@
 $("#another").hide();
 </script>
 <?php }
-// Removes button end.
+// End if().
 ?>
 	
 <?php if ( $the_query->have_posts() ) :  ?>
@@ -86,7 +86,7 @@
 
 <?php if ( get_post_type( get_the_ID() ) == 'bibliotech' ) { ?>
 		   
-			<?php } //get_post_type( get_the_ID() ) == 'bibliotech' ?>
+			<?php } // End if(). ?>
 			  
 					<?php  wp_reset_query(); // Restore global post data stomped by the_post(). ?>
 		   
diff --git a/additionalPosts-search.php b/additionalPosts-search.php
index 884bb97..72a094c 100644
--- a/additionalPosts-search.php
+++ b/additionalPosts-search.php
@@ -55,7 +55,7 @@ function set_search( $q ) {
 	if ( 'search' == $query_split[0] ) {
 	$search_args['s'] = urldecode( $query_split[1] );
 	}
-} // foreach
+} // End foreach().
 
 $the_query = new WP_Query( $search_args );
 // The set_search() function is defined above.
diff --git a/category.php b/category.php
index 1a5b3c7..6feb2ff 100644
--- a/category.php
+++ b/category.php
@@ -33,7 +33,7 @@
 	
 			<?php if ( get_post_type( get_the_ID() ) == 'bibliotech' ) { ?>
 		   
-			<?php } //get_post_type( get_the_ID() ) == 'bibliotech' ?>
+			<?php } // End if(). ?>
 			  
 					<?php  wp_reset_query(); // Restore global post data stomped by the_post(). ?>
 		   
diff --git a/functions.php b/functions.php
index f47f934..56fc46b 100644
--- a/functions.php
+++ b/functions.php
@@ -366,7 +366,7 @@ function biblio_taxonomy() {
 	// Hook into the 'init' action.
 	add_action( 'init', 'biblio_taxonomy', 0 );
 
-}
+} // End if().
 
 /**
  * Registers news sidebar
diff --git a/inc/events.php b/inc/events.php
index 1e3bb75..b30dff7 100644
--- a/inc/events.php
+++ b/inc/events.php
@@ -48,5 +48,5 @@
 			</span> 
 		  
 		   </div>
-		  <?php 	}	?>
+		  <?php 	} // End if().	?>
 		  <!--EVENT --> 
diff --git a/index.php b/index.php
index 535a6b0..954a63b 100644
--- a/index.php
+++ b/index.php
@@ -133,7 +133,7 @@
 <?php
 if ( $i > 6 ) {
 	get_template_part( 'inc/more-posts' );
-} //$i > 6
+} // End if().
 ?>
 
 </div>
diff --git a/page-biblio-archive.php b/page-biblio-archive.php
index 7223c4e..2acb03b 100644
--- a/page-biblio-archive.php
+++ b/page-biblio-archive.php
@@ -59,7 +59,7 @@
 ?>
 	<p><?php esc_html_e( 'Sorry, no posts matched your criteria.' ); ?></p>
 <?php
-}
+} // End if().
 ?>
 
 		</div><!-- news-content -->
diff --git a/page-bibliotech.php b/page-bibliotech.php
index a0b44ab..a101bd7 100644
--- a/page-bibliotech.php
+++ b/page-bibliotech.php
@@ -50,7 +50,7 @@
 			
 				<?php wp_reset_query(); ?>
 		  
-					<?php } //isset( $sticky[0] ) ?>
+					<?php } // End if(). ?>
 		 
 					<?php endwhile; ?>
 		
diff --git a/single.php b/single.php
index 2c41d9c..bfb51f0 100644
--- a/single.php
+++ b/single.php
@@ -109,7 +109,7 @@
 			</span> 
 		  
 		   </div>
-		  <?php 	}	?>
+		  <?php 	} // End if(). ?>
 
 	<!--=================image=================== -->       
 	<?php if ( get_field( 'image' ) ) { ?>
diff --git a/test-template.php b/test-template.php
index 166b814..5502c79 100644
--- a/test-template.php
+++ b/test-template.php
@@ -82,7 +82,7 @@
 	</div>
 	<?php wp_reset_postdata(); ?>
 	<?php wp_reset_query(); ?>
-	  <?php  } ?>
+	  <?php  } // End if(). ?>
 	<?php endwhile; ?>
 	 <?php endif; ?>
 	
@@ -261,7 +261,7 @@
 		  </p>
 		</div>
 		
-		<?php } ?>
+		<?php } // End if(). ?>
 		
 		<div class="category-post <?php  if ( get_post_type( get_the_ID() ) == 'bibliotech' ) { echo 'Bibliotech';} ?>">