From d4d30abe9f3d376e6c63c7048633595276e50dee Mon Sep 17 00:00:00 2001
From: evgenidev <evgeni_mir@mail.ru>
Date: Tue, 23 Jan 2024 17:42:30 +0400
Subject: [PATCH 1/2] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=B0=202.0.0-beta2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RUVENTS/ruleset.xml | 14 ++++----------
 composer.json       | 10 +++++-----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/RUVENTS/ruleset.xml b/RUVENTS/ruleset.xml
index b28177a..5ac2dce 100644
--- a/RUVENTS/ruleset.xml
+++ b/RUVENTS/ruleset.xml
@@ -20,7 +20,7 @@
     <rule ref="RUVENTS.Views.ShortEcho"/>
     <rule ref="RUVENTS.Views.ShortTagWhitespace"/>
     <rule ref="RUVENTS.Functions.UselessParameterDefaultValue">
-    <rule ref="RUVENTS.Views.ShortTagForce"></rule>
+        <rule ref="RUVENTS.Views.ShortTagForce"></rule>
         <exclude name="SlevomatCodingStandard.Functions.UselessParameterDefaultValue.UselessParameterDefaultValue"/>
     </rule>
     <rule ref="RUVENTS.NamingConventions.CamelCaseFunctionName">
@@ -394,7 +394,6 @@
         <properties>
             <property name="spacing" type="int" value="1"/>
             <property name="spacingBeforeFirst" type="int" value="0"/>
-            <property name="ignoreNewlines" type="bool" value="true"/>
         </properties>
     </rule>
     <rule ref="Squiz.WhiteSpace.OperatorSpacing">
@@ -408,15 +407,10 @@
     <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
 
-    <!-- PSR2R -->
-    <rule ref="PSR2R.Classes.ClassCreateInstance"/>
-    <rule ref="PSR2R.Classes.ClassFileName"/>
-    <!--<rule ref="PSR2R.Classes.InterfaceName"/> toDo: Спорная вещь. Обсудить... -->
-    <rule ref="PSR2R.Classes.PropertyDeclaration"/>
-    <rule ref="PSR2R.Classes.SelfAccessor"/>
-    <!--<rule ref="PSR2R.Classes.TraitName"/> toDo: Спорная вещь. Обсудить... -->
-
     <rule ref="SlevomatCodingStandard.Functions">
+        <exclude name="SlevomatCodingStandard.Functions.FunctionLength.FunctionLength"/>
+        <exclude name="SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall.DisallowedTrailingComma"/>
+        <exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall.MissingTrailingComma"/>
         <!-- Рано такое делать. IDEA/PhpStorm не умеют форматировать такие... -->
         <exclude name="SlevomatCodingStandard.Functions.TrailingCommaInCall.MissingTrailingComma"/>
     </rule>
diff --git a/composer.json b/composer.json
index af39125..ff5988a 100644
--- a/composer.json
+++ b/composer.json
@@ -23,13 +23,13 @@
     ]
   },
   "require": {
-    "php": ">=7.1",
+    "php": ">=8.2",
     "ext-json": "*",
-    "squizlabs/php_codesniffer": "3.5.8",
-    "slevomat/coding-standard": "6.4.1",
-    "fig-r/psr2r-sniffer": "0.5.0",
+    "squizlabs/php_codesniffer": "3.8.1",
+    "slevomat/coding-standard": "8.14.1",
+    "fig-r/psr2r-sniffer": "2.0.0",
     "pheromone/phpcs-security-audit": "2.0.1",
-    "escapestudios/symfony2-coding-standard": "3.11.0"
+    "escapestudios/symfony2-coding-standard": "3.13.0"
   },
   "require-dev": {
     "roave/security-advisories": "dev-master",

From c551db781d0ab96b9b53099849d2755a2b323c1a Mon Sep 17 00:00:00 2001
From: evgenidev <evgeni_mir@mail.ru>
Date: Thu, 22 Feb 2024 14:47:30 +0400
Subject: [PATCH 2/2] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=84=D0=B8=D1=87=208.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore          |  3 ++-
 RUVENTS/ruleset.xml | 24 +++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94d6d75..8f4a2b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /vendor/
-/composer.lock
\ No newline at end of file
+/composer.lock
+/.idea
diff --git a/RUVENTS/ruleset.xml b/RUVENTS/ruleset.xml
index 5ac2dce..2d1e326 100644
--- a/RUVENTS/ruleset.xml
+++ b/RUVENTS/ruleset.xml
@@ -340,11 +340,6 @@
     </rule>
     <rule ref="Squiz.Operators.IncrementDecrementUsage"/>
     <rule ref="Squiz.Operators.ValidLogicalOperators"/>
-    <rule ref="Squiz.PHP.CommentedOutCode">
-        <properties>
-            <property name="maxPercentage" type="int" value="85"/>
-        </properties>
-    </rule>
     <!--<rule ref="Squiz.PHP.DisallowBooleanStatement"/>-->
     <!--<rule ref="Squiz.PHP.DisallowComparisonAssignment"/>-->
     <!--<rule ref="Squiz.PHP.DisallowInlineIf"/>-->
@@ -438,4 +433,23 @@
         <exclude-pattern>*/partials/*</exclude-pattern>
     </rule>
 
+    <rule ref="Symfony.Functions.Arguments.Invalid">
+        <exclude-pattern>*</exclude-pattern>
+    </rule>
+    <rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration.DisallowedTrailingComma">
+        <exclude-pattern>*</exclude-pattern>
+    </rule>
+    <rule ref="PEAR.Functions.FunctionDeclaration.NewlineBeforeOpenBrace">
+        <exclude-pattern>*</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.Functions.MultiLineFunctionDeclaration.NewlineBeforeOpenBrace">
+        <exclude-pattern>*</exclude-pattern>
+    </rule>
+    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace.Line">
+        <exclude-pattern>*</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore">
+        <exclude-pattern>*</exclude-pattern>
+    </rule>
+
 </ruleset>