Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12724] Add Squiz.PHP.Eval in the legacy ruleset

phpBB/includes/functions_convert.php

@@ -1287,7 +1287,9 @@ function restore_config($schema)
 		{
 			$var = (empty($m[2]) || empty($convert_config[$m[2]])) ? "''" : "'" . addslashes($convert_config[$m[2]]) . "'";
 			$exec = '$config_value = ' . $m[1] . '(' . $var . ');';
+			// @codingStandardsIgnoreStart
 			eval($exec);
+			// @codingStandardsIgnoreEnd
 		}
 		else
 		{

phpBB/includes/functions_module.php

@@ -456,7 +456,9 @@ class p_master
 		);
 
 		$is_auth = false;
+		// @codingStandardsIgnoreStart
 		eval('$is_auth = (int) (' .	$module_auth . ');');
+		// @codingStandardsIgnoreEnd
 
 		return $is_auth;
 	}