Merge branch 'master' into prepare-phpstan

conedevelopment · Jan 17, 2024 · 3b88305 · 3b88305
2 parents 3802c02 + 12b6511
commit 3b88305
Show file tree

Hide file tree

Showing 122 changed files with 3,588 additions and 643 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [iamgergo, adamlaki]
diff --git a/.github/workflows/back-end.yml b/.github/workflows/back-end.yml
@@ -49,8 +49,8 @@ jobs:
             fail-fast: false
             matrix:
                 php-version:
-                - "8.1"
                 - "8.2"
+                - "8.3"
                 dependencies:
                 - "lowest"
                 - "locked"

diff --git a/.github/workflows/reusable-integrity.yml b/.github/workflows/reusable-integrity.yml
@@ -70,7 +70,7 @@ jobs:
         -
             name: "Look for TAB characters in the middle of the line 🐌"
             run: |
-                ! git grep --perl-regexp --line-number -I -e '^(?!//)[^\t]+\t'
+                ! git grep --perl-regexp --line-number -I -e '^(?!//)[^\t]+\t' -- ':!:public/build/assets/'
         -
             name: "Look for multiple space characters in the middle of the line 🐌"
             run: |

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^8.1 || ^8.2",
+        "php": "^8.2 || ^8.3",
         "ext-exif": "*",
         "ext-gd": "*",
         "laravel/framework": "^10.17"