Merge branch '5.1' into 5.2

userfrosting · Nov 30, 2024 · f472a09 · f472a09
2 parents d43817e + ec79ef9
commit f472a09
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 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
@@ -64,7 +64,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
@@ -137,7 +137,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
@@ -203,7 +203,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
@@ -259,7 +259,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
@@ -321,7 +321,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/app/src/Database/Relations/BelongsToManyThrough.php b/app/src/Database/Relations/BelongsToManyThrough.php
@@ -94,12 +94,12 @@ public function getExistenceCompareKey(): string
     /**
      * Add a "via" query to load the intermediate models through which the child models are related.
      *
-     * @param string|null $viaRelationName
-     * @param callable    $viaCallback
+     * @param string|null   $viaRelationName
+     * @param callable|null $viaCallback
      *
      * @return self
      */
-    public function withVia(?string $viaRelationName = null, callable $viaCallback = null): self
+    public function withVia(?string $viaRelationName = null, ?callable $viaCallback = null): self
     {
         $this->tertiaryRelated = $this->intermediateRelation->getRelated();
 

diff --git a/app/templates/pages/abstract/base.html.twig b/app/templates/pages/abstract/base.html.twig
@@ -7,6 +7,7 @@
             <meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
             <meta name="generator" content="UserFrosting" />
             <meta name="description" content="{{ block('page_description')|e }}">
+            <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
             <meta name="author" content="{% block page_author %}{{ site.author }}{% endblock %}">
 
             <title>{{ site.title }} | {% block page_title %}{% endblock %}</title>