From 9960c8e9583ee44bf025c6aa2c2c7a914c9860dc Mon Sep 17 00:00:00 2001
From: Lucas Mirloup <97196064+lucasmirloup@users.noreply.github.com>
Date: Thu, 20 Jul 2023 12:13:26 +0200
Subject: [PATCH] fix(php-cs-fixer): separate from code-quality-pack, add new
 rule sets, change cache path

- require v3.11 for  `phpdoc_separation` => `groups` as it was introduced in this version (https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/commit/a7ed665307b6306ff659dc296ef3c28ff5eada8d)
- added these rule sets : `@PhpCsFixer`, `@PhpCsFixer:risky`, `@Symfony:risky`
- removed redundant rules configuration
- moved cache file to `var/cache/.php-cs-fixer.cache`
---
 faros-ng/code-quality-pack/2.2/manifest.json  |  4 +---
 .../php-cs-fixer/2.0}/.php-cs-fixer.dist.php  |  4 +---
 friendsofphp/php-cs-fixer/2.0/.php_cs.dist    | 18 ---------------
 friendsofphp/php-cs-fixer/2.0/manifest.json   | 15 ++++++------
 .../php-cs-fixer/3.11/.php-cs-fixer.dist.php  | 23 +++++++++++++++++++
 friendsofphp/php-cs-fixer/3.11/manifest.json  |  9 ++++++++
 6 files changed, 42 insertions(+), 31 deletions(-)
 rename {faros-ng/code-quality-pack/2.2 => friendsofphp/php-cs-fixer/2.0}/.php-cs-fixer.dist.php (87%)
 delete mode 100644 friendsofphp/php-cs-fixer/2.0/.php_cs.dist
 create mode 100644 friendsofphp/php-cs-fixer/3.11/.php-cs-fixer.dist.php
 create mode 100644 friendsofphp/php-cs-fixer/3.11/manifest.json

diff --git a/faros-ng/code-quality-pack/2.2/manifest.json b/faros-ng/code-quality-pack/2.2/manifest.json
index f8e1a13..30cee00 100644
--- a/faros-ng/code-quality-pack/2.2/manifest.json
+++ b/faros-ng/code-quality-pack/2.2/manifest.json
@@ -1,12 +1,10 @@
 {
   "copy-from-recipe": {
     ".editorconfig": ".editorconfig",
-    ".php-cs-fixer.dist.php": ".php-cs-fixer.dist.php",
     "phpstan.neon.dist": "phpstan.neon.dist",
     "tests/object-manager.php": "tests/object-manager.php"
   },
   "gitignore": [
-    "phpstan.neon",
-    ".php-cs-fixer.cache"
+    "phpstan.neon"
   ]
 }
diff --git a/faros-ng/code-quality-pack/2.2/.php-cs-fixer.dist.php b/friendsofphp/php-cs-fixer/2.0/.php-cs-fixer.dist.php
similarity index 87%
rename from faros-ng/code-quality-pack/2.2/.php-cs-fixer.dist.php
rename to friendsofphp/php-cs-fixer/2.0/.php-cs-fixer.dist.php
index aa1c7bc..ba57938 100644
--- a/faros-ng/code-quality-pack/2.2/.php-cs-fixer.dist.php
+++ b/friendsofphp/php-cs-fixer/2.0/.php-cs-fixer.dist.php
@@ -20,9 +20,7 @@
         'multiline_whitespace_before_semicolons' => [
             'strategy' => 'new_line_for_chained_calls',
         ],
-        'phpdoc_separation' => [
-            'groups' => [['ORM\\*'], ['Assert\\*']],
-        ]
+        'phpdoc_separation' => true,
     ])
     ->setFinder($finder)
     ->setCacheFile('.php-cs-fixer.cache') // forward compatibility with 3.x line
diff --git a/friendsofphp/php-cs-fixer/2.0/.php_cs.dist b/friendsofphp/php-cs-fixer/2.0/.php_cs.dist
deleted file mode 100644
index 395aa7c..0000000
--- a/friendsofphp/php-cs-fixer/2.0/.php_cs.dist
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__.'/src')
-;
-
-return PhpCsFixer\Config::create()
-    ->setRules(array(
-        '@PSR2' => true,
-        '@Symfony' => true,
-        'phpdoc_align' => false,
-        'phpdoc_scalar' => false,
-        'phpdoc_summary' => false,
-        'no_unused_imports' => true,
-        'array_syntax' => array('syntax' => 'short'),
-    ))
-    ->setFinder($finder)
-;
diff --git a/friendsofphp/php-cs-fixer/2.0/manifest.json b/friendsofphp/php-cs-fixer/2.0/manifest.json
index 491a148..84e50c4 100644
--- a/friendsofphp/php-cs-fixer/2.0/manifest.json
+++ b/friendsofphp/php-cs-fixer/2.0/manifest.json
@@ -1,8 +1,9 @@
 {
-    "copy-from-recipe": {
-        ".php_cs.dist": ".php_cs.dist"
-    },
-    "gitignore": [
-        ".php_cs"
-    ]
-}
\ No newline at end of file
+  "aliases": ["cs-fixer", "php-cs-fixer"],
+  "copy-from-recipe": {
+    ".php-cs-fixer.dist.php": ".php-cs-fixer.dist.php"
+  },
+  "gitignore": [
+    "/.php-cs-fixer.php"
+  ]
+}
diff --git a/friendsofphp/php-cs-fixer/3.11/.php-cs-fixer.dist.php b/friendsofphp/php-cs-fixer/3.11/.php-cs-fixer.dist.php
new file mode 100644
index 0000000..059136e
--- /dev/null
+++ b/friendsofphp/php-cs-fixer/3.11/.php-cs-fixer.dist.php
@@ -0,0 +1,23 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__.'/migrations')
+    ->in(__DIR__.'/src')
+    ->in(__DIR__.'/tests')
+;
+
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PhpCsFixer' => true,
+        '@PhpCsFixer:risky' => true,
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        '@DoctrineAnnotation' => true,
+        'phpdoc_separation' => [
+            'groups' => [['ORM\\*'], ['Assert\\*']],
+        ],
+    ])
+    ->setFinder($finder)
+    ->setCacheFile('var/cache/.php-cs-fixer.cache')
+;
diff --git a/friendsofphp/php-cs-fixer/3.11/manifest.json b/friendsofphp/php-cs-fixer/3.11/manifest.json
new file mode 100644
index 0000000..211db08
--- /dev/null
+++ b/friendsofphp/php-cs-fixer/3.11/manifest.json
@@ -0,0 +1,9 @@
+{
+    "aliases": ["cs-fixer", "php-cs-fixer"],
+    "copy-from-recipe": {
+        ".php-cs-fixer.dist.php": ".php-cs-fixer.dist.php"
+    },
+    "gitignore": [
+        "/.php-cs-fixer.php"
+    ]
+}