Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use PHP 8.4 by default #109

Merged
merged 3 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ We accept contributions via Pull Requests on [GitHub](https://github.com/stauden
## Running Tests & Static Analysis

```
docker compose run --rm php8.3 composer install
docker compose run --rm php8.3 vendor/bin/phpunit
docker compose run --rm php8.3 vendor/bin/phpstan analyse --memory-limit=-1
docker compose run --rm php8.3 vendor/bin/phpstan analyse --configuration=phpstan.types.neon.dist --memory-limit=-1
docker compose run --rm php8.4 composer install
docker compose run --rm php8.4 vendor/bin/phpunit
docker compose run --rm php8.4 vendor/bin/phpstan analyse --memory-limit=-1
docker compose run --rm php8.4 vendor/bin/phpstan analyse --configuration=phpstan.types.neon.dist --memory-limit=-1
```
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
php: [ 8.4, 8.3, 8.2 ]
release: [ stable, lowest ]
include:
- php: 8.3
- php: 8.4
release: stable
coverage: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
php: [ 8.3 ]
php: [ 8.4 ]
release: [ stable ]

steps:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
},
"require-dev": {
"barryvdh/laravel-ide-helper": "^3.0",
"laravel/framework": "^11.0",
"larastan/larastan": "^3.0",
"laravel/framework": "^11.0",
"mockery/mockery": "^1.5.1",
"orchestra/testbench-core": "^9.5",
"phpunit/phpunit": "^11.0"
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ services:
volumes:
- .:/var/www/html:delegated
- ~/.cache/composer/files:/root/.composer/cache/files
php8.3-xdebug:
image: ghcr.io/staudenmeir/php:8.3
php8.4:
image: ghcr.io/staudenmeir/php:8.4
working_dir: /var/www/html
volumes:
- .:/var/www/html:delegated
- .docker/xdebug.ci.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
- ~/.cache/composer/files:/root/.composer/cache/files
php8.4:
php8.4-xdebug:
image: ghcr.io/staudenmeir/php:8.4
working_dir: /var/www/html
volumes:
- .:/var/www/html:delegated
- .docker/xdebug.ci.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
- ~/.cache/composer/files:/root/.composer/cache/files
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ services:
working_dir: /var/www/html
volumes:
- .:/var/www/html:delegated
#- .docker/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
- .docker/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
6 changes: 3 additions & 3 deletions src/Traits/BelongsToThrough.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ trait BelongsToThrough
* @param non-empty-list<class-string<\Illuminate\Database\Eloquent\Model>>|non-empty-list<array{0: class-string<\Illuminate\Database\Eloquent\Model>, 1: string}>|class-string<\Illuminate\Database\Eloquent\Model> $through
* @param string|null $localKey
* @param string $prefix
* @param array<class-string<\Illuminate\Database\Eloquent\Model>, string> $foreignKeyLookup
* @param array<class-string<\Illuminate\Database\Eloquent\Model>, string> $localKeyLookup
* @param array<int, class-string<\Illuminate\Database\Eloquent\Model>, string> $foreignKeyLookup
* @param array<int, class-string<\Illuminate\Database\Eloquent\Model>, string> $localKeyLookup
* @return \Znck\Eloquent\Relations\BelongsToThrough<TRelatedModel, $this>
*/
public function belongsToThrough(
Expand Down Expand Up @@ -77,7 +77,7 @@ public function belongsToThrough(
/**
* Map keys to an associative array where the key is the table name and the value is the key from the lookup.
*
* @param array<class-string<\Illuminate\Database\Eloquent\Model>, string> $keyLookup
* @param array<int, class-string<\Illuminate\Database\Eloquent\Model>, string> $keyLookup
* @return array<string, string>
*/
protected function mapKeys(array $keyLookup): array
Expand Down