Merge branch 'master' into feat-always-smart-reset

barryvdh · Feb 19, 2024 · 5af6789 · 5af6789
2 parents 2253dcc + d7ed749
commit 5af6789
Show file tree

Hide file tree

Showing 32 changed files with 385 additions and 384 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 
 ### 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
 - Support for Laravel 9 and use of doctrine/dbal [#1512 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1512) 

diff --git a/src/Console/ModelsCommand.php b/src/Console/ModelsCommand.php
@@ -374,7 +374,7 @@ public function castPropertiesType($model)
                     break;
                 case 'boolean':
                 case 'bool':
-                    $realType = 'boolean';
+                    $realType = 'bool';
                     break;
                 case 'decimal':
                 case 'string':
@@ -390,7 +390,7 @@ public function castPropertiesType($model)
                 case 'int':
                 case 'integer':
                 case 'timestamp':
-                    $realType = 'integer';
+                    $realType = 'int';
                     break;
                 case 'real':
                 case 'double':
@@ -517,9 +517,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
@@ -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
@@ -9,7 +9,7 @@
 /**
  * 
  *
- * @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
@@ -10,7 +10,7 @@
 /**
  * 
  *
- * @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
@@ -12,7 +12,7 @@
 /**
  * 
  *
- * @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
@@ -11,7 +11,7 @@
 /**
  * 
  *
- * @property integer $id
+ * @property int $id
  * @property-read SimpleCollection<int, Simple> $relationHasMany
  * @property-read int|null $relation_has_many_count
  * @method static SimpleCollection<int, static> all($columns = ['*'])

diff --git a/...ModelsCommand/CustomPhpdocTags/__snapshots__/Test__testNoSpaceAfterCustomPhpdocTag__1.php b/...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/...sCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php b/...sCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php
@@ -15,7 +15,7 @@
 /**
  * 
  *
- * @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/...Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php b/...Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/__snapshots__/Test__test__1.php
@@ -11,7 +11,7 @@
 /**
  * 
  *
- * @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
@@ -9,7 +9,7 @@
 /**
  * 
  *
- * @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