From d5d9b14545f8634e1e4247f3bf6c6e92469f13b1 Mon Sep 17 00:00:00 2001
From: Vasek Purchart <me@vasekpurchart.cz>
Date: Wed, 23 May 2018 18:22:23 +0200
Subject: [PATCH 1/3] check more namespace declaration rules

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

diff --git a/Consistence/ruleset.xml b/Consistence/ruleset.xml
index e54a823..52ad0b9 100644
--- a/Consistence/ruleset.xml
+++ b/Consistence/ruleset.xml
@@ -68,7 +68,6 @@
 	</rule>
 	<rule ref="PSR2.Methods.FunctionClosingBrace"/>
 	<rule ref="PSR2.Methods.MethodDeclaration"/>
-	<rule ref="PSR2.Namespaces.NamespaceDeclaration"/>
 	<rule ref="PSR2.Namespaces.UseDeclaration"/>
 	<rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
 	<rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility"/>
@@ -100,6 +99,8 @@
 	<rule ref="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
 	<rule ref="SlevomatCodingStandard.Namespaces.FullyQualifiedExceptions"/>
 	<rule ref="SlevomatCodingStandard.Namespaces.MultipleUsesPerLine"/>
+	<rule ref="SlevomatCodingStandard.Namespaces.NamespaceDeclaration"/>
+	<rule ref="SlevomatCodingStandard.Namespaces.NamespaceSpacing"/>
 	<rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">
 		<properties>
 			<property name="allowFullyQualifiedExceptions" value="true"/>
@@ -111,6 +112,7 @@
 			"/>
 		</properties>
 	</rule>
+	<rule ref="SlevomatCodingStandard.Namespaces.RequireOneNamespaceInFile"/>
 	<rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
 		<properties>
 			<property name="searchAnnotations" value="true"/>
diff --git a/composer.json b/composer.json
index af614a4..ccd48b4 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
 	"require": {
 		"php": "~7.1",
 		"squizlabs/php_codesniffer": "~3.2.3",
-		"slevomat/coding-standard": "~4.5"
+		"slevomat/coding-standard": "~4.6"
 	},
 	"require-dev": {
 		"jakub-onderka/php-console-highlighter": "0.3.2",

From 5723c6cc7cfc0d7daf908bf7c7ddcae8f3c6ab3d Mon Sep 17 00:00:00 2001
From: Vasek Purchart <me@vasekpurchart.cz>
Date: Wed, 23 May 2018 18:33:38 +0200
Subject: [PATCH 2/3] check not using empty()

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

diff --git a/Consistence/ruleset.xml b/Consistence/ruleset.xml
index 52ad0b9..e98e6ef 100644
--- a/Consistence/ruleset.xml
+++ b/Consistence/ruleset.xml
@@ -75,6 +75,7 @@
 	<rule ref="SlevomatCodingStandard.Commenting.EmptyComment"/>
 	<rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration"/>
 	<rule ref="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment"/>
+	<rule ref="SlevomatCodingStandard.ControlStructures.DisallowEmpty"/>
 	<rule ref="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison"/>
 	<rule ref="SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses"/>
 	<rule ref="SlevomatCodingStandard.ControlStructures.NewWithParentheses"/>

From 5019181fcc851f6b604da47c552a9c89c860acab Mon Sep 17 00:00:00 2001
From: Vasek Purchart <me@vasekpurchart.cz>
Date: Wed, 23 May 2018 18:36:09 +0200
Subject: [PATCH 3/3] check using short PHP lists

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

diff --git a/Consistence/ruleset.xml b/Consistence/ruleset.xml
index e98e6ef..098cf66 100644
--- a/Consistence/ruleset.xml
+++ b/Consistence/ruleset.xml
@@ -81,6 +81,7 @@
 	<rule ref="SlevomatCodingStandard.ControlStructures.NewWithParentheses"/>
 	<rule ref="SlevomatCodingStandard.Exceptions.DeadCatch"/>
 	<rule ref="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly"/>
+	<rule ref="SlevomatCodingStandard.PHP.ShortList"/>
 	<rule ref="SlevomatCodingStandard.PHP.TypeCast"/>
 	<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
 		<properties>