Merge branch '2.13.x' into 3.0.x

doctrine · Apr 9, 2021 · c09dfce · c09dfce
2 parents ab91c62 + 6fd2757
commit c09dfce
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,3 +1,11 @@
+Note about upgrading: Doctrine uses static and runtime mechanisms to raise
+awareness about deprecated code.
+
+- Use of `@deprecated` docblock that is detected by IDEs (like PHPStorm) or
+  Static Analysis tools (like Psalm, phpstan)
+- Use of our low-overhead runtime deprecation API, details:
+  https://github.com/doctrine/deprecations/
+
 # Upgrade to 3.0
 
 ## BC BREAK: leading colon in named parameter names not supported

diff --git a/composer.json b/composer.json
@@ -44,6 +44,7 @@
         "phpstan/phpstan-strict-rules": "^0.12.2",
         "phpunit/phpunit": "9.5.0",
         "psalm/plugin-phpunit": "0.13.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
@@ -97,8 +97,7 @@
         <exclude-pattern>tests/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">
         <!--
             These files use the underlying driver APIs that don't comply with the coding standard
             phpcs wrongly complains about them, and that has been reported here:
@@ -107,12 +106,16 @@
         <exclude-pattern>src/Driver/IBMDB2/Connection.php</exclude-pattern>
         <exclude-pattern>src/Driver/Mysqli/Exception/ConnectionFailed.php</exclude-pattern>
         <!-- See https://github.com/squizlabs/PHP_CodeSniffer/issues/2837 -->
-        <exclude-pattern>src/SQLParserUtils.php</exclude-pattern>
         <exclude-pattern>src/Tools/Dumper.php</exclude-pattern>
         <exclude-pattern>tests/Driver/StatementIteratorTest.php</exclude-pattern>
         <exclude-pattern>tests/Tools/DumperTest.php</exclude-pattern>
     </rule>
 
+    <!-- See https://github.com/squizlabs/PHP_CodeSniffer/issues/2837 -->
+    <rule ref="Squiz.NamingConventions.ValidVariableName.NotCamelCaps">
+        <exclude-pattern>src/SQLParserUtils.php</exclude-pattern>
+    </rule>
+
     <!-- some statement classes close cursor using an empty while-loop -->
     <rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedWhile">
         <exclude-pattern>src/Driver/SQLSrv/Result.php</exclude-pattern>