Merge remote-tracking branch 'origin/8.2.x' into 8.3.x

Author: greg0ire

composer.json

@@ -23,8 +23,8 @@
     "require": {
         "php": "^7.1 || ^8.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
-        "slevomat/coding-standard": "^6.3.9",
-        "squizlabs/php_codesniffer": "^3.5.5"
+        "slevomat/coding-standard": "^6.4.1",
+        "squizlabs/php_codesniffer": "^3.5.8"
     },
     "config": {
         "sort-packages": true

lib/Doctrine/ruleset.xml

@@ -144,8 +144,6 @@
             <property name="linesCountBetweenUses" value="0"/>
         </properties>
     </rule>
-    <!-- Forbid dead code -->
-    <rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements"/>
     <!-- Forbid prefix and suffix "Abstract" for abstract classes -->
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
     <!-- Forbid prefix and suffix "Exception" for exception classes -->

tests/expected_report.txt

@@ -21,7 +21,7 @@ tests/input/forbidden-functions.php                   6       0
 tests/input/inline_type_hint_assertions.php           7       0
 tests/input/LowCaseTypes.php                          2       0
 tests/input/namespaces-spacing.php                    7       0
-tests/input/NamingCamelCase.php                       7       0
+tests/input/NamingCamelCase.php                       6       0
 tests/input/negation-operator.php                     2       0
 tests/input/new_with_parentheses.php                  18      0
 tests/input/not_spacing.php                           8       0
@@ -45,7 +45,7 @@ tests/input/use-ordering.php                          1       0
 tests/input/useless-semicolon.php                     2       0
 tests/input/UselessConditions.php                     20      0
 ----------------------------------------------------------------------
-A TOTAL OF 375 ERRORS AND 0 WARNINGS WERE FOUND IN 41 FILES
+A TOTAL OF 374 ERRORS AND 0 WARNINGS WERE FOUND IN 41 FILES
 ----------------------------------------------------------------------
 PHPCBF CAN FIX 310 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------

tests/php-compatibility.patch

@@ -13,7 +13,7 @@ index fd5432c..233e24d 100644
  tests/input/inline_type_hint_assertions.php           7       0
 @@ -23,9 +23,9 @@ tests/input/LowCaseTypes.php                          2       0
  tests/input/namespaces-spacing.php                    7       0
- tests/input/NamingCamelCase.php                       7       0
+ tests/input/NamingCamelCase.php                       6       0
  tests/input/negation-operator.php                     2       0
 -tests/input/new_with_parentheses.php                  18      0
 +tests/input/new_with_parentheses.php                  19      0
@@ -34,8 +34,8 @@ index fd5432c..233e24d 100644
  tests/input/useless-semicolon.php                     2       0
  tests/input/UselessConditions.php                     20      0
  ----------------------------------------------------------------------
--A TOTAL OF 375 ERRORS AND 0 WARNINGS WERE FOUND IN 41 FILES
-+A TOTAL OF 384 ERRORS AND 0 WARNINGS WERE FOUND IN 41 FILES
+-A TOTAL OF 374 ERRORS AND 0 WARNINGS WERE FOUND IN 41 FILES
++A TOTAL OF 383 ERRORS AND 0 WARNINGS WERE FOUND IN 41 FILES
  ----------------------------------------------------------------------
 -PHPCBF CAN FIX 310 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 +PHPCBF CAN FIX 319 OF THESE SNIFF VIOLATIONS AUTOMATICALLY