Merge branch 'develop' into ticket-162

Author: lenaorobei

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()',

Magento2/ruleset.xml

@@ -13,7 +13,7 @@
     <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag">
         <severity>10</severity>
         <type>error</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Generic.PHP.DeprecatedFunctions">
         <severity>10</severity>
@@ -76,7 +76,7 @@
         <type>error</type>
     </rule>
     <rule ref="Magento2.Security.LanguageConstruct.DirectOutput">
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Magento2.Security.Superglobal.SuperglobalUsageError">
         <severity>10</severity>
@@ -99,7 +99,7 @@
     <rule ref="PSR2.Files.ClosingTag">
         <severity>10</severity>
         <type>error</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Squiz.PHP.Eval">
         <severity>10</severity>
@@ -122,7 +122,7 @@
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.Security.XssTemplate">
-        <include-pattern>*.phtml</include-pattern>
+        <include-pattern>*\.phtml$</include-pattern>
         <severity>9</severity>
         <type>warning</type>
     </rule>
@@ -207,7 +207,7 @@
         <type>warning</type>
     </rule>
     <rule ref="Magento2.Templates.ThisInTemplate">
-        <include-pattern>*.phtml</include-pattern>
+        <include-pattern>*\.phtml$</include-pattern>
         <severity>8</severity>
         <type>warning</type>
     </rule>
@@ -302,7 +302,7 @@
     <rule ref="Squiz.Operators.IncrementDecrementUsage">
         <severity>7</severity>
         <type>warning</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Squiz.Operators.ValidLogicalOperators">
         <severity>7</severity>
@@ -404,7 +404,7 @@
     <rule ref="PEAR.ControlStructures.ControlSignature">
         <severity>6</severity>
         <type>warning</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="PSR1.Files.SideEffects">
         <severity>6</severity>
@@ -483,7 +483,7 @@
         </properties>
     </rule>
     <rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration">
         <severity>6</severity>
@@ -533,7 +533,7 @@
     <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
         <severity>6</severity>
         <type>warning</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
+        <exclude-pattern>*\.phtml$</exclude-pattern>
     </rule>
     <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing">
         <severity>6</severity>