Don't flag unset()'s in input sanitization sniff

Fixes #187
WordPress · Jun 26, 2014 · 64fab4f · 64fab4f
1 parent aa044c2
commit 64fab4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Sniffs/VIP/ValidatedSanitizedInputSniff.php b/Sniffs/VIP/ValidatedSanitizedInputSniff.php
@@ -68,7 +68,7 @@ public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
 
 		// Ignore if wrapped inside ISSET
 		end( $nested ); // Get closest parenthesis
-		if ( in_array( $tokens[ key( $nested ) - 1 ]['code'], array( T_ISSET, T_EMPTY ) ) )
+		if ( in_array( $tokens[ key( $nested ) - 1 ]['code'], array( T_ISSET, T_EMPTY, T_UNSET ) ) )
 			return;
 
 		$varKey = $this->getArrayIndexKey( $phpcsFile, $tokens, $stackPtr );
@@ -107,7 +107,7 @@ public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
 		}
 
 		for ( $i = $scope_start + 1; $i < $scope_end; $i++ ) {
-			if ( ! in_array( $tokens[$i]['code'], array( T_ISSET, T_EMPTY ) ) ) {
+			if ( ! in_array( $tokens[$i]['code'], array( T_ISSET, T_EMPTY, T_UNSET ) ) ) {
 				continue;
 			}
 			$issetPtr = $i;
@@ -148,6 +148,8 @@ public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
 				) {
 				$is_sanitized = true;
 			}
+		} elseif ( T_UNSET === $function['code'] ) {
+			$is_sanitized = true;
 		}
 
 		if ( ! $is_sanitized ) {

diff --git a/Tests/VIP/ValidatedSanitizedInputUnitTest.inc b/Tests/VIP/ValidatedSanitizedInputUnitTest.inc
@@ -59,3 +59,5 @@ $values = array_values( $_POST );
 foreach( $_POST as $key => $value ) {
 	// ..
 }
+
+unset( $_GET['test'] ) // ok
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,3 +59,5 @@ $values = array_values( $_POST ); @@
     foreach( $_POST as $key => $value ) {
     	// ..
     }
+    unset( $_GET['test'] ) // ok