From ba95d18ef55c91295250ae8b7bfa73d8fb866b9b Mon Sep 17 00:00:00 2001
From: Markus Podar <markus@fischer.name>
Date: Mon, 10 Aug 2020 10:22:48 +0200
Subject: [PATCH] [PHPCS] Extend to check/fix all source code and turn GHA into
 auto-commit fixer (#1003)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* phpcs: enable also for config, resources and tests

* composer fix-style

* vendor/bin/phpunit -d --update-snapshots

* gha: instead of checking the style, fix and auto-commit it 💪
---
 .github/workflows/run-tests.yml               | 18 ++++--
 composer.json                                 |  4 +-
 config/ide-helper.php                         |  2 +-
 resources/views/helper.php                    | 63 +++++++++----------
 resources/views/meta.php                      | 16 ++---
 .../ModelsCommand/AbstractModelsCommand.php   |  4 +-
 .../CustomCollection/Models/Simple.php        |  4 +-
 .../ModelsCommand/CustomCollection/Test.php   |  4 +-
 .../__snapshots__/Test__test__1.php           |  4 +-
 .../CustomDate/Models/CustomDate.php          |  4 +-
 .../Console/ModelsCommand/CustomDate/Test.php |  4 +-
 .../__snapshots__/Test__test__1.php           |  4 +-
 .../GenerateBasicPhpdoc/Models/Post.php       |  4 +-
 .../GenerateBasicPhpdoc/Test.php              |  4 +-
 .../__snapshots__/Test__test__1.php           |  4 +-
 .../GenerateBasicPhpdocCamel/Models/Post.php  |  4 +-
 .../GenerateBasicPhpdocCamel/Test.php         |  4 +-
 .../__snapshots__/Test__test__1.php           |  4 +-
 .../GenerateBasicPhpdocFinal/Models/Post.php  |  4 +-
 .../GenerateBasicPhpdocFinal/Test.php         |  4 +-
 .../__snapshots__/Test__test__1.php           |  4 +-
 .../GeneratePhpdocWithFqn/Models/Post.php     |  4 +-
 .../GeneratePhpdocWithFqn/Test.php            |  4 +-
 .../__snapshots__/Test__test__1.php           |  4 +-
 .../Builders/EMaterialQueryBuilder.php        |  4 +-
 .../Models/Post.php                           |  4 +-
 .../Test.php                                  |  4 +-
 .../ModelsCommand/Getter/Models/Simple.php    |  4 +-
 tests/Console/ModelsCommand/Getter/Test.php   |  4 +-
 .../Getter/__snapshots__/Test__test__1.php    |  4 +-
 .../ModelsCommand/Ignored/Models/Ignored.php  |  4 +-
 .../Ignored/Models/NotIgnored.php             |  4 +-
 tests/Console/ModelsCommand/Ignored/Test.php  |  4 +-
 .../Ignored/__snapshots__/Test__test__1.php   |  4 +-
 .../ModelsCommand/Interfaces/Models/User.php  |  4 +-
 .../Console/ModelsCommand/Interfaces/Test.php |  4 +-
 .../Casts/CastedProperty.php                  |  2 +-
 .../Casts/CustomCasterWithDocblockReturn.php  |  2 +-
 ...ustomCasterWithNullablePrimitiveReturn.php |  2 +-
 ...ustomCasterWithPrimitiveDocblockReturn.php |  2 +-
 .../Casts/CustomCasterWithPrimitiveReturn.php |  2 +-
 .../Casts/CustomCasterWithReturnType.php      |  2 +-
 .../Casts/CustomCasterWithoutReturnType.php   |  2 +-
 .../LaravelCustomCasts/Models/CustomCast.php  |  4 +-
 .../ModelsCommand/LaravelCustomCasts/Test.php |  6 +-
 ..._parses_casted_properties_correctly__1.php |  4 +-
 .../ModelsCommand/MagicWhere/Models/Post.php  |  4 +-
 .../Console/ModelsCommand/MagicWhere/Test.php |  4 +-
 .../__snapshots__/Test__test__1.php           |  4 +-
 .../PHPStormNoInspection/Models/Simple.php    |  4 +-
 .../PHPStormNoInspection/Test.php             |  5 +-
 .../Test__testNoinspectionNotPresent__1.php   |  4 +-
 .../Test__testNoinspectionPresent__1.php      |  4 +-
 .../RelationCountProperties/Models/Post.php   |  4 +-
 .../RelationCountProperties/Test.php          |  4 +-
 .../__snapshots__/Test__test__1.php           |  4 +-
 .../ModelsCommand/Relations/Models/Simple.php |  4 +-
 .../ModelsOtherNamespace/AnotherModel.php     |  4 +-
 .../Console/ModelsCommand/Relations/Test.php  |  4 +-
 .../Relations/__snapshots__/Test__test__1.php |  4 +-
 .../ResetAndSmartReset/Models/Simple.php      |  4 +-
 .../ModelsCommand/ResetAndSmartReset/Test.php |  4 +-
 .../__snapshots__/Test__testNoReset__1.php    |  4 +-
 .../__snapshots__/Test__testReset__1.php      |  4 +-
 .../__snapshots__/Test__testSmartReset__1.php |  4 +-
 .../SoftDeletes/Models/Simple.php             |  4 +-
 .../ModelsCommand/SoftDeletes/Test.php        |  4 +-
 .../__snapshots__/Test__test__1.php           |  4 +-
 .../migrations/____custom_casts_table.php     |  4 +-
 .../migrations/____custom_dates_table.php     |  4 +-
 .../migrations/____posts_table.php            |  4 +-
 .../migrations/____simple_table.php           |  4 +-
 tests/MethodTest.php                          |  4 +-
 tests/TestCase.php                            |  4 +-
 74 files changed, 249 insertions(+), 119 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index dc753dc..5209c60 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -39,8 +39,8 @@ jobs:
     - name: Execute Unit Tests
       run: composer test
 
-  check-style:
-    name: Check Code Style
+  fix-style:
+    name: Fix Code Style
     timeout-minutes: 15
     runs-on: ubuntu-latest
     env:
@@ -55,10 +55,20 @@ jobs:
         with:
           php-version: 7.4
           coverage: none
-        
+          tools: composer:v2
+
       - name: Install dependencies
         run: |
           composer remove phpro/grumphp vimeo/psalm --no-update --dev
           composer update --prefer-dist --no-suggest --no-progress
 
-      - run: composer check-style
+      - run: composer fix-style
+        continue-on-error: true
+
+      # Revert modifications so they don't get commited 💥
+      - run: git checkout -- composer.json
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: composer fix-style
+          commit_author: laravel-ide-helper <laravel-ide-helper@users.noreply.github.com>
diff --git a/composer.json b/composer.json
index 57ad7dd..9787c2c 100644
--- a/composer.json
+++ b/composer.json
@@ -64,8 +64,8 @@
     },
     "scripts": {
         "analyze": "psalm",
-        "check-style": "phpcs -p --standard=PSR12 src/",
-        "fix-style": "phpcbf -p --standard=PSR12 src/",
+        "check-style": "phpcs -p --standard=PSR12 config/ resources/ src/ tests/ '--ignore=*__snapshots_*'",
+        "fix-style": "phpcbf -p --standard=PSR12 config/ resources/ src/ tests/ '--ignore=*__snapshots_*'",
         "test": "phpunit",
         "test-regenerate": "phpunit -d --update-snapshots"
     }
