diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 6d7a3897..897935af 100644 --- 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 index fda038c5..030f39de 100644 --- 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 index 8d14ae2f..d32d4437 100644 --- 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 index c70f531a..070aa76b 100644 --- a/app/templates/pages/abstract/base.html.twig +++ b/app/templates/pages/abstract/base.html.twig @@ -7,6 +7,7 @@ + {{ site.title }} | {% block page_title %}{% endblock %}