From 3167b1dc4b1dd4763c4b05754747113ec6af4633 Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@matomo.org>
Date: Mon, 11 Dec 2023 12:16:48 +0100
Subject: [PATCH] Use newer coding standard (#7534)

* use newer coding standard

* fix phpcs
---
 composer.json |  2 +-
 phpcs.xml     | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index e21809d5a0..46d7dda060 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "psr/simple-cache": "^1.0.1",
         "matthiasmullie/scrapbook": "^1.4.7",
         "phpstan/phpstan": "^1.10.44",
-        "mayflower/mo4-coding-standard": "^v8.0.0",
+        "mayflower/mo4-coding-standard": "^v9.0.0",
         "symfony/yaml": "^5.1.7"
     },
     "suggest": {
diff --git a/phpcs.xml b/phpcs.xml
index 5f3fea36f2..1e17a225c7 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,9 +8,17 @@
 
     <!-- use MO4 coding standard as base -->
     <rule ref="MO4">
-       <exclude name="SlevomatCodingStandard.Commenting.UselessInheritDocComment"/>
-       <exclude name="SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter"/>
-       <exclude name="Squiz.PHP.DisallowMultipleAssignments.Found"/>
+        <exclude name="SlevomatCodingStandard.Classes.ForbiddenPublicProperty.ForbiddenPublicProperty"/>
+        <exclude name="SlevomatCodingStandard.Commenting.UselessInheritDocComment"/>
+        <exclude name="SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter"/>
+        <exclude name="Squiz.PHP.DisallowMultipleAssignments.Found"/>
+        <exclude name="SlevomatCodingStandard.ControlStructures.RequireTernaryOperator"/>
+    </rule>
+
+    <rule ref="SlevomatCodingStandard.ControlStructures.RequireTernaryOperator">
+        <properties>
+            <property name="ignoreMultiLine" value="true"/>
+        </properties>
     </rule>
 
     <rule ref="Symfony.Commenting">
@@ -58,9 +66,9 @@
     <!-- Require strict types -->
     <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
         <properties>
-            <property name="newlinesCountBetweenOpenTagAndDeclare" value="0" />
+            <property name="linesCountBeforeDeclare" value="1" />
             <property name="spacesCountAroundEqualsSign" value="0" />
-            <property name="newlinesCountAfterDeclare" value="2" />
+            <property name="linesCountAfterDeclare" value="1" />
         </properties>
     </rule>