Skip to content

Commit d7ed749

Browse files
barryvdhbarryvdh
authored
Use int/bool instead of longer variant (#1524)
* Use int/bool instead of longer variant * Add changelog * Update snapshots
1 parent 9af62e2 commit d7ed749

File tree

32 files changed

+387
-384
lines changed

32 files changed

+387
-384
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ All notable changes to this project will be documented in this file.
1010
### Added
1111
- Support for Laravel 11 [#1520 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1520)
1212

13+
### Changed
14+
- Use short types (`int` and `bool` instead of `integer` and `boolean`) [#1524 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1524)
15+
1316
### Removed
1417
- Support for Laravel 9 and use of doctrine/dbal [#1512 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1512)
1518
With this functionality gone, a few changes have been made:

‎src/Console/ModelsCommand.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public function castPropertiesType($model)
378378
break;
379379
case 'boolean':
380380
case 'bool':
381-
$realType = 'boolean';
381+
$realType = 'bool';
382382
break;
383383
case 'decimal':
384384
case 'string':
@@ -394,7 +394,7 @@ public function castPropertiesType($model)
394394
case 'int':
395395
case 'integer':
396396
case 'timestamp':
397-
$realType = 'integer';
397+
$realType = 'int';
398398
break;
399399
case 'real':
400400
case 'double':
@@ -521,9 +521,9 @@ public function getPropertiesFromTable($model)
521521
'integer', 'int', 'int4',
522522
'smallint', 'int2',
523523
'mediumint',
524-
'bigint', 'int8' => 'integer',
524+
'bigint', 'int8' => 'int',
525525

526-
'boolean', 'bool' => 'boolean',
526+
'boolean', 'bool' => 'bool',
527527

528528
'float', 'real', 'float4',
529529
'double', 'float8' => 'float',

‎tests/Console/ModelsCommand/AdvancedCasts/__snapshots__/Test__test__1.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @property \Carbon\CarbonImmutable $cast_to_immutable_date
1818
* @property \Carbon\CarbonImmutable $cast_to_immutable_custom_datetime
1919
* @property \Carbon\CarbonImmutable $cast_to_immutable_datetime
20-
* @property integer $cast_to_timestamp
20+
* @property int $cast_to_timestamp
2121
* @property mixed $cast_to_encrypted
2222
* @property array $cast_to_encrypted_array
2323
* @property \Illuminate\Support\Collection $cast_to_encrypted_collection

‎tests/Console/ModelsCommand/AllowGlobDirectory/__snapshots__/Test__test__1.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirectory\Services\Post\Models\Post
1111
*
12-
* @property integer $id
12+
* @property int $id
1313
* @property string|null $char_nullable
1414
* @property string $char_not_nullable
1515
* @property string|null $string_nullable
@@ -20,34 +20,34 @@
2020
* @property string $medium_text_not_nullable
2121
* @property string|null $long_text_nullable
2222
* @property string $long_text_not_nullable
23-
* @property integer|null $integer_nullable
24-
* @property integer $integer_not_nullable
25-
* @property integer|null $tiny_integer_nullable
26-
* @property integer $tiny_integer_not_nullable
27-
* @property integer|null $small_integer_nullable
28-
* @property integer $small_integer_not_nullable
29-
* @property integer|null $medium_integer_nullable
30-
* @property integer $medium_integer_not_nullable
31-
* @property integer|null $big_integer_nullable
32-
* @property integer $big_integer_not_nullable
33-
* @property integer|null $unsigned_integer_nullable
34-
* @property integer $unsigned_integer_not_nullable
35-
* @property integer|null $unsigned_tiny_integer_nullable
36-
* @property integer $unsigned_tiny_integer_not_nullable
37-
* @property integer|null $unsigned_small_integer_nullable
38-
* @property integer $unsigned_small_integer_not_nullable
39-
* @property integer|null $unsigned_medium_integer_nullable
40-
* @property integer $unsigned_medium_integer_not_nullable
41-
* @property integer|null $unsigned_big_integer_nullable
42-
* @property integer $unsigned_big_integer_not_nullable
23+
* @property int|null $integer_nullable
24+
* @property int $integer_not_nullable
25+
* @property int|null $tiny_integer_nullable
26+
* @property int $tiny_integer_not_nullable
27+
* @property int|null $small_integer_nullable
28+
* @property int $small_integer_not_nullable
29+
* @property int|null $medium_integer_nullable
30+
* @property int $medium_integer_not_nullable
31+
* @property int|null $big_integer_nullable
32+
* @property int $big_integer_not_nullable
33+
* @property int|null $unsigned_integer_nullable
34+
* @property int $unsigned_integer_not_nullable
35+
* @property int|null $unsigned_tiny_integer_nullable
36+
* @property int $unsigned_tiny_integer_not_nullable
37+
* @property int|null $unsigned_small_integer_nullable
38+
* @property int $unsigned_small_integer_not_nullable
39+
* @property int|null $unsigned_medium_integer_nullable
40+
* @property int $unsigned_medium_integer_not_nullable
41+
* @property int|null $unsigned_big_integer_nullable
42+
* @property int $unsigned_big_integer_not_nullable
4343
* @property float|null $float_nullable
4444
* @property float $float_not_nullable
4545
* @property float|null $double_nullable
4646
* @property float $double_not_nullable
4747
* @property string|null $decimal_nullable
4848
* @property string $decimal_not_nullable
49-
* @property integer|null $boolean_nullable
50-
* @property integer $boolean_not_nullable
49+
* @property int|null $boolean_nullable
50+
* @property int $boolean_not_nullable
5151
* @property string|null $enum_nullable
5252
* @property string $enum_not_nullable
5353
* @property string|null $json_nullable
@@ -68,8 +68,8 @@
6868
* @property string $timestamp_not_nullable
6969
* @property string|null $timestamptz_nullable
7070
* @property string $timestamptz_not_nullable
71-
* @property integer|null $year_nullable
72-
* @property integer $year_not_nullable
71+
* @property int|null $year_nullable
72+
* @property int $year_not_nullable
7373
* @property string|null $binary_nullable
7474
* @property string $binary_not_nullable
7575
* @property string|null $uuid_nullable

‎tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Models\Simple
1212
*
13-
* @property integer $id
13+
* @property int $id
1414
* @property int $diverging_type_hinted_get_and_set
1515
* @property string|null $name
1616
* @property-read mixed $non_type_hinted_get

‎tests/Console/ModelsCommand/Comment/__snapshots__/Test__test__1.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/**
1313
* Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Comment\Models\Simple
1414
*
15-
* @property integer $id
15+
* @property int $id
1616
* @property string $both_same_name I'm a getter
1717
* @property string $both_without_getter_comment
1818
* @property-read string $faker_comment

‎tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomCollection\Models\Simple
1313
*
14-
* @property integer $id
14+
* @property int $id
1515
* @property-read SimpleCollection<int, Simple> $relationHasMany
1616
* @property-read int|null $relation_has_many_count
1717
* @method static SimpleCollection<int, static> all($columns = ['*'])

‎tests/Console/ModelsCommand/CustomPhpdocTags/__snapshots__/Test__testNoSpaceAfterCustomPhpdocTag__1.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @link https://github.com/barryvdh/laravel-ide-helper/issues/666
1414
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
15-
* @property integer $id
15+
* @property int $id
1616
* @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
1717
* @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
1818
* @method static \Illuminate\Database\Eloquent\Builder|Simple query()

‎tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGeneratePhpdocWithExternalEloquentBuilder\Models\Post
1717
*
18-
* @property integer $id
18+
* @property int $id
1919
* @property string|null $char_nullable
2020
* @property string $char_not_nullable
2121
* @property string|null $string_nullable
@@ -26,34 +26,34 @@
2626
* @property string $medium_text_not_nullable
2727
* @property string|null $long_text_nullable
2828
* @property string $long_text_not_nullable
29-
* @property integer|null $integer_nullable
30-
* @property integer $integer_not_nullable
31-
* @property integer|null $tiny_integer_nullable
32-
* @property integer $tiny_integer_not_nullable
33-
* @property integer|null $small_integer_nullable
34-
* @property integer $small_integer_not_nullable
35-
* @property integer|null $medium_integer_nullable
36-
* @property integer $medium_integer_not_nullable
37-
* @property integer|null $big_integer_nullable
38-
* @property integer $big_integer_not_nullable
39-
* @property integer|null $unsigned_integer_nullable
40-
* @property integer $unsigned_integer_not_nullable
41-
* @property integer|null $unsigned_tiny_integer_nullable
42-
* @property integer $unsigned_tiny_integer_not_nullable
43-
* @property integer|null $unsigned_small_integer_nullable
44-
* @property integer $unsigned_small_integer_not_nullable
45-
* @property integer|null $unsigned_medium_integer_nullable
46-
* @property integer $unsigned_medium_integer_not_nullable
47-
* @property integer|null $unsigned_big_integer_nullable
48-
* @property integer $unsigned_big_integer_not_nullable
29+
* @property int|null $integer_nullable
30+
* @property int $integer_not_nullable
31+
* @property int|null $tiny_integer_nullable
32+
* @property int $tiny_integer_not_nullable
33+
* @property int|null $small_integer_nullable
34+
* @property int $small_integer_not_nullable
35+
* @property int|null $medium_integer_nullable
36+
* @property int $medium_integer_not_nullable
37+
* @property int|null $big_integer_nullable
38+
* @property int $big_integer_not_nullable
39+
* @property int|null $unsigned_integer_nullable
40+
* @property int $unsigned_integer_not_nullable
41+
* @property int|null $unsigned_tiny_integer_nullable
42+
* @property int $unsigned_tiny_integer_not_nullable
43+
* @property int|null $unsigned_small_integer_nullable
44+
* @property int $unsigned_small_integer_not_nullable
45+
* @property int|null $unsigned_medium_integer_nullable
46+
* @property int $unsigned_medium_integer_not_nullable
47+
* @property int|null $unsigned_big_integer_nullable
48+
* @property int $unsigned_big_integer_not_nullable
4949
* @property float|null $float_nullable
5050
* @property float $float_not_nullable
5151
* @property float|null $double_nullable
5252
* @property float $double_not_nullable
5353
* @property string|null $decimal_nullable
5454
* @property string $decimal_not_nullable
55-
* @property integer|null $boolean_nullable
56-
* @property integer $boolean_not_nullable
55+
* @property int|null $boolean_nullable
56+
* @property int $boolean_not_nullable
5757
* @property string|null $enum_nullable
5858
* @property string $enum_not_nullable
5959
* @property string|null $json_nullable
@@ -74,8 +74,8 @@
7474
* @property string $timestamp_not_nullable
7575
* @property string|null $timestamptz_nullable
7676
* @property string $timestamptz_not_nullable
77-
* @property integer|null $year_nullable
78-
* @property integer $year_not_nullable
77+
* @property int|null $year_nullable
78+
* @property int $year_not_nullable
7979
* @property string|null $binary_nullable
8080
* @property string $binary_not_nullable
8181
* @property string|null $uuid_nullable

‎tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models\Post
1313
*
14-
* @property integer $id
14+
* @property int $id
1515
* @property string|null $char_nullable
1616
* @property string $char_not_nullable
1717
* @property string|null $string_nullable
@@ -22,34 +22,34 @@
2222
* @property string $medium_text_not_nullable
2323
* @property string|null $long_text_nullable
2424
* @property string $long_text_not_nullable
25-
* @property integer|null $integer_nullable
26-
* @property integer $integer_not_nullable
27-
* @property integer|null $tiny_integer_nullable
28-
* @property integer $tiny_integer_not_nullable
29-
* @property integer|null $small_integer_nullable
30-
* @property integer $small_integer_not_nullable
31-
* @property integer|null $medium_integer_nullable
32-
* @property integer $medium_integer_not_nullable
33-
* @property integer|null $big_integer_nullable
34-
* @property integer $big_integer_not_nullable
35-
* @property integer|null $unsigned_integer_nullable
36-
* @property integer $unsigned_integer_not_nullable
37-
* @property integer|null $unsigned_tiny_integer_nullable
38-
* @property integer $unsigned_tiny_integer_not_nullable
39-
* @property integer|null $unsigned_small_integer_nullable
40-
* @property integer $unsigned_small_integer_not_nullable
41-
* @property integer|null $unsigned_medium_integer_nullable
42-
* @property integer $unsigned_medium_integer_not_nullable
43-
* @property integer|null $unsigned_big_integer_nullable
44-
* @property integer $unsigned_big_integer_not_nullable
25+
* @property int|null $integer_nullable
26+
* @property int $integer_not_nullable
27+
* @property int|null $tiny_integer_nullable
28+
* @property int $tiny_integer_not_nullable
29+
* @property int|null $small_integer_nullable
30+
* @property int $small_integer_not_nullable
31+
* @property int|null $medium_integer_nullable
32+
* @property int $medium_integer_not_nullable
33+
* @property int|null $big_integer_nullable
34+
* @property int $big_integer_not_nullable
35+
* @property int|null $unsigned_integer_nullable
36+
* @property int $unsigned_integer_not_nullable
37+
* @property int|null $unsigned_tiny_integer_nullable
38+
* @property int $unsigned_tiny_integer_not_nullable
39+
* @property int|null $unsigned_small_integer_nullable
40+
* @property int $unsigned_small_integer_not_nullable
41+
* @property int|null $unsigned_medium_integer_nullable
42+
* @property int $unsigned_medium_integer_not_nullable
43+
* @property int|null $unsigned_big_integer_nullable
44+
* @property int $unsigned_big_integer_not_nullable
4545
* @property float|null $float_nullable
4646
* @property float $float_not_nullable
4747
* @property float|null $double_nullable
4848
* @property float $double_not_nullable
4949
* @property string|null $decimal_nullable
5050
* @property string $decimal_not_nullable
51-
* @property integer|null $boolean_nullable
52-
* @property integer $boolean_not_nullable
51+
* @property int|null $boolean_nullable
52+
* @property int $boolean_not_nullable
5353
* @property string|null $enum_nullable
5454
* @property string $enum_not_nullable
5555
* @property string|null $json_nullable
@@ -70,8 +70,8 @@
7070
* @property string $timestamp_not_nullable
7171
* @property string|null $timestamptz_nullable
7272
* @property string $timestamptz_not_nullable
73-
* @property integer|null $year_nullable
74-
* @property integer $year_not_nullable
73+
* @property int|null $year_nullable
74+
* @property int $year_not_nullable
7575
* @property string|null $binary_nullable
7676
* @property string $binary_not_nullable
7777
* @property string|null $uuid_nullable

0 commit comments

Comments
 (0)