From 9af62e243de64e0fddc782fb1d125ddfc24dfea9 Mon Sep 17 00:00:00 2001 From: Markus Podar Date: Sat, 17 Feb 2024 22:08:15 +0100 Subject: [PATCH 1/3] Bump minimum PHP version to 8.1 & misc maintenance (#1521) * Bump minimum PHP version to 8.1 Laravel 10 doesn't support 8.0 anyway * Remove phpunit 9 * gha: remove unused matrix dimension * gha: bump runner os * tests: remove outdated version checks --- .github/workflows/composer-normalize.yml | 2 +- .github/workflows/fix-code-style.yml | 2 +- .github/workflows/run-integration-tests.yml | 2 +- .github/workflows/run-static-analysis.yml | 2 +- .github/workflows/run-tests.yml | 3 +-- CHANGELOG.md | 14 ++++++++------ composer.json | 4 ++-- tests/Console/ModelsCommand/AdvancedCasts/Test.php | 7 ------- .../GenerateBasicPhpDocWithEnumDefaults/Test.php | 6 ------ 9 files changed, 15 insertions(+), 27 deletions(-) diff --git a/.github/workflows/composer-normalize.yml b/.github/workflows/composer-normalize.yml index 9a2fc97..b7dba34 100644 --- a/.github/workflows/composer-normalize.yml +++ b/.github/workflows/composer-normalize.yml @@ -9,7 +9,7 @@ on: jobs: normalize: timeout-minutes: 15 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Git checkout uses: actions/checkout@v4 diff --git a/.github/workflows/fix-code-style.yml b/.github/workflows/fix-code-style.yml index 80e7639..da75524 100644 --- a/.github/workflows/fix-code-style.yml +++ b/.github/workflows/fix-code-style.yml @@ -7,7 +7,7 @@ jobs: fix-style: name: Fix Code Style timeout-minutes: 15 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: COMPOSER_NO_INTERACTION: 1 diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index a3a4eff..ed33366 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -12,7 +12,7 @@ on: jobs: php-laravel-integration-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 15 env: COMPOSER_NO_INTERACTION: 1 diff --git a/.github/workflows/run-static-analysis.yml b/.github/workflows/run-static-analysis.yml index e31f00c..2c9ea0d 100644 --- a/.github/workflows/run-static-analysis.yml +++ b/.github/workflows/run-static-analysis.yml @@ -9,7 +9,7 @@ on: jobs: build: timeout-minutes: 15 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 43176ee..9aa055f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,11 +20,10 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019] + os: [ubuntu-22.04, windows-2019] php: [8.3, 8.2, 8.1] laravel: [10.*, 11.*] stability: [prefer-lowest, prefer-stable] - dependency-version: [prefer-lowest, prefer-stable] exclude: - php: 8.1 laravel: 11.* diff --git a/CHANGELOG.md b/CHANGELOG.md index 89c90a7..fe6fa3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,15 +7,17 @@ All notable changes to this project will be documented in this file. ### Fixed -### Changed -- Use of doctrine/dbal [#1512 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1512) - With this functionality gone, a few changes have been made: -- support for custom datatypes has been dropped (config `custom_db_types`) unknown data types default to `string` now and to fix the type, add a proper cast in Eloquent -- You _might_ have top-level dependency on doctrine/dbal. This may have been in the past due to ide-helper, we suggest to check if you still need it and remove it otherwise - ### Added - Support for Laravel 11 [#1520 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1520) +### Removed +- Support for Laravel 9 and use of doctrine/dbal [#1512 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1512) + With this functionality gone, a few changes have been made: + - support for custom datatypes has been dropped (config `custom_db_types`) unknown data types default to `string` now and to fix the type, add a proper cast in Eloquent + - You _might_ have top-level dependency on doctrine/dbal. This may have been in the past due to ide-helper, we suggest to check if you still need it and remove it otherwise + - Minimum PHP version, due to Laravel 10, is now PHP 8.1 + + 2024-02-15, 2.15.1 ------------------ diff --git a/composer.json b/composer.json index a38b986..3ff3f21 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "ext-json": "*", "barryvdh/reflection-docblock": "^2.1.1", "composer/class-map-generator": "^1.0", @@ -38,7 +38,7 @@ "illuminate/view": "^9 || ^10 || ^11", "mockery/mockery": "^1.4", "orchestra/testbench": "^8 || ^9", - "phpunit/phpunit": "^9 || ^10.5", + "phpunit/phpunit": "^10.5", "spatie/phpunit-snapshot-assertions": "^4 || ^5", "vimeo/psalm": "^5.4" }, diff --git a/tests/Console/ModelsCommand/AdvancedCasts/Test.php b/tests/Console/ModelsCommand/AdvancedCasts/Test.php index 7856703..7e46e26 100644 --- a/tests/Console/ModelsCommand/AdvancedCasts/Test.php +++ b/tests/Console/ModelsCommand/AdvancedCasts/Test.php @@ -6,18 +6,11 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts; use Barryvdh\LaravelIdeHelper\Console\ModelsCommand; use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand; -use Illuminate\Foundation\Application; class Test extends AbstractModelsCommand { public function test(): void { - if (!version_compare(Application::VERSION, '8.28', '>=')) { - $this->markTestSkipped( - 'This test only works in Laravel >= 8.28' - ); - } - $command = $this->app->make(ModelsCommand::class); $tester = $this->runCommand($command, [ diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php index 0eb640d..bb3821e 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php @@ -11,12 +11,6 @@ class Test extends AbstractModelsCommand { public function test(): void { - if (!version_compare(PHP_VERSION, '8.1', '>=')) { - $this->markTestSkipped( - 'This test only works in PHP >= 8.1' - ); - } - $command = $this->app->make(ModelsCommand::class); $tester = $this->runCommand($command, [ From d7ed749f3e1bf3ca2c28c79e3247b550b04198aa Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Mon, 19 Feb 2024 12:39:07 +0100 Subject: [PATCH 2/3] Use int/bool instead of longer variant (#1524) * Use int/bool instead of longer variant * Add changelog * Update snapshots --- CHANGELOG.md | 3 ++ src/Console/ModelsCommand.php | 8 +-- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 2 +- .../Comment/__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- ...st__testNoSpaceAfterCustomPhpdocTag__1.php | 2 +- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../__snapshots__/Test__test__1.php | 2 +- .../Getter/__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../Test__testNoinspectionNotPresent__1.php | 2 +- .../Test__testNoinspectionPresent__1.php | 2 +- .../__snapshots__/Test__test__1.php | 50 +++++++++---------- .../Relations/__snapshots__/Test__test__1.php | 22 ++++---- .../__snapshots__/Test__testNoReset__1.php | 2 +- .../__snapshots__/Test__testReset__1.php | 2 +- .../__snapshots__/Test__testSmartReset__1.php | 2 +- .../__snapshots__/Test__test__1.php | 10 ++-- .../__snapshots__/Test__test__1.php | 2 +- .../Variadic/__snapshots__/Test__test__1.php | 2 +- 32 files changed, 387 insertions(+), 384 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe6fa3e..4a304a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ All notable changes to this project will be documented in this file. ### Added - Support for Laravel 11 [#1520 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1520) +### Changed +- Use short types (`int` and `bool` instead of `integer` and `boolean`) [#1524 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1524) + ### Removed - Support for Laravel 9 and use of doctrine/dbal [#1512 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1512) With this functionality gone, a few changes have been made: diff --git a/src/Console/ModelsCommand.php b/src/Console/ModelsCommand.php index 4c69661..65d150e 100644 --- a/src/Console/ModelsCommand.php +++ b/src/Console/ModelsCommand.php @@ -378,7 +378,7 @@ class ModelsCommand extends Command break; case 'boolean': case 'bool': - $realType = 'boolean'; + $realType = 'bool'; break; case 'decimal': case 'string': @@ -394,7 +394,7 @@ class ModelsCommand extends Command case 'int': case 'integer': case 'timestamp': - $realType = 'integer'; + $realType = 'int'; break; case 'real': case 'double': @@ -521,9 +521,9 @@ class ModelsCommand extends Command 'integer', 'int', 'int4', 'smallint', 'int2', 'mediumint', - 'bigint', 'int8' => 'integer', + 'bigint', 'int8' => 'int', - 'boolean', 'bool' => 'boolean', + 'boolean', 'bool' => 'bool', 'float', 'real', 'float4', 'double', 'float8' => 'float', diff --git a/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php index 12a9f0d..281a3f9 100644 --- a/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php @@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Model; * @property \Carbon\CarbonImmutable $cast_to_immutable_date * @property \Carbon\CarbonImmutable $cast_to_immutable_custom_datetime * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime - * @property integer $cast_to_timestamp + * @property int $cast_to_timestamp * @property mixed $cast_to_encrypted * @property array $cast_to_encrypted_array * @property \Illuminate\Support\Collection $cast_to_encrypted_collection diff --git a/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php index 3b82094..345fc7e 100644 --- a/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirectory\Services\Post\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -20,34 +20,34 @@ use Illuminate\Database\Eloquent\Model; * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -68,8 +68,8 @@ use Illuminate\Database\Eloquent\Model; * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php index 8cb8961..fe7ead2 100644 --- a/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Models\Simple * - * @property integer $id + * @property int $id * @property int $diverging_type_hinted_get_and_set * @property string|null $name * @property-read mixed $non_type_hinted_get diff --git a/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php index c3c9686..0e6a6a8 100644 --- a/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php @@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\MorphTo; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Comment\Models\Simple * - * @property integer $id + * @property int $id * @property string $both_same_name I'm a getter * @property string $both_without_getter_comment * @property-read string $faker_comment diff --git a/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php index 0b10768..eb523f6 100644 --- a/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php @@ -11,7 +11,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomCollection\Models\Simple * - * @property integer $id + * @property int $id * @property-read SimpleCollection $relationHasMany * @property-read int|null $relation_has_many_count * @method static SimpleCollection all($columns = ['*']) diff --git a/tests/Console/ModelsCommand/CustomPhpdocTags/__snapshots__/Test__testNoSpaceAfterCustomPhpdocTag__1.php b/tests/Console/ModelsCommand/CustomPhpdocTags/__snapshots__/Test__testNoSpaceAfterCustomPhpdocTag__1.php index 6f883e1..801f533 100644 --- a/tests/Console/ModelsCommand/CustomPhpdocTags/__snapshots__/Test__testNoSpaceAfterCustomPhpdocTag__1.php +++ b/tests/Console/ModelsCommand/CustomPhpdocTags/__snapshots__/Test__testNoSpaceAfterCustomPhpdocTag__1.php @@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model; * * @link https://github.com/barryvdh/laravel-ide-helper/issues/666 * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) - * @property integer $id + * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple query() diff --git a/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php index d0489f4..b4e81d6 100644 --- a/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php @@ -15,7 +15,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGeneratePhpdocWithExternalEloquentBuilder\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -26,34 +26,34 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -74,8 +74,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php index 170ec54..780b24b 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php @@ -11,7 +11,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -22,34 +22,34 @@ use Illuminate\Database\Eloquent\Model; * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -70,8 +70,8 @@ use Illuminate\Database\Eloquent\Model; * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php index 3fc88b6..0573323 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdoc\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -20,34 +20,34 @@ use Illuminate\Database\Eloquent\Model; * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -68,8 +68,8 @@ use Illuminate\Database\Eloquent\Model; * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php index 9663109..55c3c2c 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocCamel\Models\Post * - * @property integer $id + * @property int $id * @property string|null $charNullable * @property string $charNotNullable * @property string|null $stringNullable @@ -20,34 +20,34 @@ use Illuminate\Database\Eloquent\Model; * @property string $mediumTextNotNullable * @property string|null $longTextNullable * @property string $longTextNotNullable - * @property integer|null $integerNullable - * @property integer $integerNotNullable - * @property integer|null $tinyIntegerNullable - * @property integer $tinyIntegerNotNullable - * @property integer|null $smallIntegerNullable - * @property integer $smallIntegerNotNullable - * @property integer|null $mediumIntegerNullable - * @property integer $mediumIntegerNotNullable - * @property integer|null $bigIntegerNullable - * @property integer $bigIntegerNotNullable - * @property integer|null $unsignedIntegerNullable - * @property integer $unsignedIntegerNotNullable - * @property integer|null $unsignedTinyIntegerNullable - * @property integer $unsignedTinyIntegerNotNullable - * @property integer|null $unsignedSmallIntegerNullable - * @property integer $unsignedSmallIntegerNotNullable - * @property integer|null $unsignedMediumIntegerNullable - * @property integer $unsignedMediumIntegerNotNullable - * @property integer|null $unsignedBigIntegerNullable - * @property integer $unsignedBigIntegerNotNullable + * @property int|null $integerNullable + * @property int $integerNotNullable + * @property int|null $tinyIntegerNullable + * @property int $tinyIntegerNotNullable + * @property int|null $smallIntegerNullable + * @property int $smallIntegerNotNullable + * @property int|null $mediumIntegerNullable + * @property int $mediumIntegerNotNullable + * @property int|null $bigIntegerNullable + * @property int $bigIntegerNotNullable + * @property int|null $unsignedIntegerNullable + * @property int $unsignedIntegerNotNullable + * @property int|null $unsignedTinyIntegerNullable + * @property int $unsignedTinyIntegerNotNullable + * @property int|null $unsignedSmallIntegerNullable + * @property int $unsignedSmallIntegerNotNullable + * @property int|null $unsignedMediumIntegerNullable + * @property int $unsignedMediumIntegerNotNullable + * @property int|null $unsignedBigIntegerNullable + * @property int $unsignedBigIntegerNotNullable * @property float|null $floatNullable * @property float $floatNotNullable * @property float|null $doubleNullable * @property float $doubleNotNullable * @property string|null $decimalNullable * @property string $decimalNotNullable - * @property integer|null $booleanNullable - * @property integer $booleanNotNullable + * @property int|null $booleanNullable + * @property int $booleanNotNullable * @property string|null $enumNullable * @property string $enumNotNullable * @property string|null $jsonNullable @@ -68,8 +68,8 @@ use Illuminate\Database\Eloquent\Model; * @property string $timestampNotNullable * @property string|null $timestamptzNullable * @property string $timestamptzNotNullable - * @property integer|null $yearNullable - * @property integer $yearNotNullable + * @property int|null $yearNullable + * @property int $yearNotNullable * @property string|null $binaryNullable * @property string $binaryNotNullable * @property string|null $uuidNullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php index 1d56199..1f1dae0 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocFinal\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -20,34 +20,34 @@ use Illuminate\Database\Eloquent\Model; * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -68,8 +68,8 @@ use Illuminate\Database\Eloquent\Model; * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php index 9bfd95f..f442521 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php @@ -15,7 +15,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -26,34 +26,34 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -74,8 +74,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php index cf869f7..46c4432 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilderWithFqn\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -21,34 +21,34 @@ use Illuminate\Database\Eloquent\Model; * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -69,8 +69,8 @@ use Illuminate\Database\Eloquent\Model; * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php index 1900cab..2ec9641 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php @@ -11,7 +11,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -22,34 +22,34 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -70,8 +70,8 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php index db37939..2bc3a94 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php @@ -17,7 +17,7 @@ use Illuminate\Support\Carbon; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqn\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property CastType $char_not_nullable * @property string|null $string_nullable @@ -28,34 +28,34 @@ use Illuminate\Support\Carbon; * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -76,8 +76,8 @@ use Illuminate\Support\Carbon; * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php index 8c8f4b9..ce70124 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php @@ -15,7 +15,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -26,34 +26,34 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -74,8 +74,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php index f0bfe9c..7db2cf7 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php @@ -64,7 +64,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi * * @property $someProp * @method someMethod(string $method) - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -75,34 +75,34 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -123,8 +123,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php index 99c20c0..9e802be 100644 --- a/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php @@ -11,7 +11,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenericsSyntaxDisabled\Models\Simple * - * @property integer $id + * @property int $id * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularBelongsToMany * @property-read int|null $regular_belongs_to_many_count * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularHasMany diff --git a/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php index 94b0a3e..b33ff8f 100644 --- a/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Getter\Models\Simple * - * @property integer $id + * @property int $id * @property-read int|null $attribute_return_type_int_or_null * @property-read array $attribute_returns_array * @property-read bool $attribute_returns_bool diff --git a/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php index c3e2dcd..7df0890 100644 --- a/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -20,34 +20,34 @@ use Illuminate\Database\Eloquent\Model; * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -68,8 +68,8 @@ use Illuminate\Database\Eloquent\Model; * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php index 25c0e3b..611b4d2 100644 --- a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php +++ b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models\Simple * - * @property integer $id + * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple query() diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php index 9cb1f27..18181e5 100644 --- a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php +++ b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models\Simple * - * @property integer $id + * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple query() diff --git a/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php index 7460981..953fe15 100644 --- a/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\RelationCountProperties\Models\Post * - * @property integer $id + * @property int $id * @property string|null $char_nullable * @property string $char_not_nullable * @property string|null $string_nullable @@ -21,34 +21,34 @@ use Illuminate\Database\Eloquent\Relations\HasMany; * @property string $medium_text_not_nullable * @property string|null $long_text_nullable * @property string $long_text_not_nullable - * @property integer|null $integer_nullable - * @property integer $integer_not_nullable - * @property integer|null $tiny_integer_nullable - * @property integer $tiny_integer_not_nullable - * @property integer|null $small_integer_nullable - * @property integer $small_integer_not_nullable - * @property integer|null $medium_integer_nullable - * @property integer $medium_integer_not_nullable - * @property integer|null $big_integer_nullable - * @property integer $big_integer_not_nullable - * @property integer|null $unsigned_integer_nullable - * @property integer $unsigned_integer_not_nullable - * @property integer|null $unsigned_tiny_integer_nullable - * @property integer $unsigned_tiny_integer_not_nullable - * @property integer|null $unsigned_small_integer_nullable - * @property integer $unsigned_small_integer_not_nullable - * @property integer|null $unsigned_medium_integer_nullable - * @property integer $unsigned_medium_integer_not_nullable - * @property integer|null $unsigned_big_integer_nullable - * @property integer $unsigned_big_integer_not_nullable + * @property int|null $integer_nullable + * @property int $integer_not_nullable + * @property int|null $tiny_integer_nullable + * @property int $tiny_integer_not_nullable + * @property int|null $small_integer_nullable + * @property int $small_integer_not_nullable + * @property int|null $medium_integer_nullable + * @property int $medium_integer_not_nullable + * @property int|null $big_integer_nullable + * @property int $big_integer_not_nullable + * @property int|null $unsigned_integer_nullable + * @property int $unsigned_integer_not_nullable + * @property int|null $unsigned_tiny_integer_nullable + * @property int $unsigned_tiny_integer_not_nullable + * @property int|null $unsigned_small_integer_nullable + * @property int $unsigned_small_integer_not_nullable + * @property int|null $unsigned_medium_integer_nullable + * @property int $unsigned_medium_integer_not_nullable + * @property int|null $unsigned_big_integer_nullable + * @property int $unsigned_big_integer_not_nullable * @property float|null $float_nullable * @property float $float_not_nullable * @property float|null $double_nullable * @property float $double_not_nullable * @property string|null $decimal_nullable * @property string $decimal_not_nullable - * @property integer|null $boolean_nullable - * @property integer $boolean_not_nullable + * @property int|null $boolean_nullable + * @property int $boolean_not_nullable * @property string|null $enum_nullable * @property string $enum_not_nullable * @property string|null $json_nullable @@ -69,8 +69,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany; * @property string $timestamp_not_nullable * @property string|null $timestamptz_nullable * @property string $timestamptz_not_nullable - * @property integer|null $year_nullable - * @property integer $year_not_nullable + * @property int|null $year_nullable + * @property int $year_not_nullable * @property string|null $binary_nullable * @property string $binary_not_nullable * @property string|null $uuid_nullable diff --git a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php index dd6f642..1a405a1 100644 --- a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php @@ -10,11 +10,11 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\BelongsToVariation * - * @property integer $id - * @property integer $not_null_column_with_foreign_key_constraint - * @property integer $not_null_column_with_no_foreign_key_constraint - * @property integer|null $nullable_column_with_foreign_key_constraint - * @property integer|null $nullable_column_with_no_foreign_key_constraint + * @property int $id + * @property int $not_null_column_with_foreign_key_constraint + * @property int $not_null_column_with_no_foreign_key_constraint + * @property int|null $nullable_column_with_foreign_key_constraint + * @property int|null $nullable_column_with_no_foreign_key_constraint * @property-read BelongsToVariation $notNullColumnWithForeignKeyConstraint * @property-read BelongsToVariation|null $notNullColumnWithNoForeignKeyConstraint * @property-read BelongsToVariation|null $nullableColumnWithForeignKeyConstraint @@ -63,11 +63,11 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\CompositeBelongsToVariation * - * @property integer $id - * @property integer $not_null_column_with_foreign_key_constraint - * @property integer $not_null_column_with_no_foreign_key_constraint - * @property integer|null $nullable_column_with_foreign_key_constraint - * @property integer|null $nullable_column_with_no_foreign_key_constraint + * @property int $id + * @property int $not_null_column_with_foreign_key_constraint + * @property int $not_null_column_with_no_foreign_key_constraint + * @property int|null $nullable_column_with_foreign_key_constraint + * @property int|null $nullable_column_with_no_foreign_key_constraint * @property-read CompositeBelongsToVariation $bothNonNullableWithForeignKeyConstraint * @property-read CompositeBelongsToVariation|null $nonNullableMixedWithoutForeignKeyConstraint * @property-read CompositeBelongsToVariation|null $nullableMixedWithForeignKeyConstraint @@ -134,7 +134,7 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\Simple * - * @property integer $id + * @property int $id * @property-read Simple|null $relationBelongsTo * @property-read AnotherModel|null $relationBelongsToInAnotherNamespace * @property-read \Illuminate\Database\Eloquent\Collection $relationBelongsToMany diff --git a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php index 6e5b180..54df564 100644 --- a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php +++ b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model; * Text of existing phpdoc * * @property string $foo - * @property integer $id + * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple query() diff --git a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php index 08f1d06..c5d3538 100644 --- a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php +++ b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartReset\Models\Simple * - * @property integer $id + * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple query() diff --git a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php index 3ba9c2b..de69023 100644 --- a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php +++ b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; /** * Text of existing phpdoc * - * @property integer $id + * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple query() diff --git a/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php index 91a4511..a90886c 100644 --- a/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php @@ -9,15 +9,15 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SimpleCasts\Models\SimpleCast * - * @property integer $cast_to_int - * @property integer $cast_to_integer + * @property int $cast_to_int + * @property int $cast_to_integer * @property float $cast_to_real * @property float $cast_to_float * @property float $cast_to_double * @property string $cast_to_decimal * @property string $cast_to_string - * @property boolean $cast_to_bool - * @property boolean $cast_to_boolean + * @property bool $cast_to_bool + * @property bool $cast_to_boolean * @property object $cast_to_object * @property array $cast_to_array * @property array $cast_to_json @@ -32,7 +32,7 @@ use Illuminate\Database\Eloquent\Model; * @property \Carbon\CarbonImmutable $cast_to_immutable_custom_datetime * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime_serialization - * @property integer $cast_to_timestamp + * @property int $cast_to_timestamp * @property mixed $cast_to_encrypted * @property array $cast_to_encrypted_array * @property \Illuminate\Support\Collection $cast_to_encrypted_collection diff --git a/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php index 0409634..5003b9c 100644 --- a/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SoftDeletes\Models\Simple * - * @property integer $id + * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Simple onlyTrashed() diff --git a/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php index dd1a3d3..5ee2346 100644 --- a/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model; /** * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Variadic\Models\Simple * - * @property integer $id + * @property int $id * @method static Builder|Simple newModelQuery() * @method static Builder|Simple newQuery() * @method static Builder|Simple query() From 02af2a278a9d3186e431022f46e10c87598eeec9 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Mon, 19 Feb 2024 12:59:22 +0100 Subject: [PATCH 3/3] Merge reset/smart reset, don't set class (#1523) * Merge reset/smart reset, don't set class * Add changelog --- CHANGELOG.md | 2 +- src/Console/ModelsCommand.php | 22 +++++-------------- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../Comment/__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__testFactory__1.php | 8 +++---- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 4 ++-- .../__snapshots__/Test__test__1.php | 2 +- .../Getter/__snapshots__/Test__test__1.php | 2 +- .../Ignored/__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../Console/ModelsCommand/ModelHooks/Test.php | 2 +- .../Test__testNoinspectionNotPresent__1.php | 2 +- .../Test__testNoinspectionPresent__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../Relations/__snapshots__/Test__test__1.php | 6 ++--- .../__snapshots__/Test__testReset__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../__snapshots__/Test__test__1.php | 2 +- .../Variadic/__snapshots__/Test__test__1.php | 2 +- 38 files changed, 49 insertions(+), 59 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a304a3..229b2ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. - Support for Laravel 11 [#1520 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1520) ### Changed +- Merge --reset and --smart-reset, to always keep the text. Always skipp the classname [#1523 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1523) - Use short types (`int` and `bool` instead of `integer` and `boolean`) [#1524 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1524) ### Removed @@ -20,7 +21,6 @@ All notable changes to this project will be documented in this file. - You _might_ have top-level dependency on doctrine/dbal. This may have been in the past due to ide-helper, we suggest to check if you still need it and remove it otherwise - Minimum PHP version, due to Laravel 10, is now PHP 8.1 - 2024-02-15, 2.15.1 ------------------ diff --git a/src/Console/ModelsCommand.php b/src/Console/ModelsCommand.php index 65d150e..b6082d1 100644 --- a/src/Console/ModelsCommand.php +++ b/src/Console/ModelsCommand.php @@ -105,7 +105,6 @@ class ModelsCommand extends Command protected $write_mixin = false; protected $dirs = []; protected $reset; - protected $keep_text; protected $phpstorm_noinspections; protected $write_model_external_builder_methods; /** @@ -151,11 +150,8 @@ class ModelsCommand extends Command ); $model = $this->argument('model'); $ignore = $this->option('ignore'); - $this->reset = $this->option('reset'); + $this->reset = $this->option('reset') || $this->option('smart-reset'); $this->phpstorm_noinspections = $this->option('phpstorm-noinspections'); - if ($this->option('smart-reset')) { - $this->keep_text = $this->reset = true; - } $this->write_model_magic_where = $this->laravel['config']->get('ide-helper.write_model_magic_where', true); $this->write_model_external_builder_methods = $this->laravel['config']->get('ide-helper.write_model_external_builder_methods', true); $this->write_model_relation_count_properties = @@ -218,8 +214,8 @@ class ModelsCommand extends Command "Write models to {$this->filename} and adds @mixin to each model, avoiding IDE duplicate declaration warnings", ], ['nowrite', 'N', InputOption::VALUE_NONE, 'Don\'t write to Model file'], - ['reset', 'R', InputOption::VALUE_NONE, 'Remove the original phpdocs instead of appending'], - ['smart-reset', 'r', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'], + ['reset', 'R', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'], + ['smart-reset', 'r', InputOption::VALUE_NONE, 'Deprecated: same as --reset'], ['phpstorm-noinspections', 'p', InputOption::VALUE_NONE, 'Add PhpFullyQualifiedNameUsageInspection and PhpUnnecessaryFullyQualifiedNameInspection PHPStorm ' . 'noinspection tags', @@ -889,19 +885,13 @@ class ModelsCommand extends Command if ($this->reset) { $phpdoc = new DocBlock('', new Context($namespace)); - if ($this->keep_text) { - $phpdoc->setText( - (new DocBlock($reflection, new Context($namespace)))->getText() - ); - } + $phpdoc->setText( + (new DocBlock($reflection, new Context($namespace)))->getText() + ); } else { $phpdoc = new DocBlock($reflection, new Context($namespace)); } - if (!$phpdoc->getText()) { - $phpdoc->setText($class); - } - $properties = []; $methods = []; foreach ($phpdoc->getTags() as $tag) { diff --git a/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php index 281a3f9..2c29482 100644 --- a/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Casts\AsCollection; use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Models\AdvancedCast + * * * @property \Illuminate\Support\Carbon $cast_to_date_serialization * @property \Illuminate\Support\Carbon $cast_to_datetime_serialization diff --git a/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php index 345fc7e..725a26b 100644 --- a/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirecto use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirectory\Services\Post\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/ArrayCastsWithComment/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/ArrayCastsWithComment/__snapshots__/Test__test__1.php index 9dfa034..f4eaf6a 100644 --- a/tests/Console/ModelsCommand/ArrayCastsWithComment/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/ArrayCastsWithComment/__snapshots__/Test__test__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithCo use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithComment\Models\ArrayCastsWithComment + * * * @property array|null $cast_to_array -- These three should not be duplicated * @property array $cast_to_json some-description diff --git a/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php index fe7ead2..032a1c6 100644 --- a/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php @@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Models\Simple + * * * @property int $id * @property int $diverging_type_hinted_get_and_set diff --git a/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php index 0e6a6a8..fa5ab5d 100644 --- a/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\Relations\MorphTo; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Comment\Models\Simple + * * * @property int $id * @property string $both_same_name I'm a getter diff --git a/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php index eb523f6..057aa78 100644 --- a/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomCollection\Models\Simple + * * * @property int $id * @property-read SimpleCollection $relationHasMany diff --git a/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php index cd0e846..6d7fc4a 100644 --- a/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate\Model use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate\Models\CustomDate + * * * @property \Carbon\CarbonImmutable|null $created_at * @property \Carbon\CarbonImmutable|null $updated_at diff --git a/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php index b4e81d6..787a272 100644 --- a/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php @@ -13,7 +13,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGeneratePhpdocWithExternalEloquentBuilder\Models{ /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGeneratePhpdocWithExternalEloquentBuilder\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/DynamicRelations/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/DynamicRelations/__snapshots__/Test__test__1.php index 07a8447..2044204 100644 --- a/tests/Console/ModelsCommand/DynamicRelations/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/DynamicRelations/__snapshots__/Test__test__1.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasOne; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic + * * * @property-read \Illuminate\Database\Eloquent\Collection $regularHasMany * @property-read int|null $regular_has_many_count diff --git a/tests/Console/ModelsCommand/Factories/__snapshots__/Test__testFactory__1.php b/tests/Console/ModelsCommand/Factories/__snapshots__/Test__testFactory__1.php index 1ec977b..211aaba 100644 --- a/tests/Console/ModelsCommand/Factories/__snapshots__/Test__testFactory__1.php +++ b/tests/Console/ModelsCommand/Factories/__snapshots__/Test__testFactory__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithCustomNamespace + * * * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\CustomSpace\ModelWithCustomNamespaceFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace newModelQuery() @@ -41,7 +41,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithFactory + * * * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithFactoryFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory newModelQuery() @@ -60,7 +60,7 @@ declare(strict_types=1); namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithNestedFactory + * * * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithNestedFactoryFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory newModelQuery() @@ -81,7 +81,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithoutFactory + * * * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newQuery() diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php index 780b24b..8a22180 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php index 0573323..a5ead86 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdoc\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php index 55c3c2c..6f9bceb 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocCamel\Models\Post + * * * @property int $id * @property string|null $charNullable diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php index 1f1dae0..08f63ec 100644 --- a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocFinal\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php index f442521..d24d756 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php @@ -13,7 +13,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Models{ /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php index 46c4432..fe55b17 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php @@ -8,7 +8,7 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExte use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilderWithFqn\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php index 2ec9641..5b29b8a 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php index 2bc3a94..b87f750 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php @@ -15,7 +15,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder; use Illuminate\Support\Carbon; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqn\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php index ce70124..a23e112 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php @@ -13,7 +13,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Models{ /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php index 7db2cf7..9f1f4ca 100644 --- a/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php @@ -45,7 +45,7 @@ class Post extends Model namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{ /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models\FinalPost + * * * @property $someProp * @method someMethod(string $method) @@ -60,7 +60,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{ /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models\Post + * * * @property $someProp * @method someMethod(string $method) diff --git a/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php index 9e802be..aabef57 100644 --- a/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenericsSyntaxDisabled\Models\Simple + * * * @property int $id * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularBelongsToMany diff --git a/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php index b33ff8f..d9e703f 100644 --- a/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php @@ -8,7 +8,7 @@ use DateTime; use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Getter\Models\Simple + * * * @property int $id * @property-read int|null $attribute_return_type_int_or_null diff --git a/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php index 43f6607..de0fbfb 100644 --- a/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models; use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models\NotIgnored + * * * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored newQuery() diff --git a/tests/Console/ModelsCommand/Interfaces/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Interfaces/__snapshots__/Test__test__1.php index 6124376..feba784 100644 --- a/tests/Console/ModelsCommand/Interfaces/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Interfaces/__snapshots__/Test__test__1.php @@ -13,7 +13,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Interfaces\Models{ /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Interfaces\Models\User + * * * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|User newQuery() diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php index 4fe3d26..44a4fc8 100644 --- a/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php @@ -23,7 +23,7 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Cas use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Models\CustomCast + * * * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_type * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_docblock diff --git a/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php index 7df0890..caa2c76 100644 --- a/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Model use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/ModelHooks/Test.php b/tests/Console/ModelsCommand/ModelHooks/Test.php index fadaf6c..339c9ef 100644 --- a/tests/Console/ModelsCommand/ModelHooks/Test.php +++ b/tests/Console/ModelsCommand/ModelHooks/Test.php @@ -71,7 +71,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Model use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Models\Simple + * * * @property int $id * @property-read string $custom diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php index 611b4d2..1960bb6 100644 --- a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php +++ b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models\Simple + * * * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php index 18181e5..e34fb0b 100644 --- a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php +++ b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models\Simple + * * * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() diff --git a/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php index 953fe15..b5bc105 100644 --- a/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php @@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\RelationCountProperties\Models\Post + * * * @property int $id * @property string|null $char_nullable diff --git a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php index 1a405a1..01dcdaf 100644 --- a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php @@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\BelongsToVariation + * * * @property int $id * @property int $not_null_column_with_foreign_key_constraint @@ -61,7 +61,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\CompositeBelongsToVariation + * * * @property int $id * @property int $not_null_column_with_foreign_key_constraint @@ -132,7 +132,7 @@ use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\Relations\MorphToMany; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\Simple + * * * @property int $id * @property-read Simple|null $relationBelongsTo diff --git a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php index c5d3538..de69023 100644 --- a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php +++ b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartRes use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartReset\Models\Simple + * Text of existing phpdoc * * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() diff --git a/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php index a90886c..cfcec0b 100644 --- a/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php @@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SimpleCasts\Mode use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SimpleCasts\Models\SimpleCast + * * * @property int $cast_to_int * @property int $cast_to_integer diff --git a/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php index 5003b9c..1e89df1 100644 --- a/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php @@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SoftDeletes\Models\Simple + * * * @property int $id * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery() diff --git a/tests/Console/ModelsCommand/UnionTypes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/UnionTypes/__snapshots__/Test__test__1.php index 67f759e..fec632f 100644 --- a/tests/Console/ModelsCommand/UnionTypes/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/UnionTypes/__snapshots__/Test__test__1.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Query\Builder; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\UnionTypes\Models\UnionTypeModel + * * * @property-read string|int|null $foo * @property-read \Illuminate\Database\Eloquent\Collection $withUnionTypeReturn diff --git a/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php index 5ee2346..ca6b7af 100644 --- a/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php @@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; /** - * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Variadic\Models\Simple + * * * @property int $id * @method static Builder|Simple newModelQuery()