From 583f5c93b57182cc626e46d96012429f40795794 Mon Sep 17 00:00:00 2001
From: Vasek Purchart <me@vasekpurchart.cz>
Date: Fri, 17 Apr 2020 19:36:21 +0200
Subject: [PATCH 1/2] use fixable multi property definition sniff from Slevomat
 instead of PSR2

---
 Consistence/ruleset.xml | 5 ++++-
 composer.json           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Consistence/ruleset.xml b/Consistence/ruleset.xml
index eda4ed1..82629c5 100644
--- a/Consistence/ruleset.xml
+++ b/Consistence/ruleset.xml
@@ -59,7 +59,9 @@
 	<rule ref="PSR1.Classes.ClassDeclaration"/>
 	<rule ref="PSR1.Files.SideEffects"/>
 	<rule ref="PSR1.Methods.CamelCapsMethodName"/>
-	<rule ref="PSR2.Classes.PropertyDeclaration"/>
+	<rule ref="PSR2.Classes.PropertyDeclaration">
+		<exclude name="PSR2.Classes.PropertyDeclaration.Multiple"/><!-- handled by fixable SlevomatCodingStandard.Classes.DisallowMultiPropertyDefinition.DisallowedMultiPropertyDefinition -->
+	</rule>
 	<rule ref="PSR2.ControlStructures.ControlStructureSpacing">
 		<exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace"/><!-- we want to put first expression of multiline condition on next line -->
 	</rule>
@@ -78,6 +80,7 @@
 	<rule ref="PSR2.Namespaces.UseDeclaration"/>
 	<rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
 	<rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility"/>
+	<rule ref="SlevomatCodingStandard.Classes.DisallowMultiPropertyDefinition"/>
 	<rule ref="SlevomatCodingStandard.Classes.EmptyLinesAroundClassBraces"/>
 	<rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements"/>
 	<rule ref="SlevomatCodingStandard.Commenting.EmptyComment"/>
diff --git a/composer.json b/composer.json
index 2b13368..0ee0ab4 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
 	"require": {
 		"php": "~7.2",
 		"squizlabs/php_codesniffer": "~3.5.5",
-		"slevomat/coding-standard": "~6.0"
+		"slevomat/coding-standard": "~6.2"
 	},
 	"require-dev": {
 		"jakub-onderka/php-console-highlighter": "0.4",

From a1e3992e93330ddfa16ca47cf3740ca5e40d5305 Mon Sep 17 00:00:00 2001
From: Vasek Purchart <me@vasekpurchart.cz>
Date: Fri, 17 Apr 2020 19:38:53 +0200
Subject: [PATCH 2/2] detect multi constant definition

---
 Consistence/ruleset.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Consistence/ruleset.xml b/Consistence/ruleset.xml
index 82629c5..87ba43b 100644
--- a/Consistence/ruleset.xml
+++ b/Consistence/ruleset.xml
@@ -80,6 +80,7 @@
 	<rule ref="PSR2.Namespaces.UseDeclaration"/>
 	<rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
 	<rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility"/>
+	<rule ref="SlevomatCodingStandard.Classes.DisallowMultiConstantDefinition"/>
 	<rule ref="SlevomatCodingStandard.Classes.DisallowMultiPropertyDefinition"/>
 	<rule ref="SlevomatCodingStandard.Classes.EmptyLinesAroundClassBraces"/>
 	<rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements"/>