From b158b1ff665427135708e1f21328142bffd55dc0 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Thu, 8 Apr 2021 19:35:40 -0700
Subject: [PATCH] Add direct dependency on PHP_CodeSniffer

---
 composer.json  |  1 +
 phpcs.xml.dist | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 662dbd85392..fff4319797f 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,7 @@
         "jetbrains/phpstorm-stubs": "2020.2",
         "phpstan/phpstan": "0.12.81",
         "phpunit/phpunit": "^7.5.20|^8.5|9.5.0",
+        "squizlabs/php_codesniffer": "3.6.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
         "vimeo/psalm": "4.6.4"
     },
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 1d453f936b3..33fda9b921a 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -97,8 +97,7 @@
         <exclude-pattern>tests/Doctrine/Tests/DBAL/Functional/DataAccessTest.php</exclude-pattern>
     </rule>
 
-    <!-- https://github.com/squizlabs/PHP_CodeSniffer/issues/2837 -->
-    <rule ref="Squiz.NamingConventions.ValidVariableName.NotCamelCaps">
+    <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
         <!--
             This file uses the return value db2_server_info(), which does not follow conventions
             phpcs wrongly complains about it, and that has been reported here:
@@ -106,13 +105,16 @@
         -->
         <exclude-pattern>lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php</exclude-pattern>
         <exclude-pattern>lib/Doctrine/DBAL/Driver/Mysqli/Exception/ConnectionFailed.php</exclude-pattern>
-        <!-- See https://github.com/squizlabs/PHP_CodeSniffer/issues/2837 -->
-        <exclude-pattern>lib/Doctrine/DBAL/SQLParserUtils.php</exclude-pattern>
         <exclude-pattern>lib/Doctrine/DBAL/Tools/Dumper.php</exclude-pattern>
-        <exclude-pattern>tests/Doctrine/Tests/DBAL/Driver/StatementIteratorTest.php</exclude-pattern>
         <exclude-pattern>tests/Doctrine/Tests/DBAL/Tools/DumperTest.php</exclude-pattern>
     </rule>
 
+    <!-- See https://github.com/squizlabs/PHP_CodeSniffer/issues/2837 -->
+    <rule ref="Squiz.NamingConventions.ValidVariableName.NotCamelCaps">
+        <exclude-pattern>lib/Doctrine/DBAL/SQLParserUtils.php</exclude-pattern>
+        <exclude-pattern>tests/Doctrine/Tests/DBAL/Driver/StatementIteratorTest.php</exclude-pattern>
+    </rule>
+
     <!-- some statement classes close cursor using an empty while-loop -->
     <rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedWhile">
         <exclude-pattern>lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>