From a9e6a019eea0c01686d9cd4906cb534c0502b409 Mon Sep 17 00:00:00 2001
From: Dominik Chrastecky <dominik@chrastecky.cz>
Date: Fri, 8 Apr 2022 13:24:43 +0200
Subject: [PATCH 1/5] Run tests on 8.1

---
 .github/workflows/test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 3081513..df0d08c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['7.3', '7.4', '8.0']
+        version: ['7.3', '7.4', '8.0', '8.1']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['7.3', '7.4', '8.0']
+        version: ['7.3', '7.4', '8.0', '8.1']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

From 0cf14fda91db08f6e4ed21000ec6be9efb3f1c57 Mon Sep 17 00:00:00 2001
From: Dominik Chrastecky <dominik@chrastecky.cz>
Date: Fri, 8 Apr 2022 13:25:57 +0200
Subject: [PATCH 2/5] Run all tests on 8.1

---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index df0d08c..f19a171 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['7.3', '7.4']
+        version: ['7.3', '7.4', '8.0', '8.1']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

From e569abe8da32544c92b7ad0a9039c28d57dc30cf Mon Sep 17 00:00:00 2001
From: Dominik Chrastecky <dominik@chrastecky.cz>
Date: Fri, 8 Apr 2022 13:53:02 +0200
Subject: [PATCH 3/5] Update php-cs-fixer

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9bd6ed8..7fe4d37 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     }
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^2.14",
+    "friendsofphp/php-cs-fixer": "^3.0",
     "phpstan/phpstan": "^0.12.63",
     "php-coveralls/php-coveralls": "^2.1",
     "phpunit/phpunit": "^9"

From b69d8eeeb2b6b704a42d35ffce86a953c2afc2f7 Mon Sep 17 00:00:00 2001
From: Dominik Chrastecky <dominik@chrastecky.cz>
Date: Fri, 8 Apr 2022 13:58:51 +0200
Subject: [PATCH 4/5] Update PHP CS fixer

---
 .gitignore                             | 1 +
 .php_cs.dist => .php-cs-fixer.dist.php | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename .php_cs.dist => .php-cs-fixer.dist.php (94%)

diff --git a/.gitignore b/.gitignore
index 34b117a..0c5db2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 /vendor
 /composer.lock
 /.php_cs.cache
+/.php-cs-fixer.cache
 .phpunit.result.cache
 /tmp
diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php
similarity index 94%
rename from .php_cs.dist
rename to .php-cs-fixer.dist.php
index 85e2b80..3eee16d 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.dist.php
@@ -1,6 +1,6 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
@@ -10,7 +10,7 @@
         ],
         'cast_spaces' => true,
         'class_attributes_separation' => [
-            'elements' => ['method', 'property'],
+            'elements' => ['method' => 'one', 'property' => 'one', 'trait_import' => 'none'],
         ],
         'combine_consecutive_unsets' => true,
         'compact_nullable_typehint' => true,
@@ -46,7 +46,6 @@
                 'square_brace_block',
                 'throw',
                 'use',
-                'use_trait',
                 'switch',
                 'case',
                 'default',
@@ -70,7 +69,7 @@
         'single_quote' => true,
         'standardize_not_equals' => true,
         'ternary_operator_spaces' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'unary_operator_spaces' => true,
         'visibility_required' => [
             'elements' => ['property', 'method', 'const'],

From 822ebad1bbf5401e95b3323b946da517ee67d862 Mon Sep 17 00:00:00 2001
From: Dominik Chrastecky <dominik@chrastecky.cz>
Date: Fri, 8 Apr 2022 14:01:15 +0200
Subject: [PATCH 5/5] Run 32 bit tests on all versions

---
 .github/workflows/test.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index f19a171..4a1ae2b 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -81,11 +81,14 @@ jobs:
     name: Test 32 bit php
     runs-on: ubuntu-latest
     container: shivammathur/node:latest-i386
+    strategy:
+      matrix:
+        version: [ '7.3', '7.4', '8.0', '8.1' ]
     steps:
       - name: Install PHP
         run: |
           spc -U
-          spc --php-version "7.4" --extensions "bcmath, gmp" --coverage "xdebug"
+          spc --php-version "${{ matrix.version }}" --extensions "bcmath, gmp" --coverage "xdebug"
       - name: Checkout Code
         run: |
           git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY .