Prepare 3.0 release (#1530)

* Prepare 3.0 release

* Update CHANGELOG.md

* Update CHANGELOG.md

.github/workflows/composer-normalize.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   normalize:
     timeout-minutes: 15
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Git checkout
         uses: actions/checkout@v4

.github/workflows/fix-code-style.yml

@@ -7,7 +7,7 @@ jobs:
   fix-style:
     name: Fix Code Style
     timeout-minutes: 15
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       COMPOSER_NO_INTERACTION: 1
 
@@ -18,7 +18,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.3
           coverage: none
 
       - name: Install dependencies

.github/workflows/run-integration-tests.yml

@@ -12,20 +12,19 @@ on:
 
 jobs:
     php-laravel-integration-tests:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         timeout-minutes: 15
         env:
             COMPOSER_NO_INTERACTION: 1
         strategy:
             fail-fast: false
             matrix:
-                php: [8.3, 8.2, 8.1, 8.0]
+                php: [8.3, 8.2, 8.1]
-                laravel: [10.*, 9.*]
+                laravel: [11.*, 10.*]
                 exclude:
-                  - php: 8.0
+                  - php: 8.1
-                    laravel: 10.*
+                    laravel: 11.*
-                  - php: 8.3
+
-                    laravel: 9.*
         name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
         steps:
             - name: Checkout code

.github/workflows/run-static-analysis.yml

@@ -9,15 +9,15 @@ on:
 jobs:
     build:
         timeout-minutes: 15
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
 
         steps:
             - uses: actions/checkout@v4
-              
+
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                php-version: 8.1
+                php-version: 8.3
                 coverage: none
                 extensions: pdo_sqlite
 

.github/workflows/run-tests.yml

@@ -18,16 +18,15 @@ jobs:
       COMPOSER_NO_INTERACTION: 1
 
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019]
+        os: [ubuntu-22.04, windows-2019]
-        php: [8.3, 8.2, 8.1, 8.0]
+        php: [8.3, 8.2, 8.1]
-        laravel: [9.*, 10.*]
+        laravel: [10.*, 11.*]
-        dependency-version: [prefer-lowest, prefer-stable]
+        stability: [prefer-lowest, prefer-stable]
         exclude:
-          - php: 8.0
+          - php: 8.1
-            laravel: 10.*
+            laravel: 11.*
-          - php: 8.0
-            dependency-version: prefer-lowest
     steps:
     - name: Set git to use LF
       if: ${{ matrix.os == 'windows-2019' }}
@@ -50,7 +49,7 @@ jobs:
         composer remove vimeo/psalm --no-update --dev
         composer remove friendsofphp/php-cs-fixer --no-update --dev
         composer require "laravel/framework:${{ matrix.laravel }}" --no-update --no-progress
-        composer update --prefer-dist --no-progress
+        composer update --prefer-dist --no-progress --${{ matrix.stability }}
 
     - name: Execute Unit Tests
       run: composer test-ci

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.15.0...master)
+[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v3.0.0...master)
 --------------
 
 ### Fixed
