Updated dependencies and ruleset exclusions.

Yoast/ruleset.xml

@@ -6,6 +6,8 @@
 	<rule ref="WordPress-VIP">
 		<exclude name="Generic.Files.LineEndings.InvalidEOLChar" />
 		<exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" />
+		<!-- Some calls just too quirky and complicated for this. -->
+		<exclude name="PEAR.Functions.FunctionCallSignature.Indent" />
 
 		<!-- WP VIP rules which are very restrictive and not all that applicable as WPSEO is not on VIP -->
 		<exclude name="WordPress.VIP.DirectDatabaseQuery" />
@@ -18,6 +20,7 @@
 		<exclude name="WordPress.VIP.RestrictedFunctions.curl"/>
 		<exclude name="WordPress.VIP.RestrictedFunctions.get_term_link"/>
 		<exclude name="WordPress.VIP.RestrictedFunctions.get_term_by"/>
+		<exclude name="WordPress.VIP.RestrictedFunctions.count_user_posts"/>
 		<exclude name="WordPress.VIP.RestrictedVariables.cache_constraints"/>
 		<exclude name="WordPress.VIP.PostsPerPage.posts_per_page"/>
 
@@ -31,7 +34,10 @@
 		<exclude name="WordPress.VIP.ValidatedSanitizedInput"/>
 	</rule>
 
-	<rule ref="WordPress.NamingConventions.ValidFunctionName" />
+	<rule ref="WordPress.NamingConventions">
+		<!-- complains about core cat_ID -->
+		<exclude name="WordPress.NamingConventions.ValidVariableName"/>
+	</rule>
 
 	<!-- Rules from WP-Extra which are not in WP-VIP -->
 	<rule ref="WordPress.PHP.DiscouragedFunctions"/>
@@ -90,6 +96,8 @@
 	<rule ref="WordPress-Docs">
 		<!-- Catches way too many things, like vars and file headers. -->
 		<exclude name="Generic.Commenting.DocComment.MissingShort" />
+		<!-- PHP 7 -->
+		<exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing" />
 	</rule>
 
 	<!-- exclude the 'empty' index files from some documentation checks -->

composer.json

@@ -18,8 +18,8 @@
 		"issues": "https://github.com/Yoast/yoastcs/issues"
 	},
 	"require": {
-		"squizlabs/php_codesniffer": "^2.2.0",
-		"wp-coding-standards/wpcs": "0.6",
+		"squizlabs/php_codesniffer": "2.5.1",
+		"wp-coding-standards/wpcs": "0.9",
 		"phpmd/phpmd": "^2.2.3"
 	},
 	"conflict": {