Fix final class keyword (#1517)

* Fix final class keyword

* Add changelog

.gitattributes

@@ -2,14 +2,14 @@
 # https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
 
 # Ignore all test and documentation with "export-ignore".
-/.gitattributes     export-ignore
+/.editorconfig                export-ignore
-/.github            export-ignore
+/.gitattributes               export-ignore
-/.gitignore         export-ignore
+/.github                      export-ignore
-/.editorconfig      export-ignore
+/.gitignore                   export-ignore
-/phpunit.xml.dist   export-ignore
+/.php-cs-fixer.cache          export-ignore
-/tests              export-ignore
+/.php-cs-fixer.php            export-ignore
-/.php_cs.common.php export-ignore
+/.php-cs-fixer.tests.cache    export-ignore
-/.php_cs.dist       export-ignore
+/phpunit.xml.dist             export-ignore
-/.php_cs.tests.php  export-ignore
+/psalm-baseline.xml           export-ignore
-/psalm.xml          export-ignore
+/psalm.xml                    export-ignore
-/psalm-baseline.xml export-ignore
+/tests                        export-ignore

CHANGELOG.md

@@ -11,9 +11,18 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-2024-02-14, 2.15.0
+2024-02-15, 2.15.1
 ------------------
 
+### Fixed
+- Fix final class keyword in wrong position [#1517 / barryvdh](https://github.com/barryvdh/laravel-ide-helper/pull/1517)
+
+### Changed
+
+### Added
+
+2024-02-14, 2.15.0
+------------------
 ### Fixed
 - Fix case issue in `ModelsCommand::unsetMethod()` [#1453 / leo108](https://github.com/barryvdh/laravel-ide-helper/pull/1453)
 - Fix non-facade classes will result in no autocomplete [#841 / netpok](https://github.com/barryvdh/laravel-ide-helper/pull/841)

src/Console/ModelsCommand.php

@@ -1083,7 +1083,7 @@ class ModelsCommand extends Command
         $classname = $this->write_mixin ? $mixinClassName : $classname;
 
         $allowDynamicAttributes = $this->write_mixin ? "#[\AllowDynamicProperties]\n\t" : '';
-        $output = "namespace {$namespace}{\n{$docComment}\n\t{$keyword}{$allowDynamicAttributes}class {$classname} ";
+        $output = "namespace {$namespace}{\n{$docComment}\n\t{$allowDynamicAttributes}{$keyword}class {$classname} ";
 
         if (!$this->write_mixin) {
             $output .= "extends \Eloquent ";

tests/Console/ModelsCommand/GeneratePhpdocWithMixin/Models/FinalPost.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property $someProp
+ * @method someMethod(string $method)
+ * @mixin IdeHelperPost
+ */
+final class FinalPost extends Model
+{
+}

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

@@ -6,6 +6,22 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWi
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @property $someProp
+ * @method someMethod(string $method)
+ * @mixin IdeHelperFinalPost
+ */
+final class FinalPost extends Model
+{
+}
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
 /**
  * @property $someProp
  * @method someMethod(string $method)
@@ -27,6 +43,21 @@ 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)
+ * @method static \Illuminate\Database\Eloquent\Builder|FinalPost newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|FinalPost newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|FinalPost query()
+ * @mixin \Eloquent
+ */
+	#[\AllowDynamicProperties]
+	final class IdeHelperFinalPost {}
+}
+
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models{
 /**
  * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithMixin\Models\Post