Merge pull request #2 from WordPress-Coding-Standards/develop

Update Develop from main WPS Fork

Author: mattyrob

WordPress/Sniffs/VIP/PostsPerPageSniff.php

@@ -50,12 +50,11 @@ public function getGroups() {
 	 */
 	public function callback( $key, $val, $line, $group ) {
 		$key = strtolower( $key );
-		if ( 
-			( $key == 'nopaging' && $val == 'true' || $val == 1 )
+		if (
+			( $key == 'nopaging' && ( $val == 'true' || $val == 1 ) )
 			||
 			( in_array( $key, array( 'numberposts', 'posts_per_page' ) ) && $val == '-1' )
 			) {
-
 			return 'Disabling pagination is prohibited in VIP context, do not set `%s` to `%s` ever.';
 		}
 		elseif (

WordPress/Tests/VIP/PostsPerPageUnitTest.inc

@@ -4,10 +4,15 @@ $args = array(
 	'nopaging'       => true, // Bad
 	'posts_per_page' => 999, // Bad
 	'posts_per_page' => -1, // Bad
-	);
+	'posts_per_page' => 1, // OK
+	'posts_per_page' => '1', // OK
+);
 
 _query_posts( 'nopaging=true&posts_per_page=999' ); // Bad
 
 $query_args['posts_per_page'] = -1; // Bad
+$query_args['posts_per_page'] = 1; // OK
+$query_args['posts_per_page'] = '1'; // OK
+$query_args['posts_per_page'] = '-1'; // Bad
 
-$query_args['my_posts_per_page'] = -1; // ok
+$query_args['my_posts_per_page'] = -1; // OK

WordPress/Tests/VIP/PostsPerPageUnitTest.php

@@ -24,8 +24,9 @@ public function getErrorList()
 				4  => 1,
 				5  => 1,
 				6  => 1,
-				9  => 2,
-				11 => 1,
+				11  => 2,
+				13 => 1,
+				16 => 1,
 				);
 
 		}//end getErrorList()