From d7ed749f3e1bf3ca2c28c79e3247b550b04198aa Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Mon, 19 Feb 2024 12:39:07 +0100 Subject: [PATCH] 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 fe6fa3ee7..4a304a3a6 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 4c6966125..65d150ecc 100644 --- a/src/Console/ModelsCommand.php +++ b/src/Console/ModelsCommand.php @@ -378,7 +378,7 @@ public function castPropertiesType($model) break; case 'boolean': case 'bool': - $realType = 'boolean'; + $realType = 'bool'; break; case 'decimal': case 'string': @@ -394,7 +394,7 @@ public function castPropertiesType($model) case 'int': case 'integer': case 'timestamp': - $realType = 'integer'; + $realType = 'int'; break; case 'real': case 'double': @@ -521,9 +521,9 @@ public function getPropertiesFromTable($model) '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 12a9f0d73..281a3f977 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 @@ * @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 3b8209487..345fc7e97 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 @@ /** * 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 @@ * @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 @@ * @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 8cb89618f..fe7ead26a 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 @@ /** * 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 c3c9686ab..0e6a6a818 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 @@ /** * 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 0b107689f..eb523f6d7 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 @@ /** * 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 6f883e164..801f533fd 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 @@ * * @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 d0489f429..b4e81d6d0 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 @@ /** * 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 @@ * @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 @@ * @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 170ec54f2..780b24b37 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 @@ /** * 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 @@ * @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 @@ * @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 3fc88b69e..057332308 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 @@ /** * 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 @@ * @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 @@ * @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 9663109c1..55c3c2c7f 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 @@ /** * 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 @@ * @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 @@ * @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 1d56199b1..1f1dae001 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 @@ /** * 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 @@ * @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 @@ * @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 9bfd95f73..f44252112 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 @@ /** * 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 @@ * @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 @@ * @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 cf869f7b0..46c4432b5 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 @@ /** * 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 @@ * @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 @@ * @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 1900cab76..2ec964148 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 @@ /** * 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 @@ * @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 @@ * @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 db379394f..2bc3a940a 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 @@ /** * 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 @@ * @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 @@ * @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 8c8f4b990..ce701244b 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 @@ /** * 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 @@ * @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 @@ * @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 f0bfe9c99..7db2cf795 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 @@ final class IdeHelperFinalPost {} * * @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 @@ final class IdeHelperFinalPost {} * @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 @@ final class IdeHelperFinalPost {} * @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 99c20c0b2..9e802be61 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 @@ /** * 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 94b0a3eb3..b33ff8f07 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 @@ /** * 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 c3e2dcdbc..7df0890e8 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 @@ /** * 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 @@ * @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 @@ * @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 25c0e3b6d..611b4d215 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 @@ /** * 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 9cb1f276a..18181e568 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 @@ /** * 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 7460981f4..953fe15cf 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 @@ /** * 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 @@ * @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 @@ * @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 dd6f642b8..1a405a134 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 @@ /** * 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 @@ public function nullableColumnWithNoForeignKeyConstraint(): 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 @@ public function nullableMixedWithForeignKeyConstraint(): BelongsTo /** * 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 6e5b18017..54df5649f 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 @@ * 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 08f1d063c..c5d3538e9 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 @@ /** * 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 3ba9c2b3d..de69023ef 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 @@ /** * 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 91a45111b..a90886ca8 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 @@ /** * 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 @@ * @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 040963480..5003b9ce3 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 @@ /** * 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 dd1a3d3d7..5ee234652 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 @@ /** * 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()