From 181ca68ca0ffa3ffc6cfa8b1c05d5f18945392b7 Mon Sep 17 00:00:00 2001
From: Stephan Wentz <swentz@brainbits.net>
Date: Fri, 23 Feb 2024 10:46:10 +0100
Subject: [PATCH] fix: Raise minimum php versions, enable prior broken phpcs
 rule

---
 composer.json  | 30 +++++++++++++++---------------
 phpcs.xml.dist |  1 -
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/composer.json b/composer.json
index 86e6193..ace37a1 100644
--- a/composer.json
+++ b/composer.json
@@ -15,21 +15,21 @@
         "psr/clock": "^1.0"
     },
     "require-dev": {
-        "brainbits/phpcs-standard": "^7.0",
-        "brainbits/phpstan-rules": "^3.0",
-        "matthiasnoback/symfony-config-test": "^4.3",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3",
-        "mikey179/vfsstream": "^1.6.10",
-        "phpstan/phpstan": "^1.0",
-        "phpunit/phpunit": "^10.1",
+        "brainbits/phpcs-standard": "^7.0.1",
+        "brainbits/phpstan-rules": "^3.1",
+        "matthiasnoback/symfony-config-test": "^5.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.1",
+        "mikey179/vfsstream": "^1.6.11",
+        "phpstan/phpstan": "^1.10",
+        "phpunit/phpunit": "^10.5",
         "predis/predis": "^2.2",
-        "symfony/clock": "^6.3",
-        "symfony/config": "^6.3",
-        "symfony/dependency-injection": "^6.3",
-        "symfony/http-foundation": "^6.3",
-        "symfony/http-kernel": "^6.3",
-        "symfony/routing": "^6.3",
-        "symfony/security-core": "^6.3",
+        "symfony/clock": "^6.4|^7.0",
+        "symfony/config": "^6.4|^7.0",
+        "symfony/dependency-injection": "^6.4|^7.0",
+        "symfony/http-foundation": "^6.4|^7.0",
+        "symfony/http-kernel": "^6.4|^7.0",
+        "symfony/routing": "^6.4|^7.0",
+        "symfony/security-core": "^6.4|^7.0",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-symfony": "^1.3"
     },
@@ -46,7 +46,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.0-dev"
+            "dev-master": "6.0-dev"
         }
     },
     "config": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 3f4fbb3..10e9609 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -20,7 +20,6 @@
     <arg value="s"/>
 
     <rule ref="Brainbits">
-        <exclude name="PSR1.Files.SideEffects.FoundWithSymbols" />
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix" />
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix" />
     </rule>