diff --git a/WordPress-Extra/ruleset.xml b/WordPress-Extra/ruleset.xml
index a932f7742f..02507cbd43 100644
--- a/WordPress-Extra/ruleset.xml
+++ b/WordPress-Extra/ruleset.xml
@@ -29,7 +29,12 @@
 
 	<rule ref="WordPress.XSS.EscapeOutput"/>
 	<rule ref="WordPress.CSRF.NonceVerification" />
+	<rule ref="WordPress.PHP.DevelopmentFunctions"/>
 	<rule ref="WordPress.PHP.DiscouragedFunctions"/>
+	<rule ref="WordPress.PHP.RestrictedFunctions"/>
+	<rule ref="WordPress.WP.DeprecatedFunctions"/>
+	<rule ref="WordPress.WP.AlternativeFunctions"/>
+	<rule ref="WordPress.WP.DiscouragedFunctions"/>
 	<rule ref="WordPress.WP.EnqueuedResources"/>
 	<rule ref="WordPress.Variables.GlobalVariables"/>
 	<rule ref="WordPress.PHP.StrictComparisons" />
diff --git a/WordPress-VIP/ruleset.xml b/WordPress-VIP/ruleset.xml
index 550ac8cb73..799a248a16 100644
--- a/WordPress-VIP/ruleset.xml
+++ b/WordPress-VIP/ruleset.xml
@@ -14,6 +14,27 @@
 	<!-- https://vip.wordpress.com/documentation/code-review-what-we-look-for/#commented-out-code-debug-code-or-output -->
 	<rule ref="Squiz.PHP.CommentedOutCode" />
 
+	<!-- https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#eval-and-create_function -->
+	<!--https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#settings-alteration -->
+	<rule ref="WordPress.PHP.RestrictedFunctions" />
+
+	<!-- https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#eval-and-create_function -->
+	<!-- https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#serializing-data -->
+	<!-- https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#encoding-values-used-when-creating-a-url-or-passed-to-add_query_arg -->
+	<rule ref="WordPress.PHP.DiscouragedFunctions" />
+
+	<!-- https://vip.wordpress.com/documentation/code-review-what-we-look-for/#commented-out-code-debug-code-or-output -->
+	<rule ref="WordPress.PHP.DevelopmentFunctions" />
+
 	<!-- https://vip.wordpress.com/documentation/code-review-what-we-look-for/#using-in_array-without-strict-parameter -->
 	<rule ref="WordPress.PHP.StrictInArray" />
+
+	<!-- https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#use-wp_parse_url-instead-of-parse_url -->
+	<!-- https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#use-wp_json_encode-over-json_encode -->
+	<rule ref="WordPress.WP.AlternativeFunctions">
+		<properties>
+			<!-- VIP recommends other functions -->
+			<property name="exclude" value="curl,file_get_contents"/>
+		</properties>
+	</rule>
 </ruleset>
diff --git a/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php b/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
new file mode 100644
index 0000000000..6d206885dc
--- /dev/null
+++ b/WordPress/Sniffs/PHP/DevelopmentFunctionsSniff.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+/**
+ * Restrict the use of various development functions.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.11.0
+ */
+class WordPress_Sniffs_PHP_DevelopmentFunctionsSniff extends WordPress_AbstractFunctionRestrictionsSniff {
+
+	/**
+	 * Groups of functions to restrict.
+	 *
+	 * Example: groups => array(
+	 * 	'lambda' => array(
+	 * 		'type'      => 'error' | 'warning',
+	 * 		'message'   => 'Use anonymous functions instead please!',
+	 * 		'functions' => array( 'eval', 'create_function' ),
+	 * 	)
+	 * )
+	 *
+	 * @return array
+	 */
+	public function getGroups() {
+		return array(
+			'error_log' => array(
+				'type'      => 'error',
+				'message'   => '%s() Debug code is not to be used in Production',
+				'functions' => array(
+					'error_log',
+					'var_dump',
+					'var_export',
+					'print_r',
+					'trigger_error',
+					'set_error_handler',
+					'debug_backtrace',
+					'debug_print_backtrace',
+					'wp_debug_backtrace_summary',
+				),
+			),
+
+			'prevent_path_disclosure' => array(
+				'type'      => 'error',
+				'message'   => '%s() is prohibited as it can lead to full path disclosure.',
+				'functions' => array(
+					'error_reporting',
+					'phpinfo',
+				),
+			),
+
+		);
+	} // end getGroups()
+
+} // end class
diff --git a/WordPress/Sniffs/PHP/DiscouragedFunctionsSniff.php b/WordPress/Sniffs/PHP/DiscouragedFunctionsSniff.php
index 713f41693c..b7fae1dd9a 100644
--- a/WordPress/Sniffs/PHP/DiscouragedFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/DiscouragedFunctionsSniff.php
@@ -7,65 +7,69 @@
  * @license https://opensource.org/licenses/MIT MIT
  */
 
-if ( ! class_exists( 'Generic_Sniffs_PHP_ForbiddenFunctionsSniff', true ) ) {
-	throw new PHP_CodeSniffer_Exception( 'Class Generic_Sniffs_PHP_ForbiddenFunctionsSniff not found' );
-}
-
 /**
- * Discourages the use of various functions and suggests (WordPress) alternatives.
+ * Discourages the use of various functions and suggests alternatives.
  *
  * @package WPCS\WordPressCodingStandards
  *
  * @since   0.1.0
  * @since   0.10.0 The checks for the POSIX functions have been replaced by the stand-alone
  *                 sniff WordPress_Sniffs_PHP_POSIXFunctionsSniff.
+ * @since   0.11.0 The checks for the PHP development functions have been replaced by the
+ *                 stand-alone sniff WordPress_Sniffs_PHP_DevelopmentFunctionsSniff.
+ *                 The check for the `register_globals` has been removed as there is no such
+ *                 function. To check for `register_globals` ini directive use
+ *                 PHPCompatibility_Sniffs_PHP_DeprecatedIniDirectivesSniff.
+ *                 The checks for the WP deprecated functions have been replaced by the
+ *                 stand-alone sniff WordPress_Sniffs_WP_DeprecatedFunctionsSniff.
+ *                 The checks for the PHP functions which have a WP alternative has been replaced
+ *                 by the stand-alone sniff WordPress_Sniffs_WP_AlternativeFunctionsSniff.
+ *                 The checks for the WP discouraged functions have been replaced by the
+ *                 stand-alone sniff WordPress_Sniffs_WP_DiscouragedFunctionsSniff.
  */
