From 59c420a1b819e39ef61e11f2c23c62e4bcecb6b5 Mon Sep 17 00:00:00 2001
From: Richard van Laak <rvanlaak@gmail.com>
Date: Thu, 3 Feb 2022 10:14:13 +0100
Subject: [PATCH 1/3] CSFixer diff-format is always udiff since 3.0

https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/UPGRADE-v3.md#cli-options
---
 .github/workflows/static-code-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index d500afb..fa36d72 100644
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Run PHP-CS-Fixer
         uses: docker://jakzal/phpqa:php7.3-alpine
         with:
-            args: php-cs-fixer fix --dry-run --diff-format udiff -vvv
+            args: php-cs-fixer fix --dry-run -vvv
 
   roave-bc-check:
     name: Roave BC Check

From 9bdadcf354c30f03e35f1f737956297fc2e8ee3d Mon Sep 17 00:00:00 2001
From: Richard van Laak <rvanlaak@gmail.com>
Date: Thu, 3 Feb 2022 13:31:18 +0100
Subject: [PATCH 2/3] Update PHP-CSFixer config

---
 .github/workflows/static-code-analysis.yml |  2 +-
 .gitignore                                 |  1 +
 .php-cs-fixer.php                          | 17 +++++++++++++++++
 .php_cs                                    | 17 -----------------
 4 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 .php-cs-fixer.php
 delete mode 100644 .php_cs

diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index fa36d72..510dafc 100644
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Run PHP-CS-Fixer
         uses: docker://jakzal/phpqa:php7.3-alpine
         with:
-            args: php-cs-fixer fix --dry-run -vvv
+            args: php-cs-fixer fix --diff --dry-run -vvv
 
   roave-bc-check:
     name: Roave BC Check
diff --git a/.gitignore b/.gitignore
index a719cf5..78700da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/.php-cs-fixer.cache
 /build/
 /composer.lock
 /phpspec.yml
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
new file mode 100644
index 0000000..6677981
--- /dev/null
+++ b/.php-cs-fixer.php
@@ -0,0 +1,17 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude(__DIR__.'/vendor')
+    ->name('*.php')
+    ->in(__DIR__)
+;
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setRiskyAllowed(true)
+    ->setFinder($finder)
+;
diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 2159fe4..0000000
--- a/.php_cs
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$config = PhpCsFixer\Config::create()
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-    ])
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->in(__DIR__)
-            ->exclude(__DIR__.'/vendor')
-            ->name('*.php')
-    )
-;
-
-return $config;

From 37c06d59cf87031c407f53f0d48d013eff802415 Mon Sep 17 00:00:00 2001
From: Richard van Laak <rvanlaak@gmail.com>
Date: Thu, 3 Feb 2022 13:32:04 +0100
Subject: [PATCH 3/3] Update Makefile as well

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7304054..f395cab 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,10 @@ DIR := ${CURDIR}
 QA_IMAGE := jakzal/phpqa:php7.3-alpine
 
 cs-fix:
-	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff -vvv
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff -vvv
 
 cs-diff:
-	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff --dry-run -vvv
+	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff --dry-run -vvv
 
 phpstan:
 	@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) phpstan analyze