@@ -11,6 +11,23 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+2024-03-01, 3.0.0
+------------------
+
+### Added
+- Support for Laravel 11 [#1520 / KentarouTakeda](https://github.com/barryvdh/laravel-ide-helper/pull/1520)
+
+### Changed
+- Make `--reset` always keep the text and remove `--smart-reset`. Always skip the classname [#1523 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1523) & [#1525 / mfn](https://github.com/barryvdh/laravel-ide-helper/pull/1525)
+- 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:
+  - support for custom datatypes has been dropped (config `custom_db_types`) unknown data types default to `string` now and to fix the type, add a proper cast in Eloquent
+  - You _might_ have top-level dependency on doctrine/dbal. This may have been in the past due to ide-helper, we suggest to check if you still need it and remove it otherwise
+  - Minimum PHP version, due to Laravel 10, is now PHP 8.1
+
 2024-02-15, 2.15.1
 ------------------
 

README.md

@@ -11,7 +11,7 @@
 This package generates helper files that enable your IDE to provide accurate autocompletion.
 Generation is done based on the files in your project, so they are always up-to-date.
 
-It supports Laravel 9+ and PHP 8.0+
+The 3.x branch supports Laravel 10 and 11. For older version, use the 2.x releases.
 
 - [Installation](#installation)
 - [Usage](#usage)
@@ -151,7 +151,7 @@ The class name will be different from the model, avoiding the IDE duplicate anno
 
 Writing to the models should keep the existing comments and only append new properties/methods. It will not update changed properties/methods.
 
-With the `--reset (-R)` option, the whole existing PHPDoc is replaced, including any comments that have been made. The `--smart-reset` option will instead keep the 'text' part of the phpdoc comment, and just replace all the property/method defininitions.
+With the `--reset (-R)` option, the whole existing PHPDoc is replaced, including any comments that have been made.
 
 ```bash
 php artisan ide-helper:models "App\Models\Post"
@@ -271,26 +271,6 @@ add support for creating a new dedicated class instead of using local scopes in
 
 If for some reason it's undesired to have them generated (one for each column), you can disable this via config `write_model_external_builder_methods` and setting it to `false`.
 
-#### Unsupported or custom database types
-
-Common column types (e.g. varchar, integer) are correctly mapped to PHP types (`string`, `int`).
-
-But sometimes you may want to use custom column types in your database like `geography`, `jsonb`, `citext`, `bit`, etc. which may throw an "Unknown database type"-Exception.
-
-For those special cases, you can map them via the config `custom_db_types`. Example:
-```php
-'custom_db_types' => [
-    'mysql' => [
-        'geography' => 'array',
-        'point' => 'array',
-    ],
-    'postgresql' => [
-        'jsonb' => 'string',
-        '_int4' => 'array',
-    ],
-],
-```
-
 #### Custom Relationship Types
 
 If you are using relationships not built into Laravel you will need to specify the name and returning class in the config to get proper generation.

composer.json

@@ -20,30 +20,30 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-json": "*",
-        "barryvdh/reflection-docblock": "^2.0.6",
+        "barryvdh/reflection-docblock": "^2.1.1",
         "composer/class-map-generator": "^1.0",
-        "doctrine/dbal": "^2.6 || ^3.1.4",
+        "illuminate/console": "^10 || ^11",
-        "illuminate/console": "^9 || ^10",
+        "illuminate/database": "^10.38 || ^11",
-        "illuminate/filesystem": "^9 || ^10",
+        "illuminate/filesystem": "^10 || ^11",
-        "illuminate/support": "^9 || ^10",
+        "illuminate/support": "^10 || ^11",
         "nikic/php-parser": "^4.18 || ^5",
         "phpdocumentor/type-resolver": "^1.1.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
         "friendsofphp/php-cs-fixer": "^3",
-        "illuminate/config": "^9 || ^10",
+        "illuminate/config": "^9 || ^10 || ^11",
-        "illuminate/view": "^9 || ^10",
+        "illuminate/view": "^9 || ^10 || ^11",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^7 || ^8",
+        "orchestra/testbench": "^8 || ^9",
-        "phpunit/phpunit": "^9",
+        "phpunit/phpunit": "^10.5",
-        "spatie/phpunit-snapshot-assertions": "^4",
+        "spatie/phpunit-snapshot-assertions": "^4 || ^5",
         "vimeo/psalm": "^5.4"
     },
     "suggest": {
-        "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10)."
+        "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9|^10|^11)."
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -65,7 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.15-dev"
+            "dev-master": "3.0-dev"
         },
         "laravel": {
             "providers": [

config/ide-helper.php

@@ -200,36 +200,6 @@ return [
 
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Support for custom DB types
-    |--------------------------------------------------------------------------
-    |
-    | This setting allow you to map any custom database type (that you may have
-    | created using CREATE TYPE statement or imported using database plugin
-    | / extension to a Doctrine type.
-    |
-    | Each key in this array is a name of the Doctrine2 DBAL Platform. Currently valid names are:
-    | 'postgresql', 'db2', 'drizzle', 'mysql', 'oracle', 'sqlanywhere', 'sqlite', 'mssql'
-    |
-    | This name is returned by getName() method of the specific Doctrine/DBAL/Platforms/AbstractPlatform descendant
-    |
-    | The value of the array is an array of type mappings. Key is the name of the custom type,
-    | (for example, "jsonb" from Postgres 9.4) and the value is the name of the corresponding Doctrine2 type (in
-    | our case it is 'json_array'. Doctrine types are listed here:
-    | https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/types.html#types
-    |
-    | So to support jsonb in your models when working with Postgres, just add the following entry to the array below:
-    |
-    | "postgresql" => array(
-    |       "jsonb" => "json_array",
-    |  ),
-    |
-    */
-    'custom_db_types' => [
-
-    ],
-
     /*
      |--------------------------------------------------------------------------
      | Support for camel cased models

phpunit.xml.dist

@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<phpunit
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="vendor/autoload.php"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-         backupGlobals="false"
+        cacheDirectory=".phpunit.result.cache"
-         backupStaticAttributes="false"
+>
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
     <testsuites>
         <testsuite name="Unit Tests">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <coverage>
+    <source>
         <include>
             <directory suffix=".php">src/</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>

src/Console/ModelsCommand.php

@@ -17,8 +17,6 @@ use Barryvdh\Reflection\DocBlock\Context;
 use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 use Barryvdh\Reflection\DocBlock\Tag;
 use Composer\ClassMapGenerator\ClassMapGenerator;
-use Doctrine\DBAL\Exception as DBALException;
-use Doctrine\DBAL\Types\Type;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
@@ -39,6 +37,7 @@ use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Database\Schema\Builder;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
@@ -106,7 +105,6 @@ class ModelsCommand extends Command
     protected $write_mixin = false;
     protected $dirs = [];
     protected $reset;
-    protected $keep_text;
     protected $phpstorm_noinspections;
     protected $write_model_external_builder_methods;
     /**
@@ -154,9 +152,6 @@ class ModelsCommand extends Command
         $ignore = $this->option('ignore');
         $this->reset = $this->option('reset');
         $this->phpstorm_noinspections = $this->option('phpstorm-noinspections');
-        if ($this->option('smart-reset')) {
-            $this->keep_text = $this->reset = true;
-        }
         $this->write_model_magic_where = $this->laravel['config']->get('ide-helper.write_model_magic_where', true);
         $this->write_model_external_builder_methods = $this->laravel['config']->get('ide-helper.write_model_external_builder_methods', true);
         $this->write_model_relation_count_properties =
@@ -219,8 +214,7 @@ class ModelsCommand extends Command
               "Write models to {$this->filename} and adds @mixin to each model, avoiding IDE duplicate declaration warnings",
           ],
           ['nowrite', 'N', InputOption::VALUE_NONE, 'Don\'t write to Model file'],
-          ['reset', 'R', InputOption::VALUE_NONE, 'Remove the original phpdocs instead of appending'],
+          ['reset', 'R', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
-          ['smart-reset', 'r', InputOption::VALUE_NONE, 'Refresh the properties/methods list, but keep the text'],
           ['phpstorm-noinspections', 'p', InputOption::VALUE_NONE,
               'Add PhpFullyQualifiedNameUsageInspection and PhpUnnecessaryFullyQualifiedNameInspection PHPStorm ' .
               'noinspection tags',
@@ -244,8 +238,6 @@ class ModelsCommand extends Command
  */
 \n\n";
 
-        $hasDoctrine = interface_exists('Doctrine\DBAL\Driver');
-
         if (empty($loadModels)) {
             $models = $this->loadModels();
         } else {
@@ -288,9 +280,7 @@ class ModelsCommand extends Command
 
                     $model = $this->laravel->make($name);
 
-                    if ($hasDoctrine) {
+                    $this->getPropertiesFromTable($model);
-                        $this->getPropertiesFromTable($model);
-                    }
 
                     if (method_exists($model, 'getCasts')) {
                         $this->castPropertiesType($model);
@@ -314,13 +304,6 @@ class ModelsCommand extends Command
             }
         }
 
-        if (!$hasDoctrine) {
-            $this->error(
-                'Warning: `"doctrine/dbal": "~2.3"` is required to load database information. ' .
-                'Please require that in your composer.json and run `composer update`.'
-            );
-        }
-
         return $output;
     }
 
@@ -390,7 +373,7 @@ class ModelsCommand extends Command
                     break;
                 case 'boolean':
                 case 'bool':
-                    $realType = 'boolean';
+                    $realType = 'bool';
                     break;
                 case 'decimal':
                 case 'string':
@@ -406,7 +389,7 @@ class ModelsCommand extends Command
                 case 'int':
                 case 'integer':
                 case 'timestamp':
-                    $realType = 'integer';
+                    $realType = 'int';
                     break;
                 case 'real':
                 case 'double':
@@ -508,35 +491,14 @@ class ModelsCommand extends Command
      *
      * @param Model $model
      *
-     * @throws DBALException If custom field failed to register
      */
     public function getPropertiesFromTable($model)
     {
-        $database = $model->getConnection()->getDatabaseName();
+        $table = $model->getTable();
-        $table = $model->getConnection()->getTablePrefix() . $model->getTable();
+        $schema = $model->getConnection()->getSchemaBuilder();
-        $schema = $model->getConnection()->getDoctrineSchemaManager();
+        $columns = $schema->getColumns($table);
-        $databasePlatform = $schema->getDatabasePlatform();
+        $driverName = $model->getConnection()->getDriverName();
-        $databasePlatform->registerDoctrineTypeMapping('enum', 'string');
 
-        if (strpos($table, '.')) {
-            [$database, $table] = explode('.', $table);
-        }
-
-        $platformName = $databasePlatform->getName();
-        $customTypes = $this->laravel['config']->get("ide-helper.custom_db_types.{$platformName}", []);
-        foreach ($customTypes as $yourTypeName => $doctrineTypeName) {
-            try {
-                if (!Type::hasType($yourTypeName)) {
-                    Type::addType($yourTypeName, get_class(Type::getType($doctrineTypeName)));
-                }
-            } catch (DBALException $exception) {
-                $this->error("Failed registering custom db type \"$yourTypeName\" as \"$doctrineTypeName\"");
-                throw $exception;
-            }
-            $databasePlatform->registerDoctrineTypeMapping($yourTypeName, $doctrineTypeName);
-        }
-
-        $columns = $schema->listTableColumns($table, $database);
 
         if (!$columns) {
             return;
@@ -544,50 +506,28 @@ class ModelsCommand extends Command
 
         $this->setForeignKeys($schema, $table);
         foreach ($columns as $column) {
-            $name = $column->getName();
+            $name = $column['name'];
             if (in_array($name, $model->getDates())) {
                 $type = $this->dateClass;
             } else {
-                $type = $column->getType()->getName();
+                // Match types to php equivalent
-                switch ($type) {
+                $type = match ($column['type_name']) {
-                    case 'string':
+                    'tinyint', 'bit',
-                    case 'text':
+                    'integer', 'int', 'int4',
-                    case 'date':
+                    'smallint', 'int2',
-                    case 'time':
+                    'mediumint',
-                    case 'guid':
+                    'bigint', 'int8' => 'int',
-                    case 'datetimetz':
+
-                    case 'datetime':
+                    'boolean', 'bool' => 'bool',
-                    case 'decimal':
+
-                    case 'binary':
+                    'float', 'real', 'float4',
-                        $type = 'string';
+                    'double', 'float8' => 'float',
-                        break;
+
-                    case 'integer':
+                    default => 'string',
-                    case 'bigint':
+                };
-                    case 'smallint':
-                        $type = 'integer';
-                        break;
-                    case 'boolean':
-                        switch ($platformName) {
-                            case 'sqlite':
-                            case 'mysql':
-                                $type = 'integer';
-                                break;
-                            default:
-                                $type = 'boolean';
-                                break;
-                        }
-                        break;
-                    case 'float':
-                        $type = 'float';
-                        break;
-                    default:
-                        $type = 'mixed';
-                        break;
-                }
             }
 
-            $comment = $column->getComment();
+            if ($column['nullable']) {
-            if (!$column->getNotnull()) {
                 $this->nullableColumns[$name] = true;
             }
             $this->setProperty(
@@ -595,8 +535,8 @@ class ModelsCommand extends Command
                 $this->getTypeInModel($model, $type),
                 true,
                 true,
-                $comment,
+                $column['comment'],
-                !$column->getNotnull()
+                $column['nullable']
             );
             if ($this->write_model_magic_where) {
                 $builderClass = $this->write_model_external_builder_methods
@@ -944,19 +884,13 @@ class ModelsCommand extends Command
 
         if ($this->reset) {
             $phpdoc = new DocBlock('', new Context($namespace));
-            if ($this->keep_text) {
+            $phpdoc->setText(
-                $phpdoc->setText(
+                (new DocBlock($reflection, new Context($namespace)))->getText()
-                    (new DocBlock($reflection, new Context($namespace)))->getText()
+            );
-                );
-            }
         } else {
             $phpdoc = new DocBlock($reflection, new Context($namespace));
         }
 
-        if (!$phpdoc->getText()) {
-            $phpdoc->setText($class);
-        }
-
         $properties = [];
         $methods = [];
         foreach ($phpdoc->getTags() as $tag) {
@@ -1681,14 +1615,13 @@ class ModelsCommand extends Command
     }
 
     /**
-     * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $schema
+     * @param Builder $schema
      * @param string $table
-     * @throws DBALException
      */
     protected function setForeignKeys($schema, $table)
     {
-        foreach ($schema->listTableForeignKeys($table) as $foreignKeyConstraint) {
+        foreach ($schema->getForeignKeys($table) as $foreignKeyConstraint) {
-            foreach ($foreignKeyConstraint->getLocalColumns() as $columnName) {
+            foreach ($foreignKeyConstraint['columns'] as $columnName) {
                 $this->foreignKeyConstraintsColumns[] = $columnName;
             }
         }

tests/Console/ModelsCommand/AdvancedCasts/Test.php

@@ -6,18 +6,11 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts;
 
 use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
-use Illuminate\Foundation\Application;
 
 class Test extends AbstractModelsCommand
 {
     public function test(): void
     {
-        if (!version_compare(Application::VERSION, '8.28', '>=')) {
-            $this->markTestSkipped(
-                'This test only works in Laravel >= 8.28'
-            );
-        }
-
         $command = $this->app->make(ModelsCommand::class);
 
         $tester = $this->runCommand($command, [

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

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Casts\AsCollection;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AdvancedCasts\Models\AdvancedCast
+ * 
  *
  * @property \Illuminate\Support\Carbon $cast_to_date_serialization
  * @property \Illuminate\Support\Carbon $cast_to_datetime_serialization
@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property \Carbon\CarbonImmutable $cast_to_immutable_date
  * @property \Carbon\CarbonImmutable $cast_to_immutable_custom_datetime
  * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime
- * @property integer $cast_to_timestamp
+ * @property int $cast_to_timestamp
  * @property mixed $cast_to_encrypted
  * @property array $cast_to_encrypted_array
  * @property \Illuminate\Support\Collection $cast_to_encrypted_collection

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

@@ -7,9 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirecto
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AllowGlobDirectory\Services\Post\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -20,36 +20,34 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -70,10 +68,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -143,8 +141,6 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/ArrayCastsWithComment/__snapshots__/Test__test__1.php

@@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithCo
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ArrayCastsWithComment\Models\ArrayCastsWithComment
+ * 
  *
  * @property array<int, string>|null $cast_to_array -- These three should not be duplicated
  * @property array<int, string> $cast_to_json some-description

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

@@ -8,9 +8,9 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Models\Simple
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property int $diverging_type_hinted_get_and_set
  * @property string|null $name
  * @property-read mixed $non_type_hinted_get

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

@@ -10,9 +10,9 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Comment\Models\Simple
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string $both_same_name I'm a getter
  * @property string $both_without_getter_comment
  * @property-read string $faker_comment

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

@@ -9,9 +9,9 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomCollection\Models\Simple
+ * 
  *
- * @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 = ['*'])

tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php

@@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate\Model
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate\Models\CustomDate
+ * 
  *
  * @property \Carbon\CarbonImmutable|null $created_at
  * @property \Carbon\CarbonImmutable|null $updated_at

tests/Console/ModelsCommand/CustomPhpdocTags/Models/Simple.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomPhpdocTags\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * The `@SuppressWarnings` tag below contains no space before the `(` but when
+ * the class phpdoc is written back, one is inserted.
+ *
+ * @link https://github.com/barryvdh/laravel-ide-helper/issues/666
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
+class Simple extends Model
+{
+}

tests/Console/ModelsCommand/CustomPhpdocTags/Test.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomPhpdocTags;
+
+use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
+use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
+
+class Test extends AbstractModelsCommand
+{
+    /**
+     * This test makes sure that custom phpdoc tags are not mangled, e.g.
+     * there are no spaces inserted etc.
+     *
+     * @link https://github.com/barryvdh/laravel-ide-helper/issues/666
+     */
+    public function testNoSpaceAfterCustomPhpdocTag(): void
+    {
+        $command = $this->app->make(ModelsCommand::class);
+
+        $tester = $this->runCommand($command, [
+            '--write' => true,
+        ]);
+
+        $this->assertSame(0, $tester->getStatusCode());
+        $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
+        $this->assertMatchesMockedSnapshot();
+    }
+}

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

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomPhpdocTags\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * The `@SuppressWarnings` tag below contains no space before the `(` but when
+ * the class phpdoc is written back, one is inserted.
+ *
+ * @link https://github.com/barryvdh/laravel-ide-helper/issues/666
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @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()
+ * @method static \Illuminate\Database\Eloquent\Builder|Simple whereId($value)
+ * @mixin \Eloquent
+ */
+class Simple extends Model
+{
+}

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

@@ -13,9 +13,9 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGeneratePhpdocWithExternalEloquentBuilder\Models{
 /**
- * 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,36 +26,34 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -76,10 +74,10 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -149,8 +147,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/DynamicRelations/__snapshots__/Test__test__1.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DynamicRelations\Models\Dynamic
+ * 
  *
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Dynamic> $regularHasMany
  * @property-read int|null $regular_has_many_count

tests/Console/ModelsCommand/Factories/__snapshots__/Test__testFactory__1.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithCustomNamespace
+ * 
  *
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\CustomSpace\ModelWithCustomNamespaceFactory factory($count = null, $state = [])
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithCustomNamespace newModelQuery()
@@ -41,7 +41,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithFactory
+ * 
  *
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithFactoryFactory factory($count = null, $state = [])
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithFactory newModelQuery()
@@ -60,7 +60,7 @@ declare(strict_types=1);
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithNestedFactory
+ * 
  *
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Factories\ModelWithNestedFactoryFactory factory($count = null, $state = [])
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithNestedFactory newModelQuery()
@@ -81,7 +81,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Factories\Models\ModelWithoutFactory
+ * 
  *
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ModelWithoutFactory newQuery()

tests/Console/ModelsCommand/GenerateBasicPhpDocWithEnumDefaults/Test.php

@@ -11,12 +11,6 @@ class Test extends AbstractModelsCommand
 {
     public function test(): void
     {
-        if (!version_compare(PHP_VERSION, '8.1', '>=')) {
-            $this->markTestSkipped(
-                'This test only works in PHP >= 8.1'
-            );
-        }
-
         $command = $this->app->make(ModelsCommand::class);
 
         $tester = $this->runCommand($command, [

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

@@ -9,9 +9,9 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -22,36 +22,34 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -72,10 +70,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -146,8 +144,6 @@ use Illuminate\Database\Eloquent\Model;
  * @method static Builder|Post whereTinyIntegerNullable($value)
  * @method static Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static Builder|Post whereUnsignedBigIntegerNullable($value)
- * @method static Builder|Post whereUnsignedDecimalNotNullable($value)
- * @method static Builder|Post whereUnsignedDecimalNullable($value)
  * @method static Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static Builder|Post whereUnsignedIntegerNullable($value)
  * @method static Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php

@@ -7,9 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdoc\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -20,36 +20,34 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -70,10 +68,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -143,8 +141,6 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php

@@ -7,9 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocCamel\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $charNullable
  * @property string $charNotNullable
  * @property string|null $stringNullable
@@ -20,36 +20,34 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $mediumTextNotNullable
  * @property string|null $longTextNullable
  * @property string $longTextNotNullable
- * @property integer|null $integerNullable
+ * @property int|null $integerNullable
- * @property integer $integerNotNullable
+ * @property int $integerNotNullable
- * @property integer|null $tinyIntegerNullable
+ * @property int|null $tinyIntegerNullable
- * @property integer $tinyIntegerNotNullable
+ * @property int $tinyIntegerNotNullable
- * @property integer|null $smallIntegerNullable
+ * @property int|null $smallIntegerNullable
- * @property integer $smallIntegerNotNullable
+ * @property int $smallIntegerNotNullable
- * @property integer|null $mediumIntegerNullable
+ * @property int|null $mediumIntegerNullable
- * @property integer $mediumIntegerNotNullable
+ * @property int $mediumIntegerNotNullable
- * @property integer|null $bigIntegerNullable
+ * @property int|null $bigIntegerNullable
- * @property integer $bigIntegerNotNullable
+ * @property int $bigIntegerNotNullable
- * @property integer|null $unsignedIntegerNullable
+ * @property int|null $unsignedIntegerNullable
- * @property integer $unsignedIntegerNotNullable
+ * @property int $unsignedIntegerNotNullable
- * @property integer|null $unsignedTinyIntegerNullable
+ * @property int|null $unsignedTinyIntegerNullable
- * @property integer $unsignedTinyIntegerNotNullable
+ * @property int $unsignedTinyIntegerNotNullable
- * @property integer|null $unsignedSmallIntegerNullable
+ * @property int|null $unsignedSmallIntegerNullable
- * @property integer $unsignedSmallIntegerNotNullable
+ * @property int $unsignedSmallIntegerNotNullable
- * @property integer|null $unsignedMediumIntegerNullable
+ * @property int|null $unsignedMediumIntegerNullable
- * @property integer $unsignedMediumIntegerNotNullable
+ * @property int $unsignedMediumIntegerNotNullable
- * @property integer|null $unsignedBigIntegerNullable
+ * @property int|null $unsignedBigIntegerNullable
- * @property integer $unsignedBigIntegerNotNullable
+ * @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 string|null $unsignedDecimalNullable
+ * @property int|null $booleanNullable
- * @property string $unsignedDecimalNotNullable
+ * @property int $booleanNotNullable
- * @property integer|null $booleanNullable
- * @property integer $booleanNotNullable
  * @property string|null $enumNullable
  * @property string $enumNotNullable
  * @property string|null $jsonNullable
@@ -70,10 +68,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestampNotNullable
  * @property string|null $timestamptzNullable
  * @property string $timestamptzNotNullable
- * @property integer|null $yearNullable
+ * @property int|null $yearNullable
- * @property integer $yearNotNullable
+ * @property int $yearNotNullable
- * @property mixed|null $binaryNullable
+ * @property string|null $binaryNullable
- * @property mixed $binaryNotNullable
+ * @property string $binaryNotNullable
  * @property string|null $uuidNullable
  * @property string $uuidNotNullable
  * @property string|null $ipaddressNullable
@@ -143,8 +141,6 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php

@@ -7,9 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhp
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocFinal\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -20,36 +20,34 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -70,10 +68,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -143,8 +141,6 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php

@@ -13,9 +13,9 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Models{
 /**
- * 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,36 +26,34 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -76,10 +74,10 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -152,8 +150,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereTinyIntegerNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedDecimalNotNullable($value)
- * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedDecimalNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedIntegerNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilder\Builders\PostExternalQueryBuilder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GeneratePhpdocWithExternalEloquentBuilderWithFqn/__snapshots__/Test__test__1.php

@@ -8,9 +8,9 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExte
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithExternalEloquentBuilderWithFqn\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -21,36 +21,34 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -71,10 +69,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -147,8 +145,6 @@ use Illuminate\Database\Eloquent\Model;
  * @method static PostExternalQueryBuilder|Post whereTinyIntegerNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedBigIntegerNullable($value)
- * @method static PostExternalQueryBuilder|Post whereUnsignedDecimalNotNullable($value)
- * @method static PostExternalQueryBuilder|Post whereUnsignedDecimalNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedIntegerNotNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedIntegerNullable($value)
  * @method static PostExternalQueryBuilder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GeneratePhpdocWithForcedFqn/__snapshots__/Test__test__1.php

@@ -9,9 +9,9 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -22,36 +22,34 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -72,10 +70,10 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -149,8 +147,6 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithForcedFqn\Models\Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php

@@ -15,9 +15,9 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Support\Carbon;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqn\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property CastType $char_not_nullable
  * @property string|null $string_nullable
@@ -28,36 +28,34 @@ use Illuminate\Support\Carbon;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -78,10 +76,10 @@ use Illuminate\Support\Carbon;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -155,8 +153,6 @@ use Illuminate\Support\Carbon;
  * @method static EloquentBuilder|Post whereTinyIntegerNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedBigIntegerNullable($value)
- * @method static EloquentBuilder|Post whereUnsignedDecimalNotNullable($value)
- * @method static EloquentBuilder|Post whereUnsignedDecimalNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedIntegerNotNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedIntegerNullable($value)
  * @method static EloquentBuilder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/__snapshots__/Test__test__1.php

@@ -13,9 +13,9 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Models{
 /**
- * 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,36 +26,34 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -76,10 +74,10 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -149,8 +147,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereTinyIntegerNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedDecimalNotNullable($value)
- * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedDecimalNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedIntegerNullable($value)
  * @method static \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders\EMaterialQueryBuilder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php

@@ -45,7 +45,7 @@ class Post extends Model
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models\FinalPost
+ * 
  *
  * @property $someProp
  * @method someMethod(string $method)
@@ -60,11 +60,11 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models\Post
+ * 
  *
  * @property $someProp
  * @method someMethod(string $method)
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -75,36 +75,34 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -125,10 +123,10 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -198,8 +196,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/GenericsSyntaxDisabled/__snapshots__/Test__test__1.php

@@ -9,9 +9,9 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenericsSyntaxDisabled\Models\Simple
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularBelongsToMany
  * @property-read int|null $regular_belongs_to_many_count
  * @property-read \Illuminate\Database\Eloquent\Collection|Simple[] $regularHasMany

tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php

@@ -8,9 +8,9 @@ use DateTime;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Getter\Models\Simple
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property-read int|null $attribute_return_type_int_or_null
  * @property-read array $attribute_returns_array
  * @property-read bool $attribute_returns_bool

tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php

@@ -7,7 +7,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models\NotIgnored
+ * 
  *
  * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|NotIgnored newQuery()

tests/Console/ModelsCommand/Interfaces/Models/User.php

@@ -19,6 +19,11 @@ class User extends Model implements Authenticatable
         // TODO: Implement getAuthIdentifier() method.
     }
 
+    public function getAuthPasswordName()
+    {
+        // TODO: Implement getAuthPasswordName() method.
+    }
+
     public function getAuthPassword()
     {
         // TODO: Implement getAuthPassword() method.

tests/Console/ModelsCommand/Interfaces/__snapshots__/Test__test__1.php

@@ -13,7 +13,7 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Interfaces\Models{
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Interfaces\Models\User
+ * 
  *
  * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User newQuery()

tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test__1.php

@@ -23,7 +23,7 @@ use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Cas
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Models\CustomCast
+ * 
  *
  * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_type
  * @property \Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Casts\CastedProperty $casted_property_with_return_docblock

tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php

@@ -7,9 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Model
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -20,36 +20,34 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -70,10 +68,10 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable

tests/Console/ModelsCommand/ModelHooks/Test.php

@@ -71,7 +71,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Model
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ModelHooks\Models\Simple
+ * 
  *
  * @property int $id
  * @property-read string $custom

tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php

@@ -7,9 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models\Simple
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple query()

tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php

@@ -7,9 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspec
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models\Simple
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple query()

tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php

@@ -8,9 +8,9 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\RelationCountProperties\Models\Post
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property string|null $char_nullable
  * @property string $char_not_nullable
  * @property string|null $string_nullable
@@ -21,36 +21,34 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * @property string $medium_text_not_nullable
  * @property string|null $long_text_nullable
  * @property string $long_text_not_nullable
- * @property integer|null $integer_nullable
+ * @property int|null $integer_nullable
- * @property integer $integer_not_nullable
+ * @property int $integer_not_nullable
- * @property integer|null $tiny_integer_nullable
+ * @property int|null $tiny_integer_nullable
- * @property integer $tiny_integer_not_nullable
+ * @property int $tiny_integer_not_nullable
- * @property integer|null $small_integer_nullable
+ * @property int|null $small_integer_nullable
- * @property integer $small_integer_not_nullable
+ * @property int $small_integer_not_nullable
- * @property integer|null $medium_integer_nullable
+ * @property int|null $medium_integer_nullable
- * @property integer $medium_integer_not_nullable
+ * @property int $medium_integer_not_nullable
- * @property integer|null $big_integer_nullable
+ * @property int|null $big_integer_nullable
- * @property integer $big_integer_not_nullable
+ * @property int $big_integer_not_nullable
- * @property integer|null $unsigned_integer_nullable
+ * @property int|null $unsigned_integer_nullable
- * @property integer $unsigned_integer_not_nullable
+ * @property int $unsigned_integer_not_nullable
- * @property integer|null $unsigned_tiny_integer_nullable
+ * @property int|null $unsigned_tiny_integer_nullable
- * @property integer $unsigned_tiny_integer_not_nullable
+ * @property int $unsigned_tiny_integer_not_nullable
- * @property integer|null $unsigned_small_integer_nullable
+ * @property int|null $unsigned_small_integer_nullable
- * @property integer $unsigned_small_integer_not_nullable
+ * @property int $unsigned_small_integer_not_nullable
- * @property integer|null $unsigned_medium_integer_nullable
+ * @property int|null $unsigned_medium_integer_nullable
- * @property integer $unsigned_medium_integer_not_nullable
+ * @property int $unsigned_medium_integer_not_nullable
- * @property integer|null $unsigned_big_integer_nullable
+ * @property int|null $unsigned_big_integer_nullable
- * @property integer $unsigned_big_integer_not_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 string|null $unsigned_decimal_nullable
+ * @property int|null $boolean_nullable
- * @property string $unsigned_decimal_not_nullable
+ * @property int $boolean_not_nullable
- * @property integer|null $boolean_nullable
- * @property integer $boolean_not_nullable
  * @property string|null $enum_nullable
  * @property string $enum_not_nullable
  * @property string|null $json_nullable
@@ -71,10 +69,10 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * @property string $timestamp_not_nullable
  * @property string|null $timestamptz_nullable
  * @property string $timestamptz_not_nullable
- * @property integer|null $year_nullable
+ * @property int|null $year_nullable
- * @property integer $year_not_nullable
+ * @property int $year_not_nullable
- * @property mixed|null $binary_nullable
+ * @property string|null $binary_nullable
- * @property mixed $binary_not_nullable
+ * @property string $binary_not_nullable
  * @property string|null $uuid_nullable
  * @property string $uuid_not_nullable
  * @property string|null $ipaddress_nullable
@@ -145,8 +143,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereTinyIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedBigIntegerNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNotNullable($value)
- * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedDecimalNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNotNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedIntegerNullable($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Post whereUnsignedMediumIntegerNotNullable($value)

tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php

@@ -8,13 +8,13 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\BelongsToVariation
+ * 
  *
- * @property integer $id
+ * @property int $id
- * @property integer $not_null_column_with_foreign_key_constraint
+ * @property int $not_null_column_with_foreign_key_constraint
- * @property integer $not_null_column_with_no_foreign_key_constraint
+ * @property int $not_null_column_with_no_foreign_key_constraint
- * @property integer|null $nullable_column_with_foreign_key_constraint
+ * @property int|null $nullable_column_with_foreign_key_constraint
- * @property integer|null $nullable_column_with_no_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
@@ -61,13 +61,13 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\CompositeBelongsToVariation
+ * 
  *
- * @property integer $id
+ * @property int $id
- * @property integer $not_null_column_with_foreign_key_constraint
+ * @property int $not_null_column_with_foreign_key_constraint
- * @property integer $not_null_column_with_no_foreign_key_constraint
+ * @property int $not_null_column_with_no_foreign_key_constraint
- * @property integer|null $nullable_column_with_foreign_key_constraint
+ * @property int|null $nullable_column_with_foreign_key_constraint
- * @property integer|null $nullable_column_with_no_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
@@ -132,9 +132,9 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models\Simple
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @property-read Simple|null $relationBelongsTo
  * @property-read AnotherModel|null $relationBelongsToInAnotherNamespace
  * @property-read \Illuminate\Database\Eloquent\Collection<int, Simple> $relationBelongsToMany

tests/Console/ModelsCommand/ResetAndSmartReset/Test.php

@@ -35,18 +35,4 @@ class Test extends AbstractModelsCommand
         $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
         $this->assertMatchesMockedSnapshot();
     }
-
-    public function testSmartReset(): void
-    {
-        $command = $this->app->make(ModelsCommand::class);
-
-        $tester = $this->runCommand($command, [
-            '--write' => true,
-            '--smart-reset' => true,
-        ]);
-
-        $this->assertSame(0, $tester->getStatusCode());
-        $this->assertStringContainsString('Written new phpDocBlock to', $tester->getDisplay());
-        $this->assertMatchesMockedSnapshot();
-    }
 }

tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
  * Text of existing phpdoc
  *
  * @property string $foo
- * @property integer $id
+ * @property int $id
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple query()

tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php

@@ -7,9 +7,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartRes
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartReset\Models\Simple
+ * Text of existing phpdoc
  *
- * @property 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()

tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 /**
  * Text of existing phpdoc
  *
- * @property integer $id
+ * @property int $id
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple query()

tests/Console/ModelsCommand/SimpleCasts/__snapshots__/Test__test__1.php

@@ -7,17 +7,17 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SimpleCasts\Mode
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SimpleCasts\Models\SimpleCast
+ * 
  *
- * @property integer $cast_to_int
+ * @property int $cast_to_int
- * @property integer $cast_to_integer
+ * @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 bool $cast_to_bool
- * @property boolean $cast_to_boolean
+ * @property bool $cast_to_boolean
  * @property object $cast_to_object
  * @property array $cast_to_array
  * @property array $cast_to_json
@@ -32,7 +32,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property \Carbon\CarbonImmutable $cast_to_immutable_custom_datetime
  * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime
  * @property \Carbon\CarbonImmutable $cast_to_immutable_datetime_serialization
- * @property integer $cast_to_timestamp
+ * @property int $cast_to_timestamp
  * @property mixed $cast_to_encrypted
  * @property array $cast_to_encrypted_array
  * @property \Illuminate\Support\Collection $cast_to_encrypted_collection

tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php

@@ -8,9 +8,9 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SoftDeletes\Models\Simple
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Simple onlyTrashed()

tests/Console/ModelsCommand/UnionTypes/__snapshots__/Test__test__1.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Query\Builder;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\UnionTypes\Models\UnionTypeModel
+ * 
  *
  * @property-read string|int|null $foo
  * @property-read \Illuminate\Database\Eloquent\Collection<int, UnionTypeModel> $withUnionTypeReturn

tests/Console/ModelsCommand/Variadic/__snapshots__/Test__test__1.php

@@ -8,9 +8,9 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Variadic\Models\Simple
+ * 
  *
- * @property integer $id
+ * @property int $id
  * @method static Builder|Simple newModelQuery()
  * @method static Builder|Simple newQuery()
  * @method static Builder|Simple query()

tests/Console/ModelsCommand/migrations/____posts_table.php

@@ -67,9 +67,6 @@ class PostsTable extends Migration
             $table->decimal('decimal_nullable')->nullable();
             $table->decimal('decimal_not_nullable');
 
-            $table->unsignedDecimal('unsigned_decimal_nullable')->nullable();
-            $table->unsignedDecimal('unsigned_decimal_not_nullable');
-
             $table->boolean('boolean_nullable')->nullable();
             $table->boolean('boolean_not_nullable');