-class WordPress_Sniffs_PHP_DiscouragedFunctionsSniff extends Generic_Sniffs_PHP_ForbiddenFunctionsSniff {
+class WordPress_Sniffs_PHP_DiscouragedFunctionsSniff extends WordPress_AbstractFunctionRestrictionsSniff {
 
 	/**
-	 * A list of forbidden functions with their alternatives.
+	 * Groups of functions to discourage.
 	 *
-	 * The value is NULL if no alternative exists. I.e. the
-	 * function should just not be used.
+	 * Example: groups => array(
+	 * 	'lambda' => array(
+	 * 		'type'      => 'error' | 'warning',
+	 * 		'message'   => 'Use anonymous functions instead please!',
+	 * 		'functions' => array( 'eval', 'create_function' ),
+	 * 	)
+	 * )
 	 *
-	 * @var array(string => string|null)
+	 * @return array
 	 */
-	public $forbiddenFunctions = array(
-		// Development.
-		'print_r'                  => null,
-		'debug_print_backtrace'    => null,
-		'var_dump'                 => null,
-		'var_export'               => null,
-
-		// Discouraged.
-		'json_encode'              => 'wp_json_encode',
+	public function getGroups() {
+		return array(
+			'create_function' => array(
+				'type'      => 'warning',
+				'message'   => '%s() is discouraged, please use anonymous functions instead.',
+				'functions' => array(
+					'create_function',
+				),
+			),
 
-		// WordPress deprecated.
-		'find_base_dir'            => 'WP_Filesystem::abspath',
-		'get_base_dir'             => 'WP_Filesystem::abspath',
-		'dropdown_categories'      => 'wp_link_category_checklist',
-		'dropdown_link_categories' => 'wp_link_category_checklist',
-		'get_link'                 => 'get_bookmark',
-		'get_catname'              => 'get_cat_name',
-		'register_globals'         => null,
-		'wp_setcookie'             => 'wp_set_auth_cookie',
-		'wp_get_cookie_login'      => null,
-		'wp_login'                 => 'wp_signon',
-		'get_the_attachment_link'  => 'wp_get_attachment_link',
-		'get_attachment_icon_src'  => 'wp_get_attachment_image_src',
-		'get_attachment_icon'      => 'wp_get_attachment_image',
-		'get_attachment_innerHTML' => 'wp_get_attachment_image',
+			'serialize' => array(
+				'type'      => 'warning',
+				'message'   => '%s() Serialized data has <a href=\'https://www.owasp.org/index.php/PHP_Object_Injection\'>known vulnerability problems</a> with Object Injection. JSON is generally a better approach for serializing data.',
+				'functions' => array(
+					'serialize',
+					'unserialize',
+				),
+			),
 
-		// WordPress discouraged.
-		'query_posts'              => 'WP_Query',
-		'wp_reset_query'           => 'wp_reset_postdata',
-	);
+			'urlencode' => array(
+				'type'      => 'warning',
+				'message'   => '%s() should only be used when dealing with legacy applications rawurlencode should now de used instead. See http://php.net/manual/en/function.rawurlencode.php and http://www.faqs.org/rfcs/rfc3986.html',
+				'functions' => array(
+					'urlencode',
+				),
+			),
 
-	/**
-	 * If true, an error will be thrown; otherwise a warning.
-	 *
-	 * @var bool
-	 */
-	public $error = false;
+		);
+	} // end getGroups()
 
 } // End class.
diff --git a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
index 0fcfbf60da..847f8b03eb 100644
--- a/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
+++ b/WordPress/Sniffs/PHP/POSIXFunctionsSniff.php
@@ -38,7 +38,7 @@ public function getGroups() {
 		return array(
 			'ereg' => array(
 				'type'      => 'error',
-				'message'   => '%s has been deprecated since PHP 5.3 and removed in PHP 7.0, please use preg_match() instead.',
+				'message'   => '%s() has been deprecated since PHP 5.3 and removed in PHP 7.0, please use preg_match() instead.',
 				'functions' => array(
 					'ereg',
 					'eregi',
@@ -48,7 +48,7 @@ public function getGroups() {
 
 			'ereg_replace' => array(
 				'type'      => 'error',
-				'message'   => '%s has been deprecated since PHP 5.3 and removed in PHP 7.0, please use preg_replace() instead.',
+				'message'   => '%s() has been deprecated since PHP 5.3 and removed in PHP 7.0, please use preg_replace() instead.',
 				'functions' => array(
 					'ereg_replace',
 					'eregi_replace',
@@ -57,7 +57,7 @@ public function getGroups() {
 
 			'split' => array(
 				'type'      => 'error',
-				'message'   => '%s  has been deprecated since PHP 5.3 and removed in PHP 7.0, please use explode(), str_split() or preg_split() instead.',
+				'message'   => '%s()  has been deprecated since PHP 5.3 and removed in PHP 7.0, please use explode(), str_split() or preg_split() instead.',
 				'functions' => array(
 					'split',
 					'spliti',
diff --git a/WordPress/Sniffs/PHP/RestrictedFunctionsSniff.php b/WordPress/Sniffs/PHP/RestrictedFunctionsSniff.php
new file mode 100644
index 0000000000..6819b4adea
--- /dev/null
+++ b/WordPress/Sniffs/PHP/RestrictedFunctionsSniff.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+/**
+ * Restricts the use of various functions and suggests alternatives.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.11.0
+ */
+class WordPress_Sniffs_PHP_RestrictedFunctionsSniff extends WordPress_AbstractFunctionRestrictionsSniff {
+
+	/**
+	 * Groups of functions to discourage.
+	 *
+	 * Example: groups => array(
+	 * 	'lambda' => array(
+	 * 		'type'      => 'error' | 'warning',
+	 * 		'message'   => 'Use anonymous functions instead please!',
+	 * 		'functions' => array( 'eval', 'create_function' ),
+	 * 	)
+	 * )
+	 *
+	 * @return array
+	 */
+	public function getGroups() {
+		return array(
+			'eval' => array(
+				'type'      => 'error',
+				'message'   => '%s() is not allowed.',
+				'functions' => array(
+					'eval',
+				),
+			),
+
+			'runtime_configuration' => array(
+				'type'      => 'error',
+				'message'   => '%s() is prohibited, changing configuration at runtime should not be done.',
+				'functions' => array(
+					'dl',
+					'error_reporting',
+					'ini_alter',
+					'ini_restore',
+					'ini_set',
+					'magic_quotes_runtime',
+					'set_magic_quotes_runtime',
+					'apache_setenv',
+					'putenv',
+					'set_include_path',
+					'restore_include_path',
+				),
+			),
+
+			'system_calls' => array(
+				'type'      => 'error',
+				'message'   => 'PHP system calls are often disabled by server admins and should not be used. Found %s().',
+				'functions' => array(
+					'exec',
+					'passthru',
+					'proc_open',
+					'shell_exec',
+					'system',
+					'popen',
+				),
+			),
+
+			'obfuscation' => array(
+				'type'      => 'error',
+				'message'   => '%s() is not allowed.',
+				'functions' => array(
+					'base64_decode',
+					'base64_encode',
+					'convert_uudecode',
+					'convert_uuencode',
+					'str_rot13',
+				),
+			),
+
+		);
+	} // end getGroups()
+
+} // End class.
diff --git a/WordPress/Sniffs/VIP/RestrictedFunctionsSniff.php b/WordPress/Sniffs/VIP/RestrictedFunctionsSniff.php
index 3763047d05..15319fab8c 100644
--- a/WordPress/Sniffs/VIP/RestrictedFunctionsSniff.php
+++ b/WordPress/Sniffs/VIP/RestrictedFunctionsSniff.php
@@ -16,6 +16,15 @@
  * @since   0.10.0 The checks for `extract()` and the POSIX functions have been replaced by
  *                 the stand-alone sniffs WordPress_Sniffs_Functions_DontExtractSniff and
  *                 WordPress_Sniffs_PHP_POSIXFunctionsSniff respectively.
+ * @since   0.11.0 The checks for `create_function()`, `serialize()`/`unserialize()` and
+ *                 `urlencode` have been moved to the stand-alone sniff
+ *                 WordPress_Sniffs_PHP_DiscouragedFunctionsSniff.
+ *                 The checks for PHP developer functions, `error_reporting` and `phpinfo`have been
+ *                 moved to the stand-alone sniff WordPress_Sniffs_PHP_DevelopmentFunctionsSniff.
+ *                 The checks for `parse_url()` hs been moved to the stand-alone sniff
+ *                 WordPress_Sniffs_WP_AlternativeFunctionsSniff.
+ *                 The checks for `eval()` hs been moved to the stand-alone sniff
+ *                 WordPress_Sniffs_PHP_RestrictedFunctionsSniff.
  */
 class WordPress_Sniffs_VIP_RestrictedFunctionsSniff extends WordPress_AbstractFunctionRestrictionsSniff {
 
@@ -37,31 +46,13 @@ public function getGroups() {
 			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#switch_to_blog
 			'switch_to_blog' => array(
 				'type'      => 'error',
-				'message'   => '%s is not something you should ever need to do in a VIP theme context. Instead use an API (XML-RPC, REST) to interact with other sites if needed.',
+				'message'   => '%s() is not something you should ever need to do in a VIP theme context. Instead use an API (XML-RPC, REST) to interact with other sites if needed.',
 				'functions' => array( 'switch_to_blog' ),
 			),
 
-			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#eval-and-create_function
-			'create_function' => array(
-				'type'      => 'warning',
-				'message'   => '%s is discouraged, please use Anonymous functions instead.',
-				'functions' => array(
-					'create_function',
-				),
-			),
-
-			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#eval-and-create_function
-			'eval' => array(
-				'type'      => 'error',
-				'message'   => '%s is prohibited, please use Anonymous functions instead.',
-				'functions' => array(
-					'eval',
-				),
-			),
-
 			'file_get_contents' => array(
 				'type'      => 'warning',
-				'message'   => '%s is highly discouraged, please use wpcom_vip_file_get_contents() instead.',
+				'message'   => '%s() is highly discouraged, please use wpcom_vip_file_get_contents() instead.',
 				'functions' => array(
 					'file_get_contents',
 					'vip_wp_file_get_contents',
@@ -70,7 +61,7 @@ public function getGroups() {
 
 			'get_term_link' => array(
 				'type'      => 'error',
-				'message'   => '%s is prohibited, please use wpcom_vip_get_term_link() instead.',
+				'message'   => '%s() is prohibited, please use wpcom_vip_get_term_link() instead.',
 				'functions' => array(
 					'get_term_link',
 					'get_tag_link',
@@ -80,7 +71,7 @@ public function getGroups() {
 
 			'get_page_by_path' => array(
 				'type'      => 'error',
-				'message'   => '%s is prohibited, please use wpcom_vip_get_page_by_path() instead.',
+				'message'   => '%s() is prohibited, please use wpcom_vip_get_page_by_path() instead.',
 				'functions' => array(
 					'get_page_by_path',
 				),
@@ -96,7 +87,7 @@ public function getGroups() {
 
 			'get_term_by' => array(
 				'type'      => 'error',
-				'message'   => '%s is prohibited, please use wpcom_vip_get_term_by() instead.',
+				'message'   => '%s() is prohibited, please use wpcom_vip_get_term_by() instead.',
 				'functions' => array(
 					'get_term_by',
 					'get_cat_ID',
@@ -113,7 +104,7 @@ public function getGroups() {
 
 			'url_to_postid' => array(
 				'type'      => 'error',
-				'message'   => '%s is prohibited, please use wpcom_vip_url_to_postid() instead.',
+				'message'   => '%s() is prohibited, please use wpcom_vip_url_to_postid() instead.',
 				'functions' => array(
 					'url_to_postid',
 					'url_to_post_id',
@@ -122,7 +113,7 @@ public function getGroups() {
 
 			'attachment_url_to_postid' => array(
 				'type'      => 'error',
-				'message'   => '%s is prohibited, please use wpcom_vip_attachment_url_to_postid() instead.',
+				'message'   => '%s() is prohibited, please use wpcom_vip_attachment_url_to_postid() instead.',
 				'functions' => array(
 					'attachment_url_to_postid',
 				),
@@ -131,7 +122,7 @@ public function getGroups() {
 			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#remote-calls
 			'wp_remote_get' => array(
 				'type'      => 'warning',
-				'message'   => '%s is highly discouraged, please use vip_safe_wp_remote_get() instead.',
+				'message'   => '%s() is highly discouraged, please use vip_safe_wp_remote_get() instead.',
 				'functions' => array(
 					'wp_remote_get',
 				),
@@ -179,7 +170,7 @@ public function getGroups() {
 			// @todo Introduce a sniff specific to get_posts() that checks for suppress_filters=>false being supplied.
 			'get_posts' => array(
 				'type'      => 'warning',
-				'message'   => '%s is discouraged in favor of creating a new WP_Query() so that Advanced Post Cache will cache the query, unless you explicitly supply suppress_filters => false.',
+				'message'   => '%s() is discouraged in favor of creating a new WP_Query() so that Advanced Post Cache will cache the query, unless you explicitly supply suppress_filters => false.',
 				'functions' => array(
 					'get_posts',
 					'wp_get_recent_posts',
@@ -189,7 +180,7 @@ public function getGroups() {
 
 			'wp_get_post_terms' => array(
 				'type'      => 'error',
-				'message'   => '%s is highly discouraged due to not being cached; please use get_the_terms() along with wp_list_pluck() to extract the IDs.',
+				'message'   => '%s() is highly discouraged due to not being cached; please use get_the_terms() along with wp_list_pluck() to extract the IDs.',
 				'functions' => array(
 					'wp_get_post_terms',
 					'wp_get_post_categories',
@@ -200,7 +191,7 @@ public function getGroups() {
 
 			'term_exists' => array(
 				'type'      => 'error',
-				'message'   => '%s is highly discouraged due to not being cached; please use wpcom_vip_term_exists() instead.',
+				'message'   => '%s() is highly discouraged due to not being cached; please use wpcom_vip_term_exists() instead.',
 				'functions' => array(
 					'term_exists',
 				),
@@ -208,7 +199,7 @@ public function getGroups() {
 
 			'count_user_posts' => array(
 				'type'      => 'error',
-				'message'   => '%s is highly discouraged due to not being cached; please use wpcom_vip_count_user_posts() instead.',
+				'message'   => '%s() is highly discouraged due to not being cached; please use wpcom_vip_count_user_posts() instead.',
 				'functions' => array(
 					'count_user_posts',
 				),
@@ -216,7 +207,7 @@ public function getGroups() {
 
 			'wp_old_slug_redirect' => array(
 				'type'      => 'error',
-				'message'   => '%s is highly discouraged due to not being cached; please use wpcom_vip_old_slug_redirect() instead.',
+				'message'   => '%s() is highly discouraged due to not being cached; please use wpcom_vip_old_slug_redirect() instead.',
 				'functions' => array(
 					'wp_old_slug_redirect',
 				),
@@ -224,7 +215,7 @@ public function getGroups() {
 
 			'get_adjacent_post' => array(
 				'type'      => 'error',
-				'message'   => '%s is highly discouraged due to not being cached; please use wpcom_vip_get_adjacent_post() instead.',
+				'message'   => '%s() is highly discouraged due to not being cached; please use wpcom_vip_get_adjacent_post() instead.',
 				'functions' => array(
 					'get_adjacent_post',
 					'get_previous_post',
@@ -234,15 +225,6 @@ public function getGroups() {
 				),
 			),
 
-			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#use-wp_parse_url-instead-of-parse_url
-			'parse_url' => array(
-				'type'      => 'warning',
-				'message'   => '%s is discouraged due to a lack for backwards-compatibility in PHP versions; please use wp_parse_url() instead.',
-				'functions' => array(
-					'parse_url',
-				),
-			),
-
 			'get_intermediate_image_sizes' => array(
 				'type'      => 'error',
 				'message'   => 'Intermediate images do not exist on the VIP platform, and thus get_intermediate_image_sizes() returns an empty array() on the platform. This behavior is intentional to prevent WordPress from generating multiple thumbnails when images are uploaded.',
@@ -251,33 +233,10 @@ public function getGroups() {
 				),
 			),
 
-			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#serializing-data
-			'serialize' => array(
-				'type'      => 'warning',
-				'message'   => '%s Serialized data has <a href=\'https://www.owasp.org/index.php/PHP_Object_Injection\'>known vulnerability problems</a> with Object Injection. JSON is generally a better approach for serializing data.',
-				'functions' => array(
-					'serialize',
-					'unserialize',
-				),
-			),
-
-			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#commented-out-code-debug-code-or-output
-			'error_log' => array(
-				'type'      => 'error',
-				'message'   => '%s Debug code is not allowed on VIP Production',
-				'functions' => array(
-					'error_log',
-					'var_dump',
-					'print_r',
-					'trigger_error',
-					'set_error_handler',
-				),
-			),
-
 			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#use-wp_safe_redirect-instead-of-wp_redirect
 			'wp_redirect' => array(
 				'type'     => 'warning',
-				'message'   => '%s Using wp_safe_redirect(), along with the allowed_redirect_hosts filter, can help avoid any chances of malicious redirects within code. It’s also important to remember to call exit() after a redirect so that no other unwanted code is executed.',
+				'message'   => '%s() Using wp_safe_redirect(), along with the allowed_redirect_hosts filter, can help avoid any chances of malicious redirects within code. It’s also important to remember to call exit() after a redirect so that no other unwanted code is executed.',
 				'functions' => array(
 					'wp_redirect',
 				),
@@ -286,49 +245,12 @@ public function getGroups() {
 			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#mobile-detection
 			'wp_is_mobile' => array(
 				'type'      => 'error',
-				'message'   => '%s When targeting mobile visitors, jetpack_is_mobile() should be used instead of wp_is_mobile. It is more robust and works better with full page caching.',
+				'message'   => '%s() When targeting mobile visitors, jetpack_is_mobile() should be used instead of wp_is_mobile. It is more robust and works better with full page caching.',
 				'functions' => array(
 					'wp_is_mobile',
 				),
 			),
 
-			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#encoding-values-used-when-creating-a-url-or-passed-to-add_query_arg
-			'urlencode' => array(
-				'type'      => 'warning',
-				'message'   => '%s should only be used when dealing with legacy applications, rawurlencode() should now be used instead. See http://php.net/manual/en/function.rawurlencode.php and http://www.faqs.org/rfcs/rfc3986.html',
-				'functions' => array(
-					'urlencode',
-				),
-			),
-
-			// @link https://vip.wordpress.com/documentation/vip/code-review-what-we-look-for/#settings-alteration
-			'runtime_configuration' => array(
-				'type'      => 'error',
-				'message'   => '%s is prohibited, changing configuration at runtime is not allowed on VIP Production.',
-				'functions' => array(
-					'dl',
-					'error_reporting',
-					'ini_alter',
-					'ini_restore',
-					'ini_set',
-					'magic_quotes_runtime',
-					'set_magic_quotes_runtime',
-					'apache_setenv',
-					'putenv',
-					'set_include_path',
-					'restore_include_path',
-				),
-			),
-
-			'prevent_path_disclosure' => array(
-				'type'      => 'error',
-				'message'   => '%s is prohibited as it can lead to full path disclosure.',
-				'functions' => array(
-					'error_reporting',
-					'phpinfo',
-				),
-			),
-
 		);
 	} // End getGroups().
 
diff --git a/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
new file mode 100644
index 0000000000..7a285d2bf9
--- /dev/null
+++ b/WordPress/Sniffs/WP/AlternativeFunctionsSniff.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+/**
+ * Discourages the use of various functions and suggests (WordPress) alternatives.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.11.0
+ */
+class WordPress_Sniffs_WP_AlternativeFunctionsSniff extends WordPress_AbstractFunctionRestrictionsSniff {
+
+	/**
+	 * Groups of functions to restrict.
+	 *
+	 * Example: groups => array(
+	 * 	'lambda' => array(
+	 * 		'type'      => 'error' | 'warning',
+	 * 		'message'   => 'Use anonymous functions instead please!',
+	 * 		'functions' => array( 'eval', 'create_function' ),
+	 * 	)
+	 * )
+	 *
+	 * @return array
+	 */
+	public function getGroups() {
+		return array(
+			'curl' => array(
+				'type'      => 'warning',
+				'message'   => 'Using cURL functions is highly discouraged. Use wp_remote_get() instead.',
+				'functions' => array(
+					'curl_*',
+				),
+			),
+
+			'parse_url' => array(
+				'type'      => 'warning',
+				'message'   => '%s() is discouraged due to a lack for backwards-compatibility in PHP versions; use wp_parse_url() instead.',
+				'functions' => array(
+					'parse_url',
+				),
+			),
+
+			'json_encode' => array(
+				'type'      => 'warning',
+				'message'   => '%s() is discouraged. Use wp_json_encode() instead.',
+				'functions' => array(
+					'json_encode',
+				),
+			),
+
+			'file_get_contents' => array(
+				'type'      => 'warning',
+				'message'   => '%s() is discouraged. Use wp_remote_get() instead.',
+				'functions' => array(
+					'file_get_contents',
+				),
+			),
+
+		);
+	} // end getGroups()
+
+} // end class
diff --git a/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
new file mode 100644
index 0000000000..10d7377e5c
--- /dev/null
+++ b/WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+/**
+ * Restricts the use of various deprecated WordPress functions and suggests alternatives.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.11.0
+ */
+class WordPress_Sniffs_WP_DeprecatedFunctionsSniff extends WordPress_AbstractFunctionRestrictionsSniff {
+
+	/**
+	 * Groups of functions to restrict.
+	 *
+	 * Example: groups => array(
+	 * 	'lambda' => array(
+	 * 		'type'      => 'error' | 'warning',
+	 * 		'message'   => 'Use anonymous functions instead please!',
+	 * 		'functions' => array( 'eval', 'create_function' ),
+	 * 	)
+	 * )
+	 *
+	 * @return array
+	 */
+	public function getGroups() {
+		return array(
+			'get_postdata' => array(
+				'type'      => 'error',
+				'message'   => '%s has been deprecated since WordPress 1.5.1. Use get_post() instead.',
+				'functions' => array(
+					'get_postdata',
+				),
+			),
+
+			'start_wp' => array(
+				'type'      => 'error',
+				'message'   => '%s has been deprecated since WordPress 1.5 Use the Loop instead.',
+				'functions' => array(
+					'get_postdata',
+				),
+			),
+
+		);
+	} // end getGroups()
+
+} // end class
diff --git a/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php b/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
new file mode 100644
index 0000000000..8f93bd5863
--- /dev/null
+++ b/WordPress/Sniffs/WP/DiscouragedFunctionsSniff.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+/**
+ * Discourages the use of various WordPress functions and suggests alternatives.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.11.0
+ */
+class WordPress_Sniffs_WP_DiscouragedFunctionsSniff extends WordPress_AbstractFunctionRestrictionsSniff {
+
+	/**
+	 * Groups of functions to restrict.
+	 *
+	 * Example: groups => array(
+	 * 	'lambda' => array(
+	 * 		'type'      => 'error' | 'warning',
+	 * 		'message'   => 'Use anonymous functions instead please!',
+	 * 		'functions' => array( 'eval', 'create_function' ),
+	 * 	)
+	 * )
+	 *
+	 * @return array
+	 */
+	public function getGroups() {
+		return array(
+			'query_posts' => array(
+				'type'      => 'warning',
+				'message'   => '%s is discouraged. Use WP_Query instead.',
+				'functions' => array(
+					'query_posts',
+				),
+			),
+
+			'wp_reset_query' => array(
+				'type'      => 'warning',
+				'message'   => '%s is discouraged. Use the wp_reset_postdata instead.',
+				'functions' => array(
+					'wp_reset_query',
+				),
+			),
+
+		);
+	} // end getGroups()
+
+} // end class
diff --git a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.inc b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.inc
new file mode 100644
index 0000000000..1c8a1ced75
--- /dev/null
+++ b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.inc
@@ -0,0 +1,16 @@
+<?php
+
+error_log(); // Error.
+var_dump(); // Error.
+var_export(); // Error.
+print_r(); // Error.
+trigger_error(); // Error.
+set_error_handler(); // Error.
+debug_backtrace(); // Error.
+debug_print_backtrace(); // Error.
+wp_debug_backtrace_summary(); // Error.
+
+phpinfo(); // Error.
+
+PHPINFO(); // Error.
+error_reporting(); // Error.
diff --git a/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
new file mode 100644
index 0000000000..e50fe3e978
--- /dev/null
+++ b/WordPress/Tests/PHP/DevelopmentFunctionsUnitTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Unit test class for WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+/**
+ * Unit test class for the PHP_DevelopmentFunctions sniff.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.11.0
+ */
+class WordPress_Tests_PHP_DevelopmentFunctionsUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return array(
+			3 => 1,
+			4 => 1,
+			5 => 1,
+			6 => 1,
+			7 => 1,
+			8 => 1,
+			9 => 1,
+			10 => 1,
+			11 => 1,
+			13 => 1,
+			15 => 1,
+			16 => 1,
+		);
+
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return array();
+
+	}
+
+} // End class.
diff --git a/WordPress/Tests/PHP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/PHP/DiscouragedFunctionsUnitTest.inc
index b86c3f0377..d35ab123f0 100644
--- a/WordPress/Tests/PHP/DiscouragedFunctionsUnitTest.inc
+++ b/WordPress/Tests/PHP/DiscouragedFunctionsUnitTest.inc
@@ -1,54 +1,11 @@
 <?php
 
-// NEVER PUSH DEBUG CALLS.
-// ----------------------
+add_action( 'widgets_init', create_function( '', // Warning.
+	'return register_widget("time_more_on_time_widget");'
+) );
 
-$post_id = get_the_ID();
+serialize(); // Warning.
+unserialize(); // Warning.
 
-var_dump( $post_id ); // Bad, forbidden use.
-print_r( $post_ID ); // Bad, forbidden use.
-
-
-// DEPRECATED WORDPRESS FUNCTIONS.
-// ------------------------------
-
-$base_dir = find_base_dir(); // Bad, use WP_Filesystem::abspath instead.
-
-$base_dir = get_base_dir(); // Bad, use WP_Filesystem::abspath instead.
-
-dropdown_categories(); // Bad, use wp_link_category_checklist instead.
-
-dropdown_link_categories(); // Bad, use wp_link_category_checklist instead.
-
-$bookmark = get_link( $bookmark_id ); // Bad, use get_bookmark instead.
-
-$catname = get_catname( $cat_id ); // Bad, use get_cat_name instead.
-
-wp_setcookie( 'admin' ); // Bad, use wp_set_auth_cookie instead.
-
-$cookie = wp_get_cookie_login(); // Bad.
-
-$login = wp_login( 'admin', 'pass' ); // Bad, use wp_signon instead.
-
-$link = get_the_attachment_link(); // Bad, use wp_get_attachment_link instead.
-
-$icon = get_attachment_icon_src(); // Bad, use wp_get_attachment_image_src instead.
-
-$icon = get_attachment_icon(); // Bad, use wp_get_attachment_image instead.
-
-$inner_html = get_attachment_innerHTML(); // Bad, use wp_get_attachment_image instead.
-
-
-// AVOIDING MESS BY NOT CALLING THESE FUNCTIONS.
-// -------------------------------------------
-
-register_globals(); // Bad.
-
-query_posts( 'post_type=attachment' ); // Bad, use WP_Query instead.
-while ( have_posts() ){
-	the_post();
-	// ...
-}
-wp_reset_query(); // Bad, use wp_reset_postdata instead.
-
-$json = json_encode( $thing ); // Bad, use wp_json_encode instead.
+urlencode(); // Warning.
+rawurlencode(); // Ok.
diff --git a/WordPress/Tests/PHP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/PHP/DiscouragedFunctionsUnitTest.php
index 34fce9db0e..ad4097021d 100644
--- a/WordPress/Tests/PHP/DiscouragedFunctionsUnitTest.php
+++ b/WordPress/Tests/PHP/DiscouragedFunctionsUnitTest.php
@@ -32,25 +32,10 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
+			3 => 1,
+			7 => 1,
 			8 => 1,
-			9 => 1,
-			15 => 1,
-			17 => 1,
-			19 => 1,
-			21 => 1,
-			23 => 1,
-			25 => 1,
-			27 => 1,
-			29 => 1,
-			31 => 1,
-			33 => 1,
-			35 => 1,
-			37 => 1,
-			39 => 1,
-			45 => 1,
-			47 => 1,
-			52 => 1,
-			54 => 1,
+			10 => 1,
 		);
 
 	}
diff --git a/WordPress/Tests/PHP/RestrictedFunctionsUnitTest.inc b/WordPress/Tests/PHP/RestrictedFunctionsUnitTest.inc
new file mode 100644
index 0000000000..808b3bffbc
--- /dev/null
+++ b/WordPress/Tests/PHP/RestrictedFunctionsUnitTest.inc
@@ -0,0 +1,34 @@
+<?php
+
+eval( 'some_code' ); // Error.
+
+dl(); // Error.
+error_reporting(); // Error.
+ini_alter(); // Error.
+ini_restore(); // Error.
+ini_set(); // Error.
+magic_quotes_runtime(); // Error.
+set_magic_quotes_runtime(); // Error.
+apache_setenv(); // Error.
+putenv(); // Error.
+set_include_path(); // Error.
+restore_include_path(); // Error.
+
+// Obfuscation and evil functions.
+base64_decode( 'VGhpcyBpcyBhbiBlbmNvZGVkIHN0cmluZw==');
+base64_encode( 'This is an encoded string' );
+convert_uudecode( "+22!L;W9E(%!(4\"$`\n`" );
+convert_uuencode( "test\ntext text\r\n" );
+str_rot13( 'The quick brown fox jumps over the lazy dog.' );
+eval( "\$str = \"$str\";" );
+
+// Should not change server PHP settings.
+ini_set( 'memory_limit' );
+
+// PHP system calls are often disabled by server admins and should not be in themes.
+exec( 'whoami' );
+passthru( 'cat myfile.zip', $err );
+$process = proc_open( 'php', $descriptorspec, $pipes, $cwd, $env );
+$output = shell_exec( 'ls -lart' );
+$last_line = system( 'ls', $retval );
+$handle = popen( '/bin/ls', 'r' );
diff --git a/WordPress/Tests/PHP/RestrictedFunctionsUnitTest.php b/WordPress/Tests/PHP/RestrictedFunctionsUnitTest.php
new file mode 100644
index 0000000000..19688ea56e
--- /dev/null
+++ b/WordPress/Tests/PHP/RestrictedFunctionsUnitTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Unit test class for WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+/**
+ * Unit test class for the PHP_RestrictedFunctions sniff.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.11.0
+ */
+class WordPress_Tests_PHP_RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return array(
+			3 => 1,
+			5 => 1,
+			6 => 1,
+			7 => 1,
+			8 => 1,
+			9 => 1,
+			10 => 1,
+			11 => 1,
+			12 => 1,
+			13 => 1,
+			14 => 1,
+			15 => 1,
+			18 => 1,
+			19 => 1,
+			20 => 1,
+			21 => 1,
+			22 => 1,
+			23 => 1,
+			26 => 1,
+			29 => 1,
+			30 => 1,
+			31 => 1,
+			32 => 1,
+			33 => 1,
+			34 => 1,
+		);
+
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return array();
+
+	}
+
+} // End class.
diff --git a/WordPress/Tests/VIP/RestrictedFunctionsUnitTest.inc b/WordPress/Tests/VIP/RestrictedFunctionsUnitTest.inc
index 4be591b00d..88235f5085 100644
--- a/WordPress/Tests/VIP/RestrictedFunctionsUnitTest.inc
+++ b/WordPress/Tests/VIP/RestrictedFunctionsUnitTest.inc
@@ -1,24 +1,20 @@
 <?php
 
-switch_to_blog( $blogid ); // Bad.
+switch_to_blog( $blogid ); // Error.
 
-eval( 'some_code' ); // Bad.
+file_get_contents( $url ); // Warning.
 
-create_function( 'foo', 'bar(foo);' ); // Bad.
+vip_wp_file_get_contents( $url ); // Warning.
 
-file_get_contents( $url ); // Bad.
+wp_remote_get( $url ); // Warning.
 
-vip_wp_file_get_contents( $url ); // Bad.
+$ch = curl_init(); // Warning.
 
-wp_remote_get( $url ); // Bad.
-
-$ch = curl_init(); // Bad.
-
-curl_close( $ch ); // Bad.
+curl_close( $ch ); // Warning.
 
 // Empty line - function moved to another sniff.
 
-add_role( 'test' ); // Bad.
+add_role( 'test' ); // Error.
 
 array_pop( $array ); // Ok.
 
@@ -33,21 +29,21 @@ $x->add_role(); // Ok.
 $y = Bar::add_role(); // Ok.
 \SomeNamespace\add_role(); // Ok.
 
-\add_role(); // Bad.
+\add_role(); // Error.
 
-get_term_link( $term ); // Bad.
+get_term_link( $term ); // Error.
 
-get_page_by_path( $path ); // Bad.
+get_page_by_path( $path ); // Error.
 
-get_page_by_title( $page_title ); // Bad.
+get_page_by_title( $page_title ); // Error.
 
-get_term_by( $field, $value, $taxonomy ); // Bad.
+get_term_by( $field, $value, $taxonomy ); // Error.
 
-get_category_by_slug( $slug ); // Bad.
+get_category_by_slug( $slug ); // Error.
 
-url_to_postid( $url ); // Bad.
+url_to_postid( $url ); // Error.
 
-attachment_url_to_postid( $url ); // Bad.
+attachment_url_to_postid( $url ); // Error.
 wpcom_vip_attachment_url_to_postid( $url ); // Ok.
 
 get_tag_link(); // Error.
@@ -69,37 +65,13 @@ wp_old_slug_redirect(); // Error.
 get_adjacent_post(); // Error.
 get_previous_post(); // Error.
 get_next_post(); // Error.
-parse_url( 'http://example.com/' ); // Warning.
-
-dl(); // Error.
-error_reporting(); // Error.
-ini_alter(); // Error.
-ini_restore(); // Error.
-ini_set(); // Error.
-magic_quotes_runtime(); // Error.
-set_magic_quotes_runtime(); // Error.
-apache_setenv(); // Error.
-putenv(); // Error.
-set_include_path(); // Error.
-restore_include_path(); // Error.
-phpinfo(); // Error.
-
-PHPINFO(); // Error.
-CURL_getinfo(); // Error.
 
+CURL_getinfo(); // Warning.
 curlyhair(); // Ok.
 
 get_previous_post_link(); // Error.
 get_next_post_link(); // Error.
 get_intermediate_image_sizes(); // Error.
-serialize(); // Warning.
-unserialize(); // Warning.
-error_log(); // Error.
-var_dump(); // Error.
-print_r(); // Error.
-trigger_error(); // Error.
-set_error_handler(); // Error.
+
 wp_redirect(); // Warning.
 wp_is_mobile(); // Error.
-urlencode(); // Warning.
-rawurlencode(); // Ok.
diff --git a/WordPress/Tests/VIP/RestrictedFunctionsUnitTest.php b/WordPress/Tests/VIP/RestrictedFunctionsUnitTest.php
index 831cb9a122..a454874397 100644
--- a/WordPress/Tests/VIP/RestrictedFunctionsUnitTest.php
+++ b/WordPress/Tests/VIP/RestrictedFunctionsUnitTest.php
@@ -23,54 +23,35 @@ class WordPress_Tests_VIP_RestrictedFunctionsUnitTest extends AbstractSniffUnitT
 	public function getErrorList() {
 		return array(
 			3  => 1,
-			5  => 1,
-			21 => 1,
-			34 => ( PHP_VERSION_ID >= 50300 ) ? 0 : 1,
+			17 => 1,
+			30 => ( PHP_VERSION_ID >= 50300 ) ? 0 : 1,
+			32 => 1,
+			34 => 1,
 			36 => 1,
 			38 => 1,
 			40 => 1,
 			42 => 1,
 			44 => 1,
 			46 => 1,
-			48 => 1,
+			49 => 1,
 			50 => 1,
+			51 => 1,
+			52 => 1,
 			53 => 1,
-			54 => 1,
-			55 => 1,
-			56 => 1,
-			57 => 1,
+			58 => 1,
+			59 => 1,
+			60 => 1,
+			61 => 1,
 			62 => 1,
 			63 => 1,
 			64 => 1,
 			65 => 1,
 			66 => 1,
 			67 => 1,
-			68 => 1,
-			69 => 1,
-			70 => 1,
-			71 => 1,
+			72 => 1,
+			73 => 1,
 			74 => 1,
-			75 => 2,
-			76 => 1,
 			77 => 1,
-			78 => 1,
-			79 => 1,
-			80 => 1,
-			81 => 1,
-			82 => 1,
-			83 => 1,
-			84 => 1,
-			85 => 1,
-			87 => 1,
-			92 => 1,
-			93 => 1,
-			94 => 1,
-			97 => 1,
-			98 => 1,
-			99 => 1,
-			100 => 1,
-			101 => 1,
-			103 => 1,
 		);
 
 	} // End getErrorList().
@@ -82,21 +63,16 @@ public function getErrorList() {
 	 */
 	public function getWarningList() {
 		return array(
+			5  => 1,
 			7  => 1,
-			9  => 1,
+			9 => 1,
 			11 => 1,
 			13 => 1,
-			15 => 1,
-			17 => 1,
-			58 => 1,
-			59 => 1,
-			61 => 1,
-			72 => 1,
-			88 => 1,
-			95 => 1,
-			96 => 1,
-			102 => 1,
-			104 => 1,
+			54 => 1,
+			55 => 1,
+			57 => 1,
+			69 => 1,
+			76 => 1,
 		);
 
 	}
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
new file mode 100644
index 0000000000..5ccb8af9dd
--- /dev/null
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.inc
@@ -0,0 +1,12 @@
+<?php
+
+curl_init(); // Warning.
+curl_close( $ch ); // Warning.
+CURL_getinfo(); // Warning.
+curlyhair(); // Ok.
+
+parse_url( 'http://example.com/' ); // Warning.
+
+$json = json_encode( $thing ); // Warning, use wp_json_encode instead.
+
+file_get_contents(); // Warning.
diff --git a/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
new file mode 100644
index 0000000000..ae14f1c253
--- /dev/null
+++ b/WordPress/Tests/WP/AlternativeFunctionsUnitTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Unit test class for WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+/**
+ * Unit test class for the WP_AlternativeFunctions sniff.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.11.0
+ */
+class WordPress_Tests_WP_AlternativeFunctionsUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return array();
+
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return array(
+			3  => 1,
+			4  => 1,
+			5  => 1,
+			8  => 1,
+			10 => 1,
+			12 => 1,
+		);
+
+	}
+
+} // End class.
diff --git a/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
new file mode 100644
index 0000000000..8a5b16b1bf
--- /dev/null
+++ b/WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
@@ -0,0 +1,30 @@
+<?php
+
+// DEPRECATED WORDPRESS FUNCTIONS.
+// ------------------------------
+
+$base_dir = find_base_dir(); // Bad, use WP_Filesystem::abspath instead.
+
+$base_dir = get_base_dir(); // Bad, use WP_Filesystem::abspath instead.
+
+dropdown_categories(); // Bad, use wp_link_category_checklist instead.
+
+dropdown_link_categories(); // Bad, use wp_link_category_checklist instead.
+
+$bookmark = get_link( $bookmark_id ); // Bad, use get_bookmark instead.
+
+$catname = get_catname( $cat_id ); // Bad, use get_cat_name instead.
+
+wp_setcookie( 'admin' ); // Bad, use wp_set_auth_cookie instead.
+
+$cookie = wp_get_cookie_login(); // Bad.
+
+$login = wp_login( 'admin', 'pass' ); // Bad, use wp_signon instead.
+
+$link = get_the_attachment_link(); // Bad, use wp_get_attachment_link instead.
+
+$icon = get_attachment_icon_src(); // Bad, use wp_get_attachment_image_src instead.
+
+$icon = get_attachment_icon(); // Bad, use wp_get_attachment_image instead.
+
+$inner_html = get_attachment_innerHTML(); // Bad, use wp_get_attachment_image instead.
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
new file mode 100644
index 0000000000..bc2d09b250
--- /dev/null
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.inc
@@ -0,0 +1,5 @@
+<?php
+
+query_posts(); // Warning, use WP_Query instead.
+
+wp_reset_query(); // Warning, use wp_reset_postdata instead.
diff --git a/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
new file mode 100644
index 0000000000..60c7c266f6
--- /dev/null
+++ b/WordPress/Tests/WP/DiscouragedFunctionsUnitTest.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Unit test class for WordPress Coding Standard.
+ *
+ * @package WPCS\WordPressCodingStandards
+ * @link    https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
+ * @license https://opensource.org/licenses/MIT MIT
+ */
+
+/**
+ * Unit test class for the WP_DiscouragedFunctions sniff.
+ *
+ * @package WPCS\WordPressCodingStandards
+ *
+ * @since   0.11.0
+ */
+class WordPress_Tests_WP_DiscouragedFunctionsUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return array();
+
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return array(
+			3 => 1,
+			5 => 1,
+		);
+
+	}
+
+} // End class.