diff --git a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
index 75a87654..3b772935 100644
--- a/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
+++ b/Magento2/Sniffs/Functions/DiscouragedFunctionSniff.php
@@ -44,7 +44,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^chroot$' => null,
         '^com_load_typelib$' => null,
         '^copy$' => null,
-        '^curl_.*$' => null,
+        '^curl_.*$' => '\Magento\Framework\HTTP\Adapter\Curl',
         '^cyrus_connect$' => null,
         '^dba_.*$' => null,
         '^dbase_.*$' => null,
@@ -53,7 +53,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^dcngettext$' => null,
         '^dgettext$' => null,
         '^dio_.*$' => null,
-        '^dirname$' => null,
+        '^dirname$' => '\Magento\Framework\Filesystem\Io\File::getPathInfo($filePath)[\'dirname\']',
         '^dngettext$' => null,
         '^domxml_.*$' => null,
         '^fbsql_.*$' => null,
@@ -140,7 +140,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff
         '^time_nanosleep$' => null,
         '^base64_decode$' => null,
         '^base_convert$' => null,
-        '^basename$' => null,
+        '^basename$' => '\Magento\Framework\Filesystem\Io\File::getPathInfo [\'basename\']',
         '^chr$' => null,
         '^convert_cyr_string$' => null,
         '^dba_nextkey$' => null,