diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index a5a583ac..e1db0341 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -58,17 +58,21 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^dngettext$' => null,
         '^domxml_.*$' => null,
         '^fbsql_.*$' => null,
+        '^fbsql$' => null,
         '^fdf_add_doc_javascript$' => null,
         '^fdf_open$' => null,
         '^fopen$' => 'Magento\Framework\Filesystem\DriverInterface::fileOpen()',
         '^fclose$' => 'Magento\Framework\Filesystem\DriverInterface::fileClose()',
-        '^fsockopen$' => null,
+        '^fsockopen$' => 'Magento\Framework\Filesystem\Driver\Http::open()',
         '^ftp_.*$' => null,
         '^fwrite$' => 'Magento\Framework\Filesystem\DriverInterface::fileWrite()',
-        '^gettext$' => null,
+        '^fputs$' => 'Magento\Framework\Filesystem\DriverInterface::fileWrite()',
+        '^gettext$' => 'Magento\Framework\Translate\AdapterInterface::translate()',
+        '^_$' => 'Magento\Framework\Translate\AdapterInterface::translate()',
         '^gz.*$' => null,
         '^header$' => null,
         '^highlight_file$' => null,
+        '^show_source$' => null,
         '^ibase_.*$' => null,
         '^id3_set_tag$' => null,
         '^ifx_.*$' => null,
@@ -88,6 +92,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^msql_.*$' => null,
         '^mssql_.*$' => null,
         '^mysql_.*$' => null,
+        '^mysql.*$' => null,
         '^odbc_.*$' => null,
         '^opendir$' => null,
         '^openlog$' => null,
@@ -119,9 +124,10 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^session_.*$' => null,
         '^set_include_path$' => null,
         '^ini_set$' => null,
+        '^ini_alter$' => null,
         '^set_time_limit$' => null,
         '^setcookie$' => null,
-        '^setlocale$' => null,
+        '^setlocale$' => 'Magento\Framework\Translate\AdapterInterface::setlocale()',
         '^setrawcookie$' => null,
         '^sleep$' => null,
         '^socket_.*$' => null,
@@ -135,7 +141,9 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^vprintf$' => null,
         '^mysqli.*$' => null,
         '^oci_connect$' => null,
+        '^ocilogon$' => null,
         '^oci_pconnect$' => null,
+        '^ociplogon$' => null,
         '^quotemeta$' => null,
         '^sqlite_popen$' => null,
         '^time_nanosleep$' => null,
@@ -168,6 +176,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^ircg_nickname_unescape$' => null,
         '^ldap_get_values$' => null,
         '^mb_decode_mimeheader$' => null,
+        '^i18n_mime_header_decode$' => null,
         '^mb_parse_str$' => null,
         '^mcrypt_decrypt$' => null,
         '^mdecrypt_generic$' => null,
@@ -201,7 +210,6 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^stat$' => null,
         '^lchgrp$' => null,
         '^lchown$' => null,
-        '^show_source$' => null,
         '^is_dir$' => 'Magento\Framework\Filesystem\DriverInterface::isDirectory()',
         '^is_executable$' => null,
         '^is_file$' => 'Magento\Framework\Filesystem\DriverInterface::isFile()',