From 8fdc8e778f19744f3be5efd6b2846f0d7557f7d7 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 13 Dec 2024 08:59:47 +0100
Subject: [PATCH] merged workflows

---
 .github/workflows/phpcs.yml            | 12 +---
 .phpcs.dist.php.xml                    | 76 --------------------------
 .phpcs.dist.ecg.xml => .phpcs.dist.xml | 64 +++++++++++++++++++++-
 .phpcs.xml                             |  5 --
 4 files changed, 65 insertions(+), 92 deletions(-)
 delete mode 100644 .phpcs.dist.php.xml
 rename .phpcs.dist.ecg.xml => .phpcs.dist.xml (63%)
 delete mode 100644 .phpcs.xml

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
index 580bc27aad5..669c4276c7c 100644
--- a/.github/workflows/phpcs.yml
+++ b/.github/workflows/phpcs.yml
@@ -7,17 +7,9 @@ on:
 
 jobs:
   phpcs:
-    name: ${{ matrix.rules.label }}
+    name: Validation
     runs-on: [ubuntu-latest]
 
-    strategy:
-      matrix:
-        rules:
-          - label: Ecg
-            path: .phpcs.dist.ecg.xml
-          - label: PhpCompatibility
-            path: .phpcs.dist.php.xml
-
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -42,4 +34,4 @@ jobs:
         run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
 
       - name: PHPCodeSniffer
-        run: php vendor/bin/phpcs -s -p --report=full --standard=${{ matrix.rules.path }}
+        run: php vendor/bin/phpcs -s -p --report=full --standard=.phpcs.dist.xml
diff --git a/.phpcs.dist.php.xml b/.phpcs.dist.php.xml
deleted file mode 100644
index 13a31978800..00000000000
--- a/.phpcs.dist.php.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="OpenMage PHPCompatibility" namespace="OpenMage\CS\Standard">
-    <file>api.php</file>
-    <file>cron.php</file>
-    <file>get.php</file>
-    <file>index.php</file>
-    <file>install.php</file>
-    <file>app/Mage.php</file>
-    <file>app/code/core/Mage/</file>
-    <file>errors/</file>
-    <file>lib/Mage/</file>
-    <file>lib/Magento/</file>
-    <file>lib/Varien/</file>
-    <file>shell/</file>
-    <file>tests/unit/</file>
-    <rule ref="PHPCompatibility" />
-    <rule ref="PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore">
-        <exclude-pattern>*/Varien/Object.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Data/Form/Abstract.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Db/Tree.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Directory/Collection.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_blowfishDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_mode_cbcDeprecatedRemoved">
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_mode_ecbDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_randDeprecatedRemoved">
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_create_ivDeprecatedRemoved">
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.Extensions.RemovedExtensions.mcryptDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_enc_get_iv_sizeDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_enc_get_key_sizeDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_genericDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_generic_deinitDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_generic_initDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_module_closeDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_module_openDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mdecrypt_genericDeprecatedRemoved">
-        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
-        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
-    </rule>
-</ruleset>
diff --git a/.phpcs.dist.ecg.xml b/.phpcs.dist.xml
similarity index 63%
rename from .phpcs.dist.ecg.xml
rename to .phpcs.dist.xml
index 36665bd7db4..615f2fd5c55 100644
--- a/.phpcs.dist.ecg.xml
+++ b/.phpcs.dist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset name="OpenMage ECG" namespace="OpenMage\CS\Standard">
+<ruleset name="OpenMage" namespace="OpenMage\CS\Standard">
     <file>api.php</file>
     <file>cron.php</file>
     <file>get.php</file>
@@ -12,6 +12,7 @@
     <file>lib/Magento/</file>
     <file>lib/Varien/</file>
     <file>shell/</file>
+    <file>tests/unit/</file>
 
     <exclude-pattern>*/core/Mage/*/data/*</exclude-pattern>
     <exclude-pattern>*/core/Mage/*/sql/*</exclude-pattern>
@@ -143,4 +144,65 @@
         <!-- should be reviewed -->
         <exclude name="Squiz.PHP.Eval.Discouraged"/>
     </rule>
+
+    <rule ref="PHPCompatibility" />
+    <rule ref="PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore">
+        <exclude-pattern>*/Varien/Object.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Data/Form/Abstract.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Db/Tree.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Directory/Collection.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_blowfishDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_mode_cbcDeprecatedRemoved">
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_mode_ecbDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.Constants.RemovedConstants.mcrypt_randDeprecatedRemoved">
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_create_ivDeprecatedRemoved">
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.Extensions.RemovedExtensions.mcryptDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_enc_get_iv_sizeDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_enc_get_key_sizeDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_genericDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_generic_deinitDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_generic_initDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_module_closeDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mcrypt_module_openDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
+    <rule ref="PHPCompatibility.FunctionUse.RemovedFunctions.mdecrypt_genericDeprecatedRemoved">
+        <exclude-pattern>*/Magento/Crypt.php*</exclude-pattern>
+        <exclude-pattern>*/Varien/Crypt/Mcrypt.php*</exclude-pattern>
+    </rule>
 </ruleset>
diff --git a/.phpcs.xml b/.phpcs.xml
deleted file mode 100644
index c3e7a9cb330..00000000000
--- a/.phpcs.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="OpenMage All" namespace="OpenMage\CS\Standard">
-    <rule ref=".phpcs.dist.php.xml" />
-    <rule ref=".phpcs.dist.ecg.xml" />
-</ruleset>