From 69c421434daf62420cf0cd4ea2e2aa2a5eba55d8 Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Sun, 17 Nov 2024 11:12:58 +0100 Subject: [PATCH 1/3] Upgrade to PHPStan 2 --- composer.json | 6 ++++-- src/Traits/BelongsToThrough.php | 3 +++ src/Traits/HasTableAlias.php | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4e876ff..0465f99 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,10 @@ }, "require-dev": { "barryvdh/laravel-ide-helper": "^3.0", - "larastan/larastan": "^2.9", - "orchestra/testbench": "^9.0", + "laravel/framework": "^11.0", + "larastan/larastan": "^3.0", + "mockery/mockery": "^1.5.1", + "orchestra/testbench-core": "^9.0", "phpunit/phpunit": "^11.0" }, "autoload": { diff --git a/src/Traits/BelongsToThrough.php b/src/Traits/BelongsToThrough.php index d74848a..d6f499b 100644 --- a/src/Traits/BelongsToThrough.php +++ b/src/Traits/BelongsToThrough.php @@ -6,6 +6,9 @@ use Illuminate\Database\Eloquent\Model; use Znck\Eloquent\Relations\BelongsToThrough as Relation; +/** + * @phpstan-ignore trait.unused + */ trait BelongsToThrough { /** diff --git a/src/Traits/HasTableAlias.php b/src/Traits/HasTableAlias.php index edeb911..08a91ef 100644 --- a/src/Traits/HasTableAlias.php +++ b/src/Traits/HasTableAlias.php @@ -2,6 +2,9 @@ namespace Znck\Eloquent\Traits; +/** + * @phpstan-ignore trait.unused + */ trait HasTableAlias { /** @inheritDoc */ From e35759452371f79be77f2624ba6b0f0925377c96 Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Sun, 17 Nov 2024 11:14:33 +0100 Subject: [PATCH 2/3] Increase PHPStan level --- README.md | 2 +- phpstan.neon.dist | 2 +- phpstan.types.neon.dist | 2 +- src/Relations/BelongsToThrough.php | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b78eaef..5b1c03c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CI](https://github.com/staudenmeir/belongs-to-through/actions/workflows/ci.yml/badge.svg)](https://github.com/staudenmeir/belongs-to-through/actions/workflows/ci.yml?query=branch%3Amain) [![Code Coverage](https://codecov.io/gh/staudenmeir/belongs-to-through/graph/badge.svg?token=Z4KscVFWIE)](https://codecov.io/gh/staudenmeir/belongs-to-through) -[![PHPStan](https://img.shields.io/badge/PHPStan-level%209-brightgreen.svg?style=flat)](https://github.com/staudenmeir/belongs-to-through/actions/workflows/static-analysis.yml?query=branch%3Amain) +[![PHPStan](https://img.shields.io/badge/PHPStan-level%2010-brightgreen.svg?style=flat)](https://github.com/staudenmeir/belongs-to-through/actions/workflows/static-analysis.yml?query=branch%3Amain) [![Latest Stable Version](https://poser.pugx.org/staudenmeir/belongs-to-through/v/stable)](https://packagist.org/packages/staudenmeir/belongs-to-through) [![Total Downloads](https://poser.pugx.org/staudenmeir/belongs-to-through/downloads)](https://packagist.org/packages/staudenmeir/belongs-to-through/stats) [![License](https://poser.pugx.org/staudenmeir/belongs-to-through/license)](https://github.com/staudenmeir/belongs-to-through/blob/main/LICENSE) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 3e639cd..9228327 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,4 +1,4 @@ parameters: - level: 9 + level: 10 paths: - src diff --git a/phpstan.types.neon.dist b/phpstan.types.neon.dist index 188838b..8b809e8 100644 --- a/phpstan.types.neon.dist +++ b/phpstan.types.neon.dist @@ -1,6 +1,6 @@ includes: - ./vendor/larastan/larastan/extension.neon parameters: - level: 9 + level: 10 paths: - types diff --git a/src/Relations/BelongsToThrough.php b/src/Relations/BelongsToThrough.php index 37a9e55..36d02c6 100644 --- a/src/Relations/BelongsToThrough.php +++ b/src/Relations/BelongsToThrough.php @@ -119,6 +119,7 @@ protected function performJoins(?Builder $query = null) $query->join($model->getTable(), $first, '=', $second); if ($this->hasSoftDeletes($model)) { + /** @var string $column */ /** @phpstan-ignore method.notFound */ $column = $model->getQualifiedDeletedAtColumn(); From 170b3e9fe59ed329b21a8f027cb15c1fbfd4d33f Mon Sep 17 00:00:00 2001 From: Jonas Staudenmeir Date: Sun, 17 Nov 2024 11:24:18 +0100 Subject: [PATCH 3/3] Upgrade to PHPStan 2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0465f99..97070a9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "laravel/framework": "^11.0", "larastan/larastan": "^3.0", "mockery/mockery": "^1.5.1", - "orchestra/testbench-core": "^9.0", + "orchestra/testbench-core": "^9.5", "phpunit/phpunit": "^11.0" }, "autoload": {