Merge branch '5.1' into 5.2

userfrosting · Nov 30, 2024 · d938ea8 · d938ea8
2 parents a976af4 + ab53e76
commit d938ea8
Show file tree

Hide file tree

Showing 4 changed files with 193 additions and 166 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_versions: ['8.1', '8.2', '8.3']
+        php_versions: ['8.1', '8.2', '8.3', '8.4']
 
     runs-on: ubuntu-latest
     name: PHPUnit - PHP ${{ matrix.php_versions }} - Memory SQLite
@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_versions: ['8.1', '8.2', '8.3']
+        php_versions: ['8.1', '8.2', '8.3', '8.4']
 
     runs-on: ubuntu-latest
     name: PHPUnit - PHP ${{ matrix.php_versions }} - MySQL
@@ -149,7 +149,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_versions: ['8.1', '8.2', '8.3']
+        php_versions: ['8.1', '8.2', '8.3', '8.4']
 
     runs-on: ubuntu-latest
     name: PHPUnit - PHP ${{ matrix.php_versions }} - MariaDB
@@ -221,7 +221,7 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          php_versions: ['8.1', '8.2', '8.3']
+          php_versions: ['8.1', '8.2', '8.3', '8.4']
 
       runs-on: ubuntu-latest
       name: PHPUnit - PHP ${{ matrix.php_versions }} - SQLite
@@ -283,7 +283,7 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          php_versions: ['8.1', '8.2', '8.3']
+          php_versions: ['8.1', '8.2', '8.3', '8.4']
 
       runs-on: ubuntu-latest
       name: PHPUnit - PHP ${{ matrix.php_versions }} - PostgreSQL
@@ -351,7 +351,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-          php_versions: ['8.1', '8.2', '8.3']
+          php_versions: ['8.1', '8.2', '8.3', '8.4']
 
     runs-on: windows-latest
     name: PHPUnit - PHP ${{ matrix.php_versions }} - Windows

diff --git a/.github/workflows/PHPStan.yml b/.github/workflows/PHPStan.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_versions: ['8.1', '8.2', '8.3']
+        php_versions: ['8.1', '8.2', '8.3', '8.4']
 
     runs-on: ubuntu-latest
     name: PHPStan - ${{ matrix.php_versions }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [5.2.0](https://github.com/userfrosting/userfrosting/compare/5.1.0...5.2.0)
 - Renamed npm scripts, add Vite npm scripts
 
+## [5.1.3](https://github.com/userfrosting/userfrosting/compare/5.1.2...5.1.3)
+- Bump frontend dependencies by @dependabot
+- Add PHP 8.4 support & tests
+
 ## [5.1.2](https://github.com/userfrosting/userfrosting/compare/5.1.1...5.1.2)
 - Fix FontAwesome icons on the about page
 - Add vscode settings