From 82310464138a444853cfc369b41624eaba03614d Mon Sep 17 00:00:00 2001 From: Stanislas Poisson Date: Sun, 8 Nov 2026 17:47:42 +0100 Subject: [PATCH] chore(deps): #143 take laravel-dev-tools 4.13.0, drop workarounds laravel-dev-tools 4.13.0 builds its configuration on php-dev-tools 1.1.3 and no longer skips the deprecated AddOverrideAttributeToOverriddenMethodsRector, and its PHPInsights base excludes Eloquent and enums by directory. Remove the withRules() of Rector and the three exclusions of PHPInsights that worked around it. --- composer.json | 6 +++++- composer.lock | 22 +++++++++++----------- config/dev-tools/insights.php | 27 --------------------------- config/dev-tools/rector.php | 4 +--- 4 files changed, 17 insertions(+), 42 deletions(-) diff --git a/composer.json b/composer.json index 3ed13ba..768de45 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,11 @@ "rector:fix": "bash vendor/zairakai/laravel-dev-tools/scripts/rector-fix.sh", "test:coverage": "COVERAGE=true bash vendor/zairakai/laravel-dev-tools/scripts/test.sh", "test:unit": "TESTSUITE=Unit bash vendor/zairakai/laravel-dev-tools/scripts/test.sh", - "test": "bash vendor/zairakai/laravel-dev-tools/scripts/test.sh" + "test": "bash vendor/zairakai/laravel-dev-tools/scripts/test.sh", + "cs:fix": "bash vendor/zairakai/laravel-dev-tools/scripts/cs-fix.sh", + "quality": "make quality", + "quality:fast": "make quality-fast", + "quality:fix": "make quality-fix" }, "extra": { "laravel": { diff --git a/composer.lock b/composer.lock index 0dd7452..710453c 100644 --- a/composer.lock +++ b/composer.lock @@ -10754,16 +10754,16 @@ }, { "name": "stanislas-poisson/php-dev-tools", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/Stanislas-Poisson/php-dev-tools.git", - "reference": "cdffe9f2fb154cc6f4ebf838412394ab71de25c0" + "reference": "51eaf7441e25247ad81ea5b0ce70e7d2e01b5c89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Stanislas-Poisson/php-dev-tools/zipball/cdffe9f2fb154cc6f4ebf838412394ab71de25c0", - "reference": "cdffe9f2fb154cc6f4ebf838412394ab71de25c0", + "url": "https://api.github.com/repos/Stanislas-Poisson/php-dev-tools/zipball/51eaf7441e25247ad81ea5b0ce70e7d2e01b5c89", + "reference": "51eaf7441e25247ad81ea5b0ce70e7d2e01b5c89", "shasum": "" }, "require": { @@ -10846,7 +10846,7 @@ "type": "patreon" } ], - "time": "2026-10-26T14:31:33+00:00" + "time": "2026-11-08T15:24:37+00:00" }, { "name": "symfony/cache", @@ -11792,16 +11792,16 @@ }, { "name": "zairakai/laravel-dev-tools", - "version": "4.11.0", + "version": "4.13.0", "source": { "type": "git", "url": "https://gitlab.com/zairakai/php-packages/laravel-dev-tools.git", - "reference": "212f2fd70c49d2da5c0a013faa5febda0273a558" + "reference": "926115d11c3901034524e8a151ea25c10b00bff6" }, "dist": { "type": "zip", - "url": "https://gitlab.com/api/v4/projects/zairakai%2Fphp-packages%2Flaravel-dev-tools/repository/archive.zip?sha=212f2fd70c49d2da5c0a013faa5febda0273a558", - "reference": "212f2fd70c49d2da5c0a013faa5febda0273a558", + "url": "https://gitlab.com/api/v4/projects/zairakai%2Fphp-packages%2Flaravel-dev-tools/repository/archive.zip?sha=926115d11c3901034524e8a151ea25c10b00bff6", + "reference": "926115d11c3901034524e8a151ea25c10b00bff6", "shasum": "" }, "require": { @@ -11811,7 +11811,7 @@ "larastan/larastan": "^3.14.0", "php": "^8.4", "phpmetrics/phpmetrics": "^2.11", - "stanislas-poisson/php-dev-tools": "^1.1.2" + "stanislas-poisson/php-dev-tools": "^1.1.3" }, "require-dev": { "composer/composer": "^2.11.1", @@ -11904,7 +11904,7 @@ "type": "patreon" } ], - "time": "2026-11-05T05:16:04+00:00" + "time": "2026-11-08T17:17:56+00:00" } ], "aliases": [], diff --git a/config/dev-tools/insights.php b/config/dev-tools/insights.php index bdb8b54..cef2d40 100644 --- a/config/dev-tools/insights.php +++ b/config/dev-tools/insights.php @@ -13,10 +13,6 @@ * as it replaces by index instead of merging. */ -use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenDefineFunctions; -use SlevomatCodingStandard\Sniffs\Classes\ForbiddenPublicPropertySniff; -use SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff; - /* Load base configuration from package */ $baseConfig = []; @@ -61,29 +57,6 @@ * ]; */ -// Eloquent and the queue read these properties publicly ($timestamps, $timeout, $tries, promoted job arguments). -$baseConfig['config'][ForbiddenPublicPropertySniff::class] = [ - 'exclude' => [ - 'app/Models', - 'app/Jobs', - ], -]; - -// Eloquent relations are typed with generics (BelongsTo) that the sniff cannot read. -$baseConfig['config'][ReturnTypeHintSniff::class] = [ - ...($baseConfig['config'][ReturnTypeHintSniff::class] ?? []), - 'exclude' => [ - 'app/Models', - ], -]; - -// PHPInsights does not read the methods of an enum and takes them for global functions. -$baseConfig['config'][ForbiddenDefineFunctions::class] = [ - 'exclude' => [ - 'app/Enums', - ], -]; - // The PHPStan result cache (build/) is made of PHP files that must not be analysed. $baseConfig['exclude'] = [ ...($baseConfig['exclude'] ?? []), diff --git a/config/dev-tools/rector.php b/config/dev-tools/rector.php index df3bc65..b0b148c 100644 --- a/config/dev-tools/rector.php +++ b/config/dev-tools/rector.php @@ -1,7 +1,6 @@ withRules([AddOverrideAttributeToOverriddenMethodsRector::class]); +);