Merge branch 'hotfix/2.0.4'

WordPoints · Jun 6, 2015 · 22bcd9a · 22bcd9a
2 parents 47c52a8 + fa73abf
commit 22bcd9a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 And as you can see, we [keep a CHANGELOG](http://keepachangelog.com/).
 
+## [2.0.4] - 2015-06-06
+## Added
+- `customUnslashingSanitizingFunctions` property configuration for the 
+`WordPress.VIP.ValidatedSanitizedInput` sniff. #71
+
+### Changed
+- WPCS version to latest commit on `develop`. #72
+- Enabled the `WordPress.VIP.DirectDatabaseQuery` sniff. #72
+
 ## [2.0.3] - 2015-05-23
 ### Added
 - `WordPress-Extra` and `WordPress-Docs` to the PHPCS ruleset. #69

diff --git a/bin/env.sh b/bin/env.sh
@@ -18,7 +18,7 @@ export PHPCS_GIT_TREE=master
 # WPCS
 export WPCS_DIR=/tmp/wpcs
 export WPCS_GITHUB_SRC=WordPress-Coding-Standards/WordPress-Coding-Standards
-export WPCS_GIT_TREE=ec5ea0f31fdb1b354a427d31d53676227f1afdc3
+export WPCS_GIT_TREE=20fed0bcf6f72f6740a0ad3be6bcb3d99b69ca52
 export WPCS_STANDARD=$(if [ -e phpcs.ruleset.xml ]; then echo phpcs.ruleset.xml; else echo WordPress; fi)
 
 # WP L10n Validator

diff --git a/phpcs/WordPoints/ruleset.xml b/phpcs/WordPoints/ruleset.xml
@@ -31,7 +31,8 @@
 	<rule ref="WordPress-VIP">
 		<exclude name="WordPress.VIP.RestrictedFunctions.switch_to_blog" />
 		<exclude name="WordPress.VIP.SuperGlobalInputUsage" />
-		<exclude name="WordPress.VIP.DirectDatabaseQuery" /><!-- WordPoints/wordpoints#75 -->
+		<exclude name="WordPress.VIP.DirectDatabaseQuery.SchemaChange" />
+		<exclude name="WordPress.VIP.DirectDatabaseQuery.DirectQuery" />
 		<!--
 			These rules are excluded because they produce error-level false
 			positives. They will be added back in when the changes are committed to
@@ -48,11 +49,15 @@
 		<exclude-pattern>/tests/*</exclude-pattern>
 	</rule>
 	<rule ref="WordPress.VIP.DirectDatabaseQuery">
+		<properties>
+			<property name="customCacheDeleteFunctions" value="wordpoints_flush_points_logs_caches" type="array" />
+		</properties>
 		<exclude-pattern>/tests/*</exclude-pattern>
 	</rule>
 	<rule ref="WordPress.VIP.ValidatedSanitizedInput">
 		<properties>
 			<property name="customSanitizingFunctions" value="wordpoints_int,wordpoints_posint,wordpoints_negint,wordpoints_verify_nonce" type="array" />
+			<property name="customUnslashingSanitizingFunctions" value="wordpoints_int,wordpoints_posint,wordpoints_negint" type="array" />
 		</properties>
 		<exclude-pattern>/tests/*</exclude-pattern>
 	</rule>