Skip to content

Commit

Permalink
Merge branch '5.2' into 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lcharette committed Nov 30, 2024
2 parents 97173de + f472a09 commit 0909585
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/PHPStan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions app/src/Database/Relations/BelongsToManyThrough.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
1 change: 1 addition & 0 deletions app/templates/pages/abstract/base.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
<meta name="generator" content="UserFrosting" />
<meta name="description" content="">
<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>
Expand Down

0 comments on commit 0909585

Please sign in to comment.