From 2a3c93ff63030882c1d99a927252dd3449ba8a65 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@silverstripe.com>
Date: Mon, 13 Feb 2023 17:12:28 +1300
Subject: [PATCH] MNT Update PHPCS config so CI runs nicely.

Also removed a bunch of unnecessary exclusions.
---
 code/Model/DynamoDbSession.php |  4 ++--
 phpcs.xml.dist                 | 14 +++-----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/code/Model/DynamoDbSession.php b/code/Model/DynamoDbSession.php
index 775f497..09797bc 100644
--- a/code/Model/DynamoDbSession.php
+++ b/code/Model/DynamoDbSession.php
@@ -78,8 +78,8 @@ public function __construct(array $options, string $table)
     /**
      * Check the AWS constant or refer to the Session class to find the session timeout value (if it exists) in terms
      * of DynamoDB, session_lifetime is the time to mark the inactive session to be garbage collected.
-     * If {@link GarbageCollectSessionCronTask} is running periodically on your server (e.g. via the silverstripe-crontask
-     * module), then the inactive session will get removed from the DynamoDB session table.
+     * If {@link GarbageCollectSessionCronTask} is running periodically on your server (e.g. via the
+     * silverstripe-crontask module), then the inactive session will get removed from the DynamoDB session table.
      */
     protected function getSessionLifetime(): int
     {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 0ec5fe1..ed201ee 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -2,20 +2,12 @@
 <ruleset name="SilverStripe">
 	<description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
 
+	<file>code</file>
+	<file>tests</file>
+
 	<!-- base rules are PSR-2 -->
 	<rule ref="PSR2" >
 		<!-- Current exclusions -->
 		<exclude name="PSR1.Methods.CamelCapsMethodName" />
-		<exclude name="PSR1.Files.SideEffects.FoundWithSymbols" />
-		<exclude name="PSR2.Classes.PropertyDeclaration" />
-		<exclude name="PSR2.ControlStructures.SwitchDeclaration" /> <!-- causes php notice while linting -->
-		<exclude name="PSR2.ControlStructures.SwitchDeclaration.WrongOpenercase" />
-		<exclude name="PSR2.ControlStructures.SwitchDeclaration.WrongOpenerdefault" />
-		<exclude name="PSR2.ControlStructures.SwitchDeclaration.TerminatingComment" />
-		<exclude name="PSR2.Methods.MethodDeclaration.Underscore" />
-		<exclude name="Squiz.Scope.MethodScope" />
-		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
-		<exclude name="Generic.Files.LineLength.TooLong" />
-		<exclude name="PEAR.Functions.ValidDefaultValue.NotAtEnd" />
 	</rule>
 </ruleset>