diff --git a/config/ide-helper.php b/config/ide-helper.php
index bec4fc9..c0b252a 100644
--- a/config/ide-helper.php
+++ b/config/ide-helper.php
@@ -99,7 +99,7 @@ return array(
     'include_helpers' => false,
 
     'helper_files' => array(
-        base_path().'/vendor/laravel/framework/src/Illuminate/Support/helpers.php',
+        base_path() . '/vendor/laravel/framework/src/Illuminate/Support/helpers.php',
     ),
 
     /*
diff --git a/resources/views/helper.php b/resources/views/helper.php
index 40dfecc..d4d2fb8 100644
--- a/resources/views/helper.php
+++ b/resources/views/helper.php
@@ -20,66 +20,63 @@
  * @see https://github.com/barryvdh/laravel-ide-helper
  */
 
-<?php foreach($namespaces_by_extends_ns as $namespace => $aliases): ?>
-<?php if ($namespace == '\Illuminate\Database\Eloquent'): continue; endif; ?>
+<?php foreach ($namespaces_by_extends_ns as $namespace => $aliases) : ?>
+    <?php if ($namespace == '\Illuminate\Database\Eloquent') :
+        continue;
+    endif; ?>
 namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> { 
-<?php foreach($aliases as $alias): ?>
-
-    <?= trim($alias->getDocComment('    ')) ?> 
-    <?= $alias->getClassType() ?> <?= $alias->getExtendsClass() ?> {
-        <?php foreach($alias->getMethods() as $method): ?>
-
-        <?= trim($method->getDocComment('        ')) ?> 
+    <?php foreach ($aliases as $alias) : ?>
+        <?= trim($alias->getDocComment('    ')) ?> 
+        <?= $alias->getClassType() ?> <?= $alias->getExtendsClass() ?> {
+        <?php foreach ($alias->getMethods() as $method) : ?>
+            <?= trim($method->getDocComment('        ')) ?> 
         public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
-        {<?php if($method->getDeclaringClass() !== $method->getRoot()): ?>
-
+        {<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
             //Method inherited from <?= $method->getDeclaringClass() ?>
-            <?php endif; ?>
+         <?php endif; ?>
 
-            <?php if($method->isInstanceCall()):?>
+            <?php if ($method->isInstanceCall()) :?>
             /** @var <?=$method->getRoot()?> $instance */
             <?php endif?>
-            <?= $method->shouldReturn() ? 'return ': '' ?><?= $method->getRootMethodCall() ?>;
+            <?= $method->shouldReturn() ? 'return ' : '' ?><?= $method->getRootMethodCall() ?>;
         }
         <?php endforeach; ?> 
     }
-<?php endforeach; ?> 
+    <?php endforeach; ?> 
 }
 
 <?php endforeach; ?>
 
-<?php foreach($namespaces_by_alias_ns as $namespace => $aliases): ?>
+<?php foreach ($namespaces_by_alias_ns as $namespace => $aliases) : ?>
 namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> { 
-<?php foreach($aliases as $alias): ?>
-
-    <?= $alias->getClassType() ?> <?= $alias->getShortName() ?> extends <?= $alias->getExtends() ?> {<?php if ($alias->getExtendsNamespace() == '\Illuminate\Database\Eloquent'): ?>
-        <?php foreach($alias->getMethods() as $method): ?> 
-            <?= trim($method->getDocComment('            ')) ?> 
+    <?php foreach ($aliases as $alias) : ?>
+        <?= $alias->getClassType() ?> <?= $alias->getShortName() ?> extends <?= $alias->getExtends() ?> {<?php if ($alias->getExtendsNamespace() == '\Illuminate\Database\Eloquent') : ?>
+            <?php foreach ($alias->getMethods() as $method) : ?> 
+                <?= trim($method->getDocComment('            ')) ?> 
             public static function <?= $method->getName() ?>(<?= $method->getParamsWithDefault() ?>)
-            {<?php if($method->getDeclaringClass() !== $method->getRoot()): ?>
-    
+            {<?php if ($method->getDeclaringClass() !== $method->getRoot()) : ?>
                 //Method inherited from <?= $method->getDeclaringClass() ?>
-                <?php endif; ?>
+             <?php endif; ?>
 
-                <?php if($method->isInstanceCall()):?>
+                <?php if ($method->isInstanceCall()) :?>
                 /** @var <?=$method->getRoot()?> $instance */
                 <?php endif?>
-                <?= $method->shouldReturn() ? 'return ': '' ?><?= $method->getRootMethodCall() ?>;
+                <?= $method->shouldReturn() ? 'return ' : '' ?><?= $method->getRootMethodCall() ?>;
             }
-        <?php endforeach; ?>
-<?php endif; ?>}
-<?php endforeach; ?> 
+            <?php endforeach; ?>
+        <?php endif; ?>}
+    <?php endforeach; ?> 
 }
 
 <?php endforeach; ?>
 
-<?php if($helpers): ?>
+<?php if ($helpers) : ?>
 namespace {
-<?= $helpers ?> 
+    <?= $helpers ?> 
 }
 <?php endif; ?>
 
-<?php if($include_fluent): ?>
+<?php if ($include_fluent) : ?>
 namespace Illuminate\Support {
     /**
      * Methods commonly used in migrations
@@ -106,7 +103,7 @@ namespace Illuminate\Support {
 }
 <?php endif ?>
 
-<?php foreach ($factories as $factory): ?>
+<?php foreach ($factories as $factory) : ?>
 namespace <?=$factory->getNamespaceName()?> {
     /**
     * @method \Illuminate\Database\Eloquent\Collection|<?=$factory->getShortName()?>[]|<?=$factory->getShortName()?> create($attributes = [])
diff --git a/resources/views/meta.php b/resources/views/meta.php
index bcac7d6..51d87da 100644
--- a/resources/views/meta.php
+++ b/resources/views/meta.php
@@ -10,22 +10,22 @@ namespace PHPSTORM_META {
     * @author Barry vd. Heuvel <barryvdh@gmail.com>
     * @see https://github.com/barryvdh/laravel-ide-helper
     */
-<?php foreach ($methods as $method): ?>
+<?php foreach ($methods as $method) : ?>
     override(<?= $method ?>, map([
         '' => '@',
-<?php foreach($bindings as $abstract => $class): ?>
+    <?php foreach ($bindings as $abstract => $class) : ?>
         '<?= $abstract ?>' => \<?= $class ?>::class,
-<?php endforeach; ?>
+    <?php endforeach; ?>
     ]));
 <?php endforeach; ?>
 
-<?php if (count($factories)): ?>
-	override(\factory(0), map([
+<?php if (count($factories)) : ?>
+    override(\factory(0), map([
         '' => '@FactoryBuilder',
-<?php foreach($factories as $factory): ?>
+    <?php foreach ($factories as $factory) : ?>
         '<?= $factory->getName() ?>' => \<?= $factory->getName() ?>FactoryBuilder::class,
-<?php endforeach; ?>
-	]));
+    <?php endforeach; ?>
+    ]));
 <?php endif; ?>
 
     override(\Illuminate\Support\Arr::add(0), type(0));
diff --git a/tests/Console/ModelsCommand/AbstractModelsCommand.php b/tests/Console/ModelsCommand/AbstractModelsCommand.php
index 4ea52ef..d2fce45 100644
--- a/tests/Console/ModelsCommand/AbstractModelsCommand.php
+++ b/tests/Console/ModelsCommand/AbstractModelsCommand.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand;
 
diff --git a/tests/Console/ModelsCommand/CustomCollection/Models/Simple.php b/tests/Console/ModelsCommand/CustomCollection/Models/Simple.php
index 02a85ad..c87c4d3 100644
--- a/tests/Console/ModelsCommand/CustomCollection/Models/Simple.php
+++ b/tests/Console/ModelsCommand/CustomCollection/Models/Simple.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomCollection\Models;
 
diff --git a/tests/Console/ModelsCommand/CustomCollection/Test.php b/tests/Console/ModelsCommand/CustomCollection/Test.php
index aa81547..bc753c1 100644
--- a/tests/Console/ModelsCommand/CustomCollection/Test.php
+++ b/tests/Console/ModelsCommand/CustomCollection/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomCollection;
 
diff --git a/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php
index c730904..10818ac 100644
--- a/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/CustomCollection/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomCollection\Models;
 
diff --git a/tests/Console/ModelsCommand/CustomDate/Models/CustomDate.php b/tests/Console/ModelsCommand/CustomDate/Models/CustomDate.php
index 615afb7..e9e83a5 100644
--- a/tests/Console/ModelsCommand/CustomDate/Models/CustomDate.php
+++ b/tests/Console/ModelsCommand/CustomDate/Models/CustomDate.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate\Models;
 
diff --git a/tests/Console/ModelsCommand/CustomDate/Test.php b/tests/Console/ModelsCommand/CustomDate/Test.php
index bc89104..3d6a733 100644
--- a/tests/Console/ModelsCommand/CustomDate/Test.php
+++ b/tests/Console/ModelsCommand/CustomDate/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate;
 
diff --git a/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php
index 900849e..cd0e846 100644
--- a/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/CustomDate/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\CustomDate\Models;
 
diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/Models/Post.php b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/Models/Post.php
index 3800e3d..17afcc1 100644
--- a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/Models/Post.php
+++ b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/Models/Post.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdoc\Models;
 
diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/Test.php b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/Test.php
index e29ee60..db786c1 100644
--- a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/Test.php
+++ b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdoc;
 
diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php
index 7ea6080..aec51c9 100644
--- a/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/GenerateBasicPhpdoc/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdoc\Models;
 
diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/Models/Post.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/Models/Post.php
index 23d2194..f70f343 100644
--- a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/Models/Post.php
+++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/Models/Post.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocCamel\Models;
 
diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/Test.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/Test.php
index 2f89135..21a5442 100644
--- a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/Test.php
+++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocCamel;
 
diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php
index ddc0852..8b83890 100644
--- a/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocCamel/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocCamel\Models;
 
diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/Models/Post.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/Models/Post.php
index 36b2c33..da29204 100644
--- a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/Models/Post.php
+++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/Models/Post.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocFinal\Models;
 
diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/Test.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/Test.php
index b178e2f..fb5e3b7 100644
--- a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/Test.php
+++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocFinal;
 
diff --git a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php
index 5b225f8..1681ee5 100644
--- a/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/GenerateBasicPhpdocFinal/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpdocFinal\Models;
 
diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/Models/Post.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/Models/Post.php
index 1add665..e61f246 100644
--- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/Models/Post.php
+++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/Models/Post.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqn\Models;
 
diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/Test.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/Test.php
index 676bad0..93a254e 100644
--- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/Test.php
+++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqn;
 
diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php
index baf3d5e..736bc0d 100644
--- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqn/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqn\Models;
 
diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Builders/EMaterialQueryBuilder.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Builders/EMaterialQueryBuilder.php
index e041467..644d538 100644
--- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Builders/EMaterialQueryBuilder.php
+++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Builders/EMaterialQueryBuilder.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Builders;
 
diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Models/Post.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Models/Post.php
index 211cb01..78ab87a 100644
--- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Models/Post.php
+++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Models/Post.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile\Models;
 
diff --git a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Test.php b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Test.php
index 4909549..45a8d17 100644
--- a/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Test.php
+++ b/tests/Console/ModelsCommand/GeneratePhpdocWithFqnInExternalFile/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GeneratePhpdocWithFqnInExternalFile;
 
diff --git a/tests/Console/ModelsCommand/Getter/Models/Simple.php b/tests/Console/ModelsCommand/Getter/Models/Simple.php
index 28906aa..dba42eb 100644
--- a/tests/Console/ModelsCommand/Getter/Models/Simple.php
+++ b/tests/Console/ModelsCommand/Getter/Models/Simple.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Getter\Models;
 
diff --git a/tests/Console/ModelsCommand/Getter/Test.php b/tests/Console/ModelsCommand/Getter/Test.php
index 888ac8e..9718248 100644
--- a/tests/Console/ModelsCommand/Getter/Test.php
+++ b/tests/Console/ModelsCommand/Getter/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Getter;
 
diff --git a/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php
index 49fd7d4..ab67d54 100644
--- a/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/Getter/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Getter\Models;
 
diff --git a/tests/Console/ModelsCommand/Ignored/Models/Ignored.php b/tests/Console/ModelsCommand/Ignored/Models/Ignored.php
index df4c7d2..73d3ffa 100644
--- a/tests/Console/ModelsCommand/Ignored/Models/Ignored.php
+++ b/tests/Console/ModelsCommand/Ignored/Models/Ignored.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models;
 
diff --git a/tests/Console/ModelsCommand/Ignored/Models/NotIgnored.php b/tests/Console/ModelsCommand/Ignored/Models/NotIgnored.php
index 445fa70..2a059f1 100644
--- a/tests/Console/ModelsCommand/Ignored/Models/NotIgnored.php
+++ b/tests/Console/ModelsCommand/Ignored/Models/NotIgnored.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models;
 
diff --git a/tests/Console/ModelsCommand/Ignored/Test.php b/tests/Console/ModelsCommand/Ignored/Test.php
index 21a50cd..2b2690b 100644
--- a/tests/Console/ModelsCommand/Ignored/Test.php
+++ b/tests/Console/ModelsCommand/Ignored/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored;
 
diff --git a/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php
index 6445b4f..43f6607 100644
--- a/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/Ignored/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Ignored\Models;
 
diff --git a/tests/Console/ModelsCommand/Interfaces/Models/User.php b/tests/Console/ModelsCommand/Interfaces/Models/User.php
index 8c3eba6..726b248 100644
--- a/tests/Console/ModelsCommand/Interfaces/Models/User.php
+++ b/tests/Console/ModelsCommand/Interfaces/Models/User.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Interfaces\Models;
 
diff --git a/tests/Console/ModelsCommand/Interfaces/Test.php b/tests/Console/ModelsCommand/Interfaces/Test.php
index dad00cd..16d4cc5 100644
--- a/tests/Console/ModelsCommand/Interfaces/Test.php
+++ b/tests/Console/ModelsCommand/Interfaces/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Interfaces;
 
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CastedProperty.php b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CastedProperty.php
index e0dd9fb..e125157 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CastedProperty.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CastedProperty.php
@@ -5,4 +5,4 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCas
 class CastedProperty
 {
 
-}
\ No newline at end of file
+}
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithDocblockReturn.php b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithDocblockReturn.php
index a9c3cb3..22ac354 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithDocblockReturn.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithDocblockReturn.php
@@ -22,4 +22,4 @@ class CustomCasterWithDocblockReturn implements CastsAttributes
     {
         // TODO: Implement set() method.
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithNullablePrimitiveReturn.php b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithNullablePrimitiveReturn.php
index d960bfb..0778ba1 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithNullablePrimitiveReturn.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithNullablePrimitiveReturn.php
@@ -22,4 +22,4 @@ class CustomCasterWithNullablePrimitiveReturn implements CastsAttributes
     {
         // TODO: Implement set() method.
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithPrimitiveDocblockReturn.php b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithPrimitiveDocblockReturn.php
index fbdd537..442fa47 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithPrimitiveDocblockReturn.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithPrimitiveDocblockReturn.php
@@ -22,4 +22,4 @@ class CustomCasterWithPrimitiveDocblockReturn implements CastsAttributes
     {
         // TODO: Implement set() method.
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithPrimitiveReturn.php b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithPrimitiveReturn.php
index 76b9a00..be34e52 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithPrimitiveReturn.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithPrimitiveReturn.php
@@ -22,4 +22,4 @@ class CustomCasterWithPrimitiveReturn implements CastsAttributes
     {
         // TODO: Implement set() method.
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithReturnType.php b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithReturnType.php
index 50e703c..04a9d3d 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithReturnType.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithReturnType.php
@@ -21,4 +21,4 @@ class CustomCasterWithReturnType implements CastsAttributes
     {
         // TODO: Implement set() method.
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithoutReturnType.php b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithoutReturnType.php
index 5d8d228..e23d73f 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithoutReturnType.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/Casts/CustomCasterWithoutReturnType.php
@@ -18,4 +18,4 @@ class CustomCasterWithoutReturnType implements CastsAttributes
     {
         // TODO: Implement set() method.
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/Models/CustomCast.php b/tests/Console/ModelsCommand/LaravelCustomCasts/Models/CustomCast.php
index d374e30..1799d22 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/Models/CustomCast.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/Models/CustomCast.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Models;
 
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/Test.php b/tests/Console/ModelsCommand/LaravelCustomCasts/Test.php
index 61a5c0d..aab21b9 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/Test.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts;
 
@@ -39,7 +41,7 @@ class Test extends AbstractModelsCommand
         $mockFilesystem = Mockery::mock(Filesystem::class);
         $mockFilesystem
             ->shouldReceive('get')
-            ->andReturn(file_get_contents(__DIR__.'/Models/CustomCast.php'))
+            ->andReturn(file_get_contents(__DIR__ . '/Models/CustomCast.php'))
             ->once();
         $mockFilesystem
             ->shouldReceive('put')
diff --git a/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test_it_parses_casted_properties_correctly__1.php b/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test_it_parses_casted_properties_correctly__1.php
index ec49d7b..a431f81 100644
--- a/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test_it_parses_casted_properties_correctly__1.php
+++ b/tests/Console/ModelsCommand/LaravelCustomCasts/__snapshots__/Test__test_it_parses_casted_properties_correctly__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCasts\Models;
 
diff --git a/tests/Console/ModelsCommand/MagicWhere/Models/Post.php b/tests/Console/ModelsCommand/MagicWhere/Models/Post.php
index 865cf42..c3efa12 100644
--- a/tests/Console/ModelsCommand/MagicWhere/Models/Post.php
+++ b/tests/Console/ModelsCommand/MagicWhere/Models/Post.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Models;
 
diff --git a/tests/Console/ModelsCommand/MagicWhere/Test.php b/tests/Console/ModelsCommand/MagicWhere/Test.php
index c343155..630be57 100644
--- a/tests/Console/ModelsCommand/MagicWhere/Test.php
+++ b/tests/Console/ModelsCommand/MagicWhere/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere;
 
diff --git a/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php
index a539a7f..8c9a819 100644
--- a/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/MagicWhere/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\MagicWhere\Models;
 
diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/Models/Simple.php b/tests/Console/ModelsCommand/PHPStormNoInspection/Models/Simple.php
index 6a9f610..44c08ec 100644
--- a/tests/Console/ModelsCommand/PHPStormNoInspection/Models/Simple.php
+++ b/tests/Console/ModelsCommand/PHPStormNoInspection/Models/Simple.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models;
 
diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/Test.php b/tests/Console/ModelsCommand/PHPStormNoInspection/Test.php
index c549705..4783f2f 100644
--- a/tests/Console/ModelsCommand/PHPStormNoInspection/Test.php
+++ b/tests/Console/ModelsCommand/PHPStormNoInspection/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection;
 
@@ -6,6 +8,7 @@ use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
 use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
 use Illuminate\Filesystem\Filesystem;
 use Mockery;
+
 use function file_get_contents;
 
 class Test extends AbstractModelsCommand
diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php
index 2a86e11..25c0e3b 100644
--- a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php
+++ b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionNotPresent__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models;
 
diff --git a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php
index c86c529..9cb1f27 100644
--- a/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php
+++ b/tests/Console/ModelsCommand/PHPStormNoInspection/__snapshots__/Test__testNoinspectionPresent__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\PHPStormNoInspection\Models;
 
diff --git a/tests/Console/ModelsCommand/RelationCountProperties/Models/Post.php b/tests/Console/ModelsCommand/RelationCountProperties/Models/Post.php
index 9f92526..8af2d60 100644
--- a/tests/Console/ModelsCommand/RelationCountProperties/Models/Post.php
+++ b/tests/Console/ModelsCommand/RelationCountProperties/Models/Post.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\RelationCountProperties\Models;
 
diff --git a/tests/Console/ModelsCommand/RelationCountProperties/Test.php b/tests/Console/ModelsCommand/RelationCountProperties/Test.php
index 5e1efc1..ce06e42 100644
--- a/tests/Console/ModelsCommand/RelationCountProperties/Test.php
+++ b/tests/Console/ModelsCommand/RelationCountProperties/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\RelationCountProperties;
 
diff --git a/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php
index 0c8fad9..a108282 100644
--- a/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/RelationCountProperties/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\RelationCountProperties\Models;
 
diff --git a/tests/Console/ModelsCommand/Relations/Models/Simple.php b/tests/Console/ModelsCommand/Relations/Models/Simple.php
index 47861ca..7c2b5af 100644
--- a/tests/Console/ModelsCommand/Relations/Models/Simple.php
+++ b/tests/Console/ModelsCommand/Relations/Models/Simple.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models;
 
diff --git a/tests/Console/ModelsCommand/Relations/ModelsOtherNamespace/AnotherModel.php b/tests/Console/ModelsCommand/Relations/ModelsOtherNamespace/AnotherModel.php
index d222e7e..af57927 100644
--- a/tests/Console/ModelsCommand/Relations/ModelsOtherNamespace/AnotherModel.php
+++ b/tests/Console/ModelsCommand/Relations/ModelsOtherNamespace/AnotherModel.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\ModelsOtherNamespace;
 
diff --git a/tests/Console/ModelsCommand/Relations/Test.php b/tests/Console/ModelsCommand/Relations/Test.php
index e564e83..a7e30b5 100644
--- a/tests/Console/ModelsCommand/Relations/Test.php
+++ b/tests/Console/ModelsCommand/Relations/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations;
 
diff --git a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php
index 4fbdba2..a30273e 100644
--- a/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/Relations/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Relations\Models;
 
diff --git a/tests/Console/ModelsCommand/ResetAndSmartReset/Models/Simple.php b/tests/Console/ModelsCommand/ResetAndSmartReset/Models/Simple.php
index 666a546..86646d3 100644
--- a/tests/Console/ModelsCommand/ResetAndSmartReset/Models/Simple.php
+++ b/tests/Console/ModelsCommand/ResetAndSmartReset/Models/Simple.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartReset\Models;
 
diff --git a/tests/Console/ModelsCommand/ResetAndSmartReset/Test.php b/tests/Console/ModelsCommand/ResetAndSmartReset/Test.php
index f8c86dc..d5ce7c7 100644
--- a/tests/Console/ModelsCommand/ResetAndSmartReset/Test.php
+++ b/tests/Console/ModelsCommand/ResetAndSmartReset/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartReset;
 
diff --git a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php
index c6c1e7f..6e5b180 100644
--- a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php
+++ b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testNoReset__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartReset\Models;
 
diff --git a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php
index 04b71d4..08f1d06 100644
--- a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php
+++ b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testReset__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartReset\Models;
 
diff --git a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php
index 40737ff..3ba9c2b 100644
--- a/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php
+++ b/tests/Console/ModelsCommand/ResetAndSmartReset/__snapshots__/Test__testSmartReset__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\ResetAndSmartReset\Models;
 
diff --git a/tests/Console/ModelsCommand/SoftDeletes/Models/Simple.php b/tests/Console/ModelsCommand/SoftDeletes/Models/Simple.php
index 070ad08..11d5a62 100644
--- a/tests/Console/ModelsCommand/SoftDeletes/Models/Simple.php
+++ b/tests/Console/ModelsCommand/SoftDeletes/Models/Simple.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SoftDeletes\Models;
 
diff --git a/tests/Console/ModelsCommand/SoftDeletes/Test.php b/tests/Console/ModelsCommand/SoftDeletes/Test.php
index a17079d..de59601 100644
--- a/tests/Console/ModelsCommand/SoftDeletes/Test.php
+++ b/tests/Console/ModelsCommand/SoftDeletes/Test.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SoftDeletes;
 
diff --git a/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php
index cc93e30..167fa0c 100644
--- a/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php
+++ b/tests/Console/ModelsCommand/SoftDeletes/__snapshots__/Test__test__1.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\SoftDeletes\Models;
 
diff --git a/tests/Console/ModelsCommand/migrations/____custom_casts_table.php b/tests/Console/ModelsCommand/migrations/____custom_casts_table.php
index 9a45d8e..105e57a 100644
--- a/tests/Console/ModelsCommand/migrations/____custom_casts_table.php
+++ b/tests/Console/ModelsCommand/migrations/____custom_casts_table.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/tests/Console/ModelsCommand/migrations/____custom_dates_table.php b/tests/Console/ModelsCommand/migrations/____custom_dates_table.php
index cf421fd..808b37b 100644
--- a/tests/Console/ModelsCommand/migrations/____custom_dates_table.php
+++ b/tests/Console/ModelsCommand/migrations/____custom_dates_table.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/tests/Console/ModelsCommand/migrations/____posts_table.php b/tests/Console/ModelsCommand/migrations/____posts_table.php
index d3c40da..ab53555 100644
--- a/tests/Console/ModelsCommand/migrations/____posts_table.php
+++ b/tests/Console/ModelsCommand/migrations/____posts_table.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/tests/Console/ModelsCommand/migrations/____simple_table.php b/tests/Console/ModelsCommand/migrations/____simple_table.php
index 6700998..4547d3a 100644
--- a/tests/Console/ModelsCommand/migrations/____simple_table.php
+++ b/tests/Console/ModelsCommand/migrations/____simple_table.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/tests/MethodTest.php b/tests/MethodTest.php
index 989ba26..254a3ad 100644
--- a/tests/MethodTest.php
+++ b/tests/MethodTest.php
@@ -41,7 +41,7 @@ class ExampleTest extends TestCase
  */';
         $this->assertSame($output, $method->getDocComment(''));
         $this->assertSame('setName', $method->getName());
-        $this->assertSame('\\'.ExampleClass::class, $method->getDeclaringClass());
+        $this->assertSame('\\' . ExampleClass::class, $method->getDeclaringClass());
         $this->assertSame('$last, $first, ...$middle', $method->getParams(true));
         $this->assertSame(['$last', '$first', '...$middle'], $method->getParams(false));
         $this->assertSame('$last, $first = \'Barry\', ...$middle', $method->getParamsWithDefault(true));
@@ -68,7 +68,7 @@ class ExampleTest extends TestCase
  */';
         $this->assertSame($output, $method->getDocComment(''));
         $this->assertSame('with', $method->getName());
-        $this->assertSame('\\'.Builder::class, $method->getDeclaringClass());
+        $this->assertSame('\\' . Builder::class, $method->getDeclaringClass());
         $this->assertSame('$relations', $method->getParams(true));
         $this->assertSame(['$relations'], $method->getParams(false));
         $this->assertSame('$relations', $method->getParamsWithDefault(true));
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 0c7f82a..05f2caf 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Barryvdh\LaravelIdeHelper\Tests;