Start 8.1+ branch for new major.

Author: dereuromark

PSR2R/Sniffs/ControlStructures/ConditionalExpressionOrderSniff.php

@@ -167,7 +167,8 @@ protected function applyFix(File $phpCsFile,
 		$leftIndexStart,
 		$leftIndexEnd,
 		$rightIndexStart,
-		$rightIndexEnd) {
+		$rightIndexEnd,
+	) {
 		$tokens = $phpCsFile->getTokens();
 
 		$token = $tokens[$index];

PSR2R/ruleset.xml

@@ -42,9 +42,19 @@
 	<rule ref="SlevomatCodingStandard.Arrays.DisallowImplicitArrayCreation"/>
 
 	<rule ref="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration"/>
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration"/>
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse"/>
 	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>
-	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration"/>
-	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInClosureUse"/>
+	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration">
+		<properties>
+			<property name="onlySingleLine" type="boolean" value="true"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInClosureUse">
+		<properties>
+			<property name="onlySingleLine" type="boolean" value="true"/>
+		</properties>
+	</rule>
 	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall">
 		<properties>
 			<property name="onlySingleLine" type="boolean" value="true"/>

README.md

@@ -1,7 +1,7 @@
 # PSR-2-R Sniffer
 [![CI](https://github.com/php-fig-rectified/psr2r-sniffer/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/php-fig-rectified/psr2r-sniffer/actions/workflows/ci.yml)
 [![Latest Stable Version](https://poser.pugx.org/fig-r/psr2r-sniffer/v/stable.svg)](https://packagist.org/packages/fig-r/psr2r-sniffer)
-[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%207.3-8892BF.svg)](https://php.net/)
+[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%208.1-8892BF.svg)](https://php.net/)
 [![License](https://poser.pugx.org/fig-r/psr2r-sniffer/license.svg)](https://packagist.org/packages/fig-r/psr2r-sniffer)
 [![Total Downloads](https://poser.pugx.org/fig-r/psr2r-sniffer/d/total.svg)](https://packagist.org/packages/fig-r/psr2r-sniffer)
 [![Coding Standards](https://img.shields.io/badge/cs-PSR--2--R-yellow.svg)](https://github.com/php-fig-rectified/fig-rectified-standards)
@@ -10,11 +10,13 @@ For details on PSR-2-R see [fig-rectified-standards](https://github.com/php-fig-
 
 Documentation @ [/docs/](docs).
 
+This branch is for use with **PHP 8.1+** repos.
+
 ## Included sniffs
 The following sniffers are bundles together as `PSR2R` already, but you can
 also use them standalone/separately in any way you like.
 
-**Currently PSR2R ships with over 180 sniffs.**
+**Currently PSR2R ships with over 190 sniffs.**
 
 * [List of included sniffs](docs/sniffs.md)
 

docs/sniffs.md

@@ -1,6 +1,6 @@
 # PSR2R Code Sniffer
 
-The PSR2R standard contains 188 sniffs
+The PSR2R standard contains 191 sniffs
 
 Generic (22 sniffs)
 -------------------
@@ -105,7 +105,7 @@ PSR2R (44 sniffs)
 - PSR2R.WhiteSpace.TabIndent
 - PSR2R.WhiteSpace.UnaryOperatorSpacing
 
-SlevomatCodingStandard (42 sniffs)
+SlevomatCodingStandard (45 sniffs)
 ----------------------------------
 - SlevomatCodingStandard.Arrays.DisallowImplicitArrayCreation
 - SlevomatCodingStandard.Arrays.MultiLineArrayEndBracketPlacement
@@ -130,6 +130,9 @@ SlevomatCodingStandard (42 sniffs)
 - SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall
 - SlevomatCodingStandard.Functions.DisallowTrailingCommaInClosureUse
 - SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration
+- SlevomatCodingStandard.Functions.RequireTrailingCommaInCall
+- SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse
+- SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration
 - SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses
 - SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly
 - SlevomatCodingStandard.Namespaces.RequireOneNamespaceInFile