Add support for decimal column type (#1739 )

* Add support for `decimal` column type Previously `decimal` columns were represented with a cast. This now is no longer the case and instead the column type itself is `decimal`. This change takes that into account. * The column type may also be `numeric` * Update tests
Bump the deps group across 1 directory with 2 updates (#1743 )
2026-08-18 10:07:12 +00:00 · 2025-12-10 10:11:07 +01:00 · 2025-12-10 10:10:25 +01:00 · 2025-12-10 10:10:09 +01:00 · 2025-12-10 10:09:42 +01:00 · 2025-10-01 15:12:26 +02:00
29 changed files with 119 additions and 52 deletions
@@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Validate Composer configuration
        run: composer validate --strict
@@ -23,6 +23,6 @@ jobs:
          composer global require ergebnis/composer-normalize
          composer normalize

-      - uses: stefanzweifel/git-auto-commit-action@v6
+      - uses: stefanzweifel/git-auto-commit-action@v7
        with:
          commit_message: normalize composer.json
@@ -13,7 +13,7 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: Setup PHP
        uses: shivammathur/setup-php@v2
@@ -27,7 +27,7 @@ jobs:
      - run: composer fix-style
        continue-on-error: true

-      - uses: stefanzweifel/git-auto-commit-action@v6
+      - uses: stefanzweifel/git-auto-commit-action@v7
        with:
          commit_message: composer fix-style
          commit_author: laravel-ide-helper <[email protected]>
@@ -25,7 +25,7 @@ jobs:
        name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
        steps:
            - name: Checkout code
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
              with:
                  path: src

@@ -12,7 +12,7 @@ jobs:
        runs-on: ubuntu-22.04

        steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v6

            - name: Setup PHP
              uses: shivammathur/setup-php@v2
@@ -21,7 +21,7 @@ jobs:
      fail-fast: false
      matrix:
        os: [ubuntu-latest]
-        php: [8.4, 8.3, 8.2]
+        php: [8.5, 8.4, 8.3, 8.2]
        laravel: [~11.15, 12.x]
        stability: [prefer-lowest, prefer-stable]
        include:
@@ -37,7 +37,7 @@ jobs:
        git config --global core.eol lf

    - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6

    - name: Setup PHP
      uses: shivammathur/setup-php@v2
@@ -16,7 +16,7 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
        with:
          ref: ${{ github.event.release.target_commitish }}

@@ -27,7 +27,7 @@ jobs:
          release-notes: ${{ github.event.release.body }}

      - name: Commit updated CHANGELOG
-        uses: stefanzweifel/git-auto-commit-action@v6
+        uses: stefanzweifel/git-auto-commit-action@v7
        with:
          branch: ${{ github.event.release.target_commitish }}
          commit_message: Update CHANGELOG
@@ -1,5 +1,37 @@
 # Changelog

+## v3.6.0 - 2025-07-18
+
+### What's Changed
+
+* fix: Change AsArrayObject cast to be Laravel's ArrayObject by @wsamoht in https://github.com/barryvdh/laravel-ide-helper/pull/1675
+* Add extends declaration for Macroable classes to fix missing inherited methods by @KentarouTakeda in https://github.com/barryvdh/laravel-ide-helper/pull/1674
+* fix(meta): ignore aliases in the autoloader (Fixes #1671) by @pataar in https://github.com/barryvdh/laravel-ide-helper/pull/1686
+* feat(ModelsCommand): add support for the new Scope attribute by @pataar in https://github.com/barryvdh/laravel-ide-helper/pull/1694
+* fix type change for scope default float parameter by @nivseb in https://github.com/barryvdh/laravel-ide-helper/pull/1697
+* Revert #1629 - *Allow adding custom Macroable classes* by @erikn69 in https://github.com/barryvdh/laravel-ide-helper/pull/1707
+* Configurable macro return type defaults by @erikn69 in https://github.com/barryvdh/laravel-ide-helper/pull/1711
+* docs(readme): add Laravel 12 support information by @SantosVilanculos in https://github.com/barryvdh/laravel-ide-helper/pull/1717
+* Add multi-level directory support for translation files by @RosiersRobin in https://github.com/barryvdh/laravel-ide-helper/pull/1718
+* Support `AsCollection::of($map)`, `AsCollection::using($class, $map)` by @erikn69 in https://github.com/barryvdh/laravel-ide-helper/pull/1714
+* fix: Fixed wrong doc for SoftDeletes `withTrashed` method by @eldair in https://github.com/barryvdh/laravel-ide-helper/pull/1688
+* Support other OS on tests by @erikn69 in https://github.com/barryvdh/laravel-ide-helper/pull/1715
+* Fix tests on windows by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1720
+* Bump stefanzweifel/git-auto-commit-action from 5 to 6 in the deps group by @dependabot[bot] in https://github.com/barryvdh/laravel-ide-helper/pull/1719
+* Update .gitattributes - avoid all `.php-cs-fixer` files on vendor by @erikn69 in https://github.com/barryvdh/laravel-ide-helper/pull/1708
+* fix(ModelsCommand): use 'string' as realType for 'encrypted' casts by @pataar in https://github.com/barryvdh/laravel-ide-helper/pull/1698
+* Trim strings and bump reflection docblock by @barryvdh in https://github.com/barryvdh/laravel-ide-helper/pull/1721
+* Add magic *_exists properties by @erikn69 in https://github.com/barryvdh/laravel-ide-helper/pull/1712
+
+### New Contributors
+
+* @wsamoht made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1675
+* @nivseb made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1697
+* @SantosVilanculos made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1717
+* @RosiersRobin made their first contribution in https://github.com/barryvdh/laravel-ide-helper/pull/1718
+
+**Full Changelog**: https://github.com/barryvdh/laravel-ide-helper/compare/v3.5.5...v3.6.0
+
 ## v3.5.5 - 2025-02-21

 ### What's Changed
@@ -51,7 +51,7 @@ php artisan ide-helper:models -RW

 If you don't want the full _ide_helper.php file, you can run add `--write-eloquent-helper` to the model command to generate small version, which is required for the `@mixin \Eloquent` to be able to add the QueryBuilder methods.

-If you don't want to add all the phpdocs to your Models directly, you can use `--nowrite` to create a seperate file. The  `--write-mixin` option can be used to only add a `@mixin` to your models, but add the generated phpdocs in a seperate file. This avoids having the results marked as duplicate.
+If you don't want to add all the phpdocs to your Models directly, you can use `--nowrite` to create a separate file. The  `--write-mixin` option can be used to only add a `@mixin` to your models, but add the generated phpdocs in a separate file. This avoids having the results marked as duplicate.


 _Check out [this Laracasts video](https://laracasts.com/series/how-to-be-awesome-in-phpstorm/episodes/15) for a quick introduction/explanation!_
@@ -212,7 +212,7 @@ If for some reason it's undesired to have them generated (one for each column),

 #### Magic `*_count` and `*_exists` properties

-You may use the [`::withCount`](https://laravel.com/docs/master/eloquent-relationships#counting-related-models) and [`::withExists`](https://laravel.com/docs/master/eloquent-relationships#other-aggregate-functions) methodsto count the number results from a relationship without actually loading them. Those results are then placed in attributes following the `<columname>_count` and `<columname>_exists` convention.
+You may use the [`::withCount`](https://laravel.com/docs/master/eloquent-relationships#counting-related-models) and [`::withExists`](https://laravel.com/docs/master/eloquent-relationships#other-aggregate-functions) methods to count the number results from a relationship without actually loading them. Those results are then placed in attributes following the `<columnname>_count` and `<columnname>_exists` convention.

 By default, these attributes are generated in the phpdoc. You can turn them off by setting the config `write_model_relation_count_properties` and `write_model_relation_exists_properties` to `false`.

@@ -124,7 +124,6 @@ $reflection = new ReflectionClass($loader);
 $property = $reflection->hasProperty('paths')
    ? $reflection->getProperty('paths')
    : $reflection->getProperty('path');
-$property->setAccessible(true);

 $paths = Illuminate\Support\Arr::wrap($property->getValue($loader));

@@ -256,6 +256,8 @@ class Alias
            if ($fake !== $real) {
                $this->addClass(get_class($fake));
            }
+        } catch (Throwable $throwable) {
+            // Ignore error
        } finally {
            $facade::swap($real);
        }
@@ -584,6 +584,8 @@ class ModelsCommand extends Command
                    'float', 'real', 'float4',
                    'double', 'float8' => 'float',

+                    'decimal', 'numeric' => 'numeric',
+
                    default => 'string',
                };
            }
@@ -887,7 +889,6 @@ class ModelsCommand extends Command

        if (in_array($relation, ['hasOne', 'hasOneThrough', 'morphOne'], true)) {
            $defaultProp = $reflectionObj->getProperty('withDefault');
-            $defaultProp->setAccessible(true);

            return !$defaultProp->getValue($relationObj);
        }
@@ -897,7 +898,6 @@ class ModelsCommand extends Command
        }

        $fkProp = $reflectionObj->getProperty('foreignKey');
-        $fkProp->setAccessible(true);

        $enforceNullableRelation = $this->laravel['config']->get('ide-helper.enforce_nullable_relationships', true);

@@ -930,7 +930,6 @@ class ModelsCommand extends Command
        }

        $fkProp = $reflectionObj->getProperty('foreignKey');
-        $fkProp->setAccessible(true);

        foreach (Arr::wrap($fkProp->getValue($relationObj)) as $foreignKey) {
            if (isset($this->nullableColumns[$foreignKey])) {
@@ -1283,9 +1282,6 @@ class ModelsCommand extends Command
     */
    protected function getAttributeTypes(Model $model, \ReflectionMethod $reflectionMethod): Collection
    {
-        // Private/protected ReflectionMethods require setAccessible prior to PHP 8.1
-        $reflectionMethod->setAccessible(true);
-
        /** @var Attribute $attribute */
        $attribute = $reflectionMethod->invoke($model);

@@ -16,7 +16,6 @@ class Factories
            $factory = app(Factory::class);

            $definitions = (new ReflectionClass(Factory::class))->getProperty('definitions');
-            $definitions->setAccessible(true);

            foreach ($definitions->getValue($factory) as $factory_target => $config) {
                try {
@@ -178,7 +178,7 @@ class Method
    /**
     * Get the parameters for this method
     *
-     * @param bool $implode Wether to implode the array or not
+     * @param bool $implode Whether to implode the array or not
     * @return string
     */
    public function getParams($implode = true)
@@ -208,7 +208,7 @@ class Method
    /**
     * Get the parameters for this method including default values
     *
-     * @param bool $implode Wether to implode the array or not
+     * @param bool $implode Whether to implode the array or not
     * @return string
     */
    public function getParamsWithDefault($implode = true)
@@ -9,6 +9,7 @@ use Barryvdh\LaravelIdeHelper\Macro;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Facade;

 /**
 * @internal
@@ -66,6 +67,22 @@ class AliasTest extends TestCase
        $this->assertNotNull($this->getAliasMacro($alias, EloquentBuilder::class, $macro));
    }

+    /**
+     * @covers ::detectFake
+     */
+    public function testNoExceptionOnRequiredFakeParameters(): void
+    {
+        // Mock
+        $alias = new AliasMock();
+
+        // Prepare
+        $alias->setFacade(MockFacade::class);
+        $this->expectNotToPerformAssertions();
+
+        // Test
+        $alias->detectFake();
+    }
+
    /**
     * @covers ::detectTemplateNames
     */
@@ -118,4 +135,26 @@ class AliasMock extends Alias
    {
        parent::detectMethods();
    }
+
+    public function detectFake()
+    {
+        parent::detectFake();
+    }
+
+    public function setFacade(string $facade)
+    {
+        $this->facade = $facade;
+    }
+}
+
+class MockFacade extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return '';
+    }
+
+    public static function fake(string $test1, $test2 = null)
+    {
+    }
 }
@@ -42,8 +42,8 @@ use Illuminate\Database\Eloquent\Model;
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -48,8 +48,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\DoesNotGenerateP
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -44,8 +44,8 @@ use Illuminate\Database\Eloquent\Model;
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -42,8 +42,8 @@ use Illuminate\Database\Eloquent\Model;
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -42,8 +42,8 @@ use Illuminate\Database\Eloquent\Model;
 * @property float $floatNotNullable
 * @property float|null $doubleNullable
 * @property float $doubleNotNullable
- * @property string|null $decimalNullable
- * @property string $decimalNotNullable
+ * @property numeric|null $decimalNullable
+ * @property numeric $decimalNotNullable
 * @property int|null $booleanNullable
 * @property int $booleanNotNullable
 * @property string|null $enumNullable
@@ -42,8 +42,8 @@ use Illuminate\Database\Eloquent\Model;
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -48,8 +48,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -43,8 +43,8 @@ use Illuminate\Database\Eloquent\Model;
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -44,8 +44,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -50,8 +50,8 @@ use Illuminate\Support\Carbon;
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -48,8 +48,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -95,8 +95,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -42,8 +42,8 @@ use Illuminate\Database\Eloquent\Model;
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -81,8 +81,8 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\QueryScopes\Mode
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
@@ -43,8 +43,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 * @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 numeric|null $decimal_nullable
+ * @property numeric $decimal_not_nullable
 * @property int|null $boolean_nullable
 * @property int $boolean_not_nullable
 * @property string|null $enum_nullable
Author	SHA1	Message	Date
Yannick Schinko	b106f7ee85	Add support for `decimal` column type (#1739 ) * Add support for `decimal` column type Previously `decimal` columns were represented with a cast. This now is no longer the case and instead the column type itself is `decimal`. This change takes that into account. * The column type may also be `numeric` * Update tests	2025-12-10 10:11:07 +01:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	d61d20357e	Bump the deps group across 1 directory with 2 updates (#1743 ) Bumps the deps group with 2 updates in the / directory: [actions/checkout](https://github.com/actions/checkout) and [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action). Updates `actions/checkout` from 5 to 6 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) Updates `stefanzweifel/git-auto-commit-action` from 6 to 7 - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major dependency-group: deps - dependency-name: stefanzweifel/git-auto-commit-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major dependency-group: deps ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-12-10 10:10:25 +01:00
Jesper Noordsij	e9283c40a2	Remove calls to PHP 8.5-deprecated setAccessible (#1744 ) These are no-op as of PHP 8.1 and thus no longer needed See also https://wiki.php.net/rfc/make-reflection-setaccessible-no-op	2025-12-10 10:10:09 +01:00
WentTheFox	12a0d7d54c	Fix alias fake error (#1745 ) * Add catch block in Alias::detectFake * Update Alias unit tests	2025-12-10 10:09:42 +01:00
Serhii Petrov	9ef25f60e7	Add php 8.5 support (#1735 )	2025-10-01 15:12:26 +02:00
Keita Shima	8dff6bb5ff	Fix typos in documentation and code comments (#1733 ) - Fixed 'seperate' to 'separate' in README.md (2 occurrences) - Fixed 'columname' to 'columnname' in README.md (2 occurrences) - Fixed 'Wether' to 'Whether' in src/Method.php PHPDoc comments (2 occurrences)	2025-09-15 14:14:26 +02:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	53854ea7d9	Bump actions/checkout from 4 to 5 in the deps group (#1731 ) Bumps the deps group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 4 to 5 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major dependency-group: deps ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-02 16:32:00 +02:00
Peter Jørgensen	1fa84a3b65	fix `methodsto` typo (#1723 )	2025-08-04 15:07:10 +02:00
barryvdh	5e973967a7	Update CHANGELOG	2025-07-18 14:10:29 +00:00