diff --git a/resources/config/sluggable.php b/resources/config/sluggable.php
index 2b1495b..ceeaab0 100644
--- a/resources/config/sluggable.php
+++ b/resources/config/sluggable.php
@@ -1,8 +1,7 @@
 <?php
 
 return [
-
-    /**
+    /*
      * What attributes do we use to build the slug?
      * This can be a single field, like "name" which will build a slug from:
      *
@@ -20,7 +19,7 @@
 
     'source' => null,
 
-    /**
+    /*
      * The maximum length of a generated slug.  Defaults to "null", which means
      * no length restrictions are enforced.  Set it to a positive integer if you
      * want to make sure your slugs aren't too long.
@@ -28,7 +27,7 @@
 
     'maxLength' => null,
 
-    /**
+    /*
      * If you are setting a maximum length on your slugs, you may not want the
      * truncated string to split a word in half.  The default setting of "true"
      * will ensure this, e.g. with a maxLength of 12:
@@ -43,7 +42,7 @@
 
     'maxLengthKeepWords' => true,
 
-    /**
+    /*
      * If left to "null", then use the cocur/slugify package to generate the slug
      * (with the separator defined below).
      *
@@ -61,13 +60,11 @@
 
     'method' => null,
 
-    /**
-     * Separator to use when generating slugs.  Defaults to a hyphen.
-     */
+    // Separator to use when generating slugs.  Defaults to a hyphen.
 
     'separator' => '-',
 
-    /**
+    /*
      * Enforce uniqueness of slugs?  Defaults to true.
      * If a generated slug already exists, an incremental numeric
      * value will be appended to the end until a unique slug is found.  e.g.:
@@ -79,7 +76,7 @@
 
     'unique' => true,
 
-    /**
+    /*
      * If you are enforcing unique slugs, the default is to add an
      * incremental value to the end of the base slug.  Alternatively, you
      * can change this value to a closure that accepts three parameters:
@@ -87,10 +84,10 @@
      * "similar" slugs.  The closure should return the new unique
      * suffix to append to the slug.
      */
-    
+
     'uniqueSuffix' => null,
 
-    /**
+    /*
      * What is the first suffix to add to a slug to make it unique?
      * For the default method of adding incremental integers, we start
      * counting at 2, so the list of slugs would be, e.g.:
@@ -101,7 +98,7 @@
      */
     'firstUniqueSuffix' => 2,
 
-    /**
+    /*
      * Should we include the trashed items when generating a unique slug?
      * This only applies if the softDelete property is set for the Eloquent model.
      * If set to "false", then a new slug could duplicate one that exists on a trashed model.
@@ -110,7 +107,7 @@
 
     'includeTrashed' => false,
 
-    /**
+    /*
      * An array of slug names that can never be used for this model,
      * e.g. to prevent collisions with existing routes or controller methods, etc..
      * Defaults to null (i.e. no reserved names).
@@ -136,7 +133,7 @@
 
     'reserved' => null,
 
-    /**
+    /*
      * Whether to update the slug value when a model is being
      * re-saved (i.e. already exists).  Defaults to false, which
      * means slugs are not updated.
@@ -146,13 +143,12 @@
      * is probably not a good idea from an SEO point of view.
      * Only set this to true if you understand the possible consequences.
      */
-    
+
     'onUpdate' => false,
 
-    /**
+    /*
      * If the default slug engine of cocur/slugify is used, this array of
      * configuration options will be used when instantiating the engine.
      */
     'slugEngineOptions' => [],
-
 ];
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index 7cadfb5..aac8f3d 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Cviebrock\EloquentSluggable;
+<?php
+
+namespace Cviebrock\EloquentSluggable;
 
 use Cviebrock\EloquentSluggable\Services\SlugService;
 use Illuminate\Foundation\Application as LaravelApplication;
@@ -6,13 +8,10 @@
 use Laravel\Lumen\Application as LumenApplication;
 
 /**
- * Class ServiceProvider
- *
- * @package Cviebrock\EloquentSluggable
+ * Class ServiceProvider.
  */
 class ServiceProvider extends BaseServiceProvider
 {
-
     /**
      * Bootstrap the application services.
      */
@@ -26,7 +25,7 @@ public function boot(): void
      */
     public function register()
     {
-        $this->app->singleton(SluggableObserver::class, function($app) {
+        $this->app->singleton(SluggableObserver::class, function ($app) {
             return new SluggableObserver(new SlugService(), $app['events']);
         });
     }
@@ -37,9 +36,9 @@ protected function setUpConfig(): void
 
         if ($this->app instanceof LaravelApplication) {
             $this->publishes([$source => config_path('sluggable.php')], 'config');
-        /** @phpstan-ignore-next-line */
+        // @phpstan-ignore-next-line
         } elseif ($this->app instanceof LumenApplication) {
-            $this->app->configure('sluggable'); /** @phpstan-ignore class.notFound */
+            $this->app->configure('sluggable'); // @phpstan-ignore class.notFound
         }
 
         $this->mergeConfigFrom($source, 'sluggable');
diff --git a/src/Services/SlugService.php b/src/Services/SlugService.php
index 039d6c5..ea21839 100644
--- a/src/Services/SlugService.php
+++ b/src/Services/SlugService.php
@@ -1,33 +1,28 @@
-<?php namespace Cviebrock\EloquentSluggable\Services;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Services;
 
 use Cocur\Slugify\Slugify;
+use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 /**
- * Class SlugService
- *
- * @package Cviebrock\EloquentSluggable\Services
+ * Class SlugService.
  */
 class SlugService
 {
-
     final public function __construct() {}
 
     /**
-     * @var \Illuminate\Database\Eloquent\Model
-     * @var \Cviebrock\EloquentSluggable\Sluggable
+     * @var Model
+     * @var Sluggable
      */
     protected $model;
 
     /**
      * Slug the current model.
-     *
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @param bool $force
-     *
-     * @return bool
      */
     public function slug(Model $model, bool $force = false): bool
     {
@@ -57,10 +52,6 @@ public function slug(Model $model, bool $force = false): bool
     /**
      * Get the sluggable configuration for the current model,
      * including default values where not specified.
-     *
-     * @param array $overrides
-     *
-     * @return array
      */
     public function getConfiguration(array $overrides = []): array
     {
@@ -71,12 +62,6 @@ public function getConfiguration(array $overrides = []): array
 
     /**
      * Build the slug for the given attribute of the current model.
-     *
-     * @param string $attribute
-     * @param array $config
-     * @param bool $force
-     *
-     * @return null|string
      */
     public function buildSlug(string $attribute, array $config, bool $force = false): ?string
     {
@@ -97,20 +82,15 @@ public function buildSlug(string $attribute, array $config, bool $force = false)
 
     /**
      * Determines whether the model needs slugging.
-     *
-     * @param string $attribute
-     * @param array $config
-     *
-     * @return bool
      */
     protected function needsSlugging(string $attribute, array $config): bool
     {
         $value = $this->model->getAttributeValue($attribute);
 
         if (
-            $config['onUpdate'] === true ||
-            $value === null ||
-            trim($value) === ''
+            $config['onUpdate'] === true
+            || $value === null
+            || trim($value) === ''
         ) {
             return true;
         }
@@ -119,15 +99,13 @@ protected function needsSlugging(string $attribute, array $config): bool
             return false;
         }
 
-        return (!$this->model->exists);
+        return !$this->model->exists;
     }
 
     /**
      * Get the source string for the slug.
      *
      * @param mixed $from
-     *
-     * @return string
      */
     protected function getSlugSource($from): string
     {
@@ -135,7 +113,7 @@ protected function getSlugSource($from): string
             return $this->model->__toString();
         }
 
-        $sourceStrings = array_map(function($key) {
+        $sourceStrings = array_map(function ($key) {
             $value = data_get($this->model, $key, $this->model->getAttribute($key));
             if (is_bool($value)) {
                 $value = (int) $value;
@@ -150,11 +128,6 @@ protected function getSlugSource($from): string
     /**
      * Generate a slug from the given source string.
      *
-     * @param string $source
-     * @param array $config
-     * @param string $attribute
-     *
-     * @return string
      * @throws \UnexpectedValueException
      */
     protected function generateSlug(string $source, array $config, string $attribute): string
@@ -190,11 +163,6 @@ protected function generateSlug(string $source, array $config, string $attribute
     /**
      * Return a class that has a `slugify()` method, used to convert
      * strings into slugs.
-     *
-     * @param string $attribute
-     *
-     * @param array $config
-     * @return \Cocur\Slugify\Slugify
      */
     protected function getSlugEngine(string $attribute, array $config): Slugify
     {
@@ -215,11 +183,6 @@ protected function getSlugEngine(string $attribute, array $config): Slugify
     /**
      * Checks that the given slug is not a reserved word.
      *
-     * @param string $slug
-     * @param array $config
-     * @param string $attribute
-     *
-     * @return string
      * @throws \UnexpectedValueException
      */
     protected function validateSlug(string $slug, array $config, string $attribute): string
@@ -261,11 +224,6 @@ protected function validateSlug(string $slug, array $config, string $attribute):
     /**
      * Checks if the slug should be unique, and makes it so if needed.
      *
-     * @param string $slug
-     * @param array $config
-     * @param string $attribute
-     *
-     * @return string
      * @throws \UnexpectedValueException
      */
     protected function makeSlugUnique(string $slug, array $config, string $attribute): string
@@ -284,8 +242,8 @@ protected function makeSlugUnique(string $slug, array $config, string $attribute
         // 	b) our slug isn't in the list
         // ... we are okay
         if (
-            $list->count() === 0 ||
-            $list->contains($slug) === false
+            $list->count() === 0
+            || $list->contains($slug) === false
         ) {
             return $slug;
         }
@@ -298,8 +256,8 @@ protected function makeSlugUnique(string $slug, array $config, string $attribute
             $currentSlug = $list->get($this->model->getKey());
 
             if (
-                $currentSlug === $slug ||
-                !$slug || strpos($currentSlug, $slug) === 0
+                $currentSlug === $slug
+                || !$slug || strpos($currentSlug, $slug) === 0
             ) {
                 return $currentSlug;
             }
@@ -322,12 +280,7 @@ protected function makeSlugUnique(string $slug, array $config, string $attribute
     /**
      * Generate a unique suffix for the given slug (and list of existing, "similar" slugs.
      *
-     * @param string $slug
-     * @param string $separator
-     * @param \Illuminate\Support\Collection $list
      * @param mixed $firstSuffix
-     *
-     * @return string
      */
     protected function generateSuffix(string $slug, string $separator, Collection $list, $firstSuffix): string
     {
@@ -341,7 +294,7 @@ protected function generateSuffix(string $slug, string $separator, Collection $l
             return end($suffix);
         }
 
-        $list->transform(function($value, $key) use ($len) {
+        $list->transform(function ($value, $key) use ($len) {
             return (int) substr($value, $len);
         });
 
@@ -354,12 +307,6 @@ protected function generateSuffix(string $slug, string $separator, Collection $l
 
     /**
      * Get all existing slugs that are similar to the given slug.
-     *
-     * @param string $slug
-     * @param string $attribute
-     * @param array $config
-     *
-     * @return \Illuminate\Support\Collection
      */
     protected function getExistingSlugs(string $slug, string $attribute, array $config): Collection
     {
@@ -389,8 +336,6 @@ protected function getExistingSlugs(string $slug, string $attribute, array $conf
 
     /**
      * Does this model use softDeleting?
-     *
-     * @return bool
      */
     protected function usesSoftDeleting(): bool
     {
@@ -400,19 +345,13 @@ protected function usesSoftDeleting(): bool
     /**
      * Generate a unique slug for a given string.
      *
-     * @param \Illuminate\Database\Eloquent\Model|string $model
-     * @param string $attribute
-     * @param string $fromString
-     * @param array|null $config
-     *
-     * @return string
      * @throws \InvalidArgumentException
      * @throws \UnexpectedValueException
      */
     public static function createSlug(Model|string $model, string $attribute, string $fromString, ?array $config = null): string
     {
         if (is_string($model)) {
-            $model = new $model;
+            $model = new $model();
         }
 
         $instance = (new static())->setModel($model);
@@ -421,6 +360,7 @@ public static function createSlug(Model|string $model, string $attribute, string
             $config = Arr::get($model->sluggable(), $attribute);
             if ($config === null) {
                 $modelClass = get_class($model);
+
                 throw new \InvalidArgumentException("Argument 2 passed to SlugService::createSlug ['{$attribute}'] is not a valid slug attribute for model {$modelClass}.");
             }
         }
@@ -435,8 +375,6 @@ public static function createSlug(Model|string $model, string $attribute, string
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Model $model
-     *
      * @return $this
      */
     public function setModel(Model $model): self
diff --git a/src/Sluggable.php b/src/Sluggable.php
index 1ff6354..cefe74c 100644
--- a/src/Sluggable.php
+++ b/src/Sluggable.php
@@ -1,4 +1,6 @@
-<?php namespace Cviebrock\EloquentSluggable;
+<?php
+
+namespace Cviebrock\EloquentSluggable;
 
 use Cocur\Slugify\Slugify;
 use Cviebrock\EloquentSluggable\Services\SlugService;
@@ -6,13 +8,10 @@
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class Sluggable
- *
- * @package Cviebrock\EloquentSluggable
+ * Class Sluggable.
  */
 trait Sluggable
 {
-
     /**
      * Hook into the Eloquent model events to create or
      * update the slug as required.
@@ -43,7 +42,7 @@ public static function slugged($callback): void
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function replicate(?array $except = null)
     {
@@ -62,8 +61,6 @@ public function replicate(?array $except = null)
      *
      * The second option is required if the primary key is to be part of the slug
      * source, as it won't be set during the "saving" event.
-     *
-     * @return string
      */
     public function sluggableEvent(): string
     {
@@ -72,18 +69,12 @@ public function sluggableEvent(): string
 
     /**
      * Query scope for finding "similar" slugs, used to determine uniqueness.
-     *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param string $attribute
-     * @param array $config
-     * @param string $slug
-     * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeFindSimilarSlugs(Builder $query, string $attribute, array $config, string $slug): Builder
     {
         $separator = $config['separator'];
 
-        return $query->where(function(Builder $q) use ($attribute, $slug, $separator) {
+        return $query->where(function (Builder $q) use ($attribute, $slug, $separator) {
             $q->where($attribute, '=', $slug)
                 ->orWhere($attribute, 'LIKE', $slug . $separator . '%');
         });
@@ -91,18 +82,11 @@ public function scopeFindSimilarSlugs(Builder $query, string $attribute, array $
 
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     abstract public function sluggable(): array;
 
-
     /**
      * Optionally customize the cocur/slugify engine.
-     *
-     * @param \Cocur\Slugify\Slugify $engine
-     * @param string $attribute
-     * @return \Cocur\Slugify\Slugify
      */
     public function customizeSlugEngine(Slugify $engine, string $attribute): Slugify
     {
@@ -111,13 +95,6 @@ public function customizeSlugEngine(Slugify $engine, string $attribute): Slugify
 
     /**
      * Optionally add constraints to the query that determines uniqueness.
-     *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @param string $attribute
-     * @param array $config
-     * @param string $slug
-     * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeWithUniqueSlugConstraints(
         Builder $query,
@@ -125,8 +102,7 @@ public function scopeWithUniqueSlugConstraints(
         string $attribute,
         array $config,
         string $slug
-    ): Builder
-    {
+    ): Builder {
         return $query;
     }
 }
diff --git a/src/SluggableObserver.php b/src/SluggableObserver.php
index 8686a0c..96f44f6 100644
--- a/src/SluggableObserver.php
+++ b/src/SluggableObserver.php
@@ -1,17 +1,16 @@
-<?php namespace Cviebrock\EloquentSluggable;
+<?php
+
+namespace Cviebrock\EloquentSluggable;
 
 use Cviebrock\EloquentSluggable\Services\SlugService;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class SluggableObserver
- *
- * @package Cviebrock\EloquentSluggable
+ * Class SluggableObserver.
  */
 class SluggableObserver
 {
-
     /** @var string */
     public const SAVING = 'saving';
 
@@ -19,20 +18,17 @@ class SluggableObserver
     public const SAVED = 'saved';
 
     /**
-     * @var \Cviebrock\EloquentSluggable\Services\SlugService
+     * @var SlugService
      */
     private $slugService;
 
     /**
-     * @var \Illuminate\Contracts\Events\Dispatcher
+     * @var Dispatcher
      */
     private $events;
 
     /**
      * SluggableObserver constructor.
-     *
-     * @param \Cviebrock\EloquentSluggable\Services\SlugService $slugService
-     * @param \Illuminate\Contracts\Events\Dispatcher $events
      */
     public function __construct(SlugService $slugService, Dispatcher $events)
     {
@@ -41,12 +37,11 @@ public function __construct(SlugService $slugService, Dispatcher $events)
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Model $model
      * @return bool|void
      */
     public function saving(Model $model)
     {
-        /** @phpstan-ignore-next-line */
+        // @phpstan-ignore-next-line
         if ($model->sluggableEvent() !== self::SAVING) {
             return;
         }
@@ -55,12 +50,11 @@ public function saving(Model $model)
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Model $model
      * @return bool|void
      */
     public function saved(Model $model)
     {
-        /** @phpstan-ignore-next-line */
+        // @phpstan-ignore-next-line
         if ($model->sluggableEvent() !== self::SAVED) {
             return;
         }
@@ -69,11 +63,6 @@ public function saved(Model $model)
         }
     }
 
-    /**
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @param string $event
-     * @return bool
-     */
     protected function generateSlug(Model $model, string $event): bool
     {
         // If the "slugging" event returns false, abort
@@ -89,10 +78,6 @@ protected function generateSlug(Model $model, string $event): bool
 
     /**
      * Fire the namespaced validating event.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model $model
-     * @param  string $event
-     * @return bool|null
      */
     protected function fireSluggingEvent(Model $model, string $event): ?bool
     {
@@ -101,10 +86,6 @@ protected function fireSluggingEvent(Model $model, string $event): ?bool
 
     /**
      * Fire the namespaced post-validation event.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model $model
-     * @param  string $status
-     * @return void
      */
     protected function fireSluggedEvent(Model $model, string $status): void
     {
diff --git a/src/SluggableScopeHelpers.php b/src/SluggableScopeHelpers.php
index 78a5716..c6d5126 100644
--- a/src/SluggableScopeHelpers.php
+++ b/src/SluggableScopeHelpers.php
@@ -1,22 +1,22 @@
-<?php namespace Cviebrock\EloquentSluggable;
+<?php
+
+namespace Cviebrock\EloquentSluggable;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 /**
- * Class SluggableScopeHelpers
+ * Class SluggableScopeHelpers.
  *
  * Helper trait for defining the primary slug of a model
  * and providing useful scopes and query methods.
- *
- * @package Cviebrock\EloquentSluggable
  */
 trait SluggableScopeHelpers
 {
-
     /**
      * Primary slug column of this model.
-     *
-     * @return string
      */
     public function getSlugKeyName(): string
     {
@@ -38,8 +38,6 @@ public function getSlugKeyName(): string
 
     /**
      * Primary slug value of this model.
-     *
-     * @return string
      */
     public function getSlugKey(): string
     {
@@ -48,10 +46,6 @@ public function getSlugKey(): string
 
     /**
      * Query scope for finding a model by its primary slug.
-     *
-     * @param \Illuminate\Database\Eloquent\Builder $scope
-     * @param string $slug
-     * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeWhereSlug(Builder $scope, string $slug): Builder
     {
@@ -61,9 +55,7 @@ public function scopeWhereSlug(Builder $scope, string $slug): Builder
     /**
      * Find a model by its primary slug.
      *
-     * @param string $slug
-     * @param array $columns
-     * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|static[]|static|null
+     * @return Collection|Model|static|static[]|null
      */
     public static function findBySlug(string $slug, array $columns = ['*'])
     {
@@ -73,11 +65,9 @@ public static function findBySlug(string $slug, array $columns = ['*'])
     /**
      * Find a model by its primary slug or throw an exception.
      *
-     * @param string $slug
-     * @param array $columns
-     * @return \Illuminate\Database\Eloquent\Model|static
+     * @return Model|static
      *
-     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+     * @throws ModelNotFoundException
      */
     public static function findBySlugOrFail(string $slug, array $columns = ['*'])
     {
diff --git a/tests/BaseTests.php b/tests/BaseTests.php
index 287250f..04576f6 100644
--- a/tests/BaseTests.php
+++ b/tests/BaseTests.php
@@ -1,4 +1,6 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Cviebrock\EloquentSluggable\Tests\Models\Author;
 use Cviebrock\EloquentSluggable\Tests\Models\Post;
@@ -12,11 +14,11 @@
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithCustomMethodArrayCall;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithCustomSeparator;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithCustomSource;
-use Cviebrock\EloquentSluggable\Tests\Models\PostWithForeignRuleset2;
-use Cviebrock\EloquentSluggable\Tests\Models\PostWithIdSource;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithCustomSuffix;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithEmptySeparator;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithForeignRuleset;
+use Cviebrock\EloquentSluggable\Tests\Models\PostWithForeignRuleset2;
+use Cviebrock\EloquentSluggable\Tests\Models\PostWithIdSource;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithIdSourceOnSaved;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithMaxLength;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithMaxLengthSplitWords;
@@ -27,20 +29,19 @@
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithReservedSlug;
 
 /**
- * Class BaseTests
+ * Class BaseTests.
  *
- * @package Tests
+ * @internal
  */
 class BaseTests extends TestCase
 {
-
     /**
      * Test basic slugging functionality.
      */
     public function testSimpleSlug(): void
     {
         $post = Post::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         self::assertEquals('my-first-post', $post->slug);
     }
@@ -51,7 +52,7 @@ public function testSimpleSlug(): void
     public function testShortConfig(): void
     {
         $post = PostShortConfig::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         self::assertEquals('my-first-post', $post->slug);
     }
@@ -62,7 +63,7 @@ public function testShortConfig(): void
     public function testAccentedCharacters(): void
     {
         $post = Post::create([
-            'title' => 'My Dinner With André & François'
+            'title' => 'My Dinner With André & François',
         ]);
         self::assertEquals('my-dinner-with-andre-francois', $post->slug);
     }
@@ -73,8 +74,8 @@ public function testAccentedCharacters(): void
     public function testMultipleSource(): void
     {
         $post = PostWithMultipleSources::create([
-            'title' => 'A Post Title',
-            'subtitle' => 'A Subtitle'
+            'title'    => 'A Post Title',
+            'subtitle' => 'A Subtitle',
         ]);
         self::assertEquals('a-post-title-a-subtitle', $post->slug);
     }
@@ -82,7 +83,7 @@ public function testMultipleSource(): void
     public function testLeadingTrailingSpaces(): void
     {
         $post = Post::create([
-            'title' => "\tMy First Post \r\n"
+            'title' => "\tMy First Post \r\n",
         ]);
         self::assertEquals('my-first-post', $post->slug);
     }
@@ -93,8 +94,8 @@ public function testLeadingTrailingSpaces(): void
     public function testCustomMethod(): void
     {
         $post = PostWithCustomMethod::create([
-            'title' => 'A Post Title',
-            'subtitle' => 'A Subtitle'
+            'title'    => 'A Post Title',
+            'subtitle' => 'A Subtitle',
         ]);
         self::assertEquals('eltit-tsop-a', $post->slug);
     }
@@ -105,8 +106,8 @@ public function testCustomMethod(): void
     public function testCustomCallableMethod(): void
     {
         $post = PostWithCustomCallableMethod::create([
-            'title' => 'A Post Title',
-            'subtitle' => 'A Subtitle'
+            'title'    => 'A Post Title',
+            'subtitle' => 'A Subtitle',
         ]);
         self::assertEquals('eltit-tsop-a', $post->slug);
     }
@@ -118,7 +119,7 @@ public function testCustomSuffix(): void
     {
         for ($i = 1; $i <= 20; $i++) {
             $post = PostWithCustomSuffix::create([
-                'title' => 'A Post Title',
+                'title'    => 'A Post Title',
                 'subtitle' => 'A Subtitle',
             ]);
 
@@ -136,7 +137,7 @@ public function testCustomSuffix(): void
     public function testToStringMethod(): void
     {
         $post = PostWithNoSource::create([
-            'title' => 'A Post Title'
+            'title' => 'A Post Title',
         ]);
         self::assertEquals('a-post-title', $post->slug);
     }
@@ -147,7 +148,7 @@ public function testToStringMethod(): void
     public function testCustomSeparator(): void
     {
         $post = PostWithCustomSeparator::create([
-            'title' => 'A post title'
+            'title' => 'A post title',
         ]);
         self::assertEquals('a.post.title', $post->slug);
     }
@@ -158,7 +159,7 @@ public function testCustomSeparator(): void
     public function testReservedWord(): void
     {
         $post = PostWithReservedSlug::create([
-            'title' => 'Add'
+            'title' => 'Add',
         ]);
         self::assertEquals('add-2', $post->slug);
     }
@@ -171,7 +172,7 @@ public function testReservedWord(): void
     public function testIssue5(): void
     {
         $post = Post::create([
-            'title' => 'My first post'
+            'title' => 'My first post',
         ]);
         self::assertEquals('my-first-post', $post->slug);
 
@@ -194,7 +195,7 @@ public function testIssue5(): void
     public function testIssue20(): void
     {
         $post1 = Post::create([
-            'title' => 'My first post'
+            'title' => 'My first post',
         ]);
         self::assertEquals('my-first-post', $post1->slug);
 
@@ -208,7 +209,7 @@ public function testIssue20(): void
     public function testNonSluggableModels(): void
     {
         $post = PostNotSluggable::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         self::assertEquals(null, $post->slug);
     }
@@ -219,7 +220,7 @@ public function testNonSluggableModels(): void
     public function testMaxLength(): void
     {
         $post = PostWithMaxLength::create([
-            'title' => 'A post with a really long title'
+            'title' => 'A post with a really long title',
         ]);
         self::assertEquals('a-post', $post->slug);
     }
@@ -230,7 +231,7 @@ public function testMaxLength(): void
     public function testMaxLengthSplitWords(): void
     {
         $post = PostWithMaxLengthSplitWords::create([
-            'title' => 'A post with a really long title'
+            'title' => 'A post with a really long title',
         ]);
         self::assertEquals('a-post-wit', $post->slug);
     }
@@ -242,7 +243,7 @@ public function testMaxLengthWithIncrements(): void
     {
         for ($i = 1; $i <= 20; $i++) {
             $post = PostWithMaxLength::create([
-                'title' => 'A post with a really long title'
+                'title' => 'A post with a really long title',
             ]);
             if ($i === 1) {
                 self::assertEquals('a-post', $post->slug);
@@ -259,7 +260,7 @@ public function testMaxLengthSplitWordsWithIncrements(): void
     {
         for ($i = 1; $i <= 20; $i++) {
             $post = PostWithMaxLengthSplitWords::create([
-                'title' => 'A post with a really long title'
+                'title' => 'A post with a really long title',
             ]);
             if ($i === 1) {
                 self::assertEquals('a-post-wit', $post->slug);
@@ -275,7 +276,7 @@ public function testMaxLengthSplitWordsWithIncrements(): void
     public function testMaxLengthDoesNotEndInSeparator(): void
     {
         $post = PostWithMaxLengthSplitWords::create([
-            'title' => 'It should work'
+            'title' => 'It should work',
         ]);
         self::assertEquals('it-should', $post->slug);
     }
@@ -289,7 +290,7 @@ public function testDoesNotNeedSluggingWhenSlugIsSet(): void
     {
         $post = Post::create([
             'title' => 'My first post',
-            'slug' => 'custom-slug'
+            'slug'  => 'custom-slug',
         ]);
         self::assertEquals('custom-slug', $post->slug);
     }
@@ -303,7 +304,7 @@ public function testDoesNotNeedSluggingWithUpdateWhenSlugIsSet(): void
     {
         $post = Post::create([
             'title' => 'My first post',
-            'slug' => 'custom-slug'
+            'slug'  => 'custom-slug',
         ]);
         self::assertEquals('custom-slug', $post->slug);
 
@@ -325,7 +326,7 @@ public function testDoesNotNeedSluggingWithUpdateWhenSlugIsSet(): void
     public function testModelStillSavesWhenSlugIsNotUpdated()
     {
         $post = Post::create([
-            'title' => 'My Post',
+            'title'    => 'My Post',
             'subtitle' => 'My First Subtitle',
         ]);
 
@@ -345,10 +346,10 @@ public function testModelStillSavesWhenSlugIsNotUpdated()
     public function testSlugFromRelatedModel(): void
     {
         $author = Author::create([
-            'name' => 'Arthur Conan Doyle'
+            'name' => 'Arthur Conan Doyle',
         ]);
         $post = new PostWithRelation([
-            'title' => 'First'
+            'title' => 'First',
         ]);
         $post->author()->associate($author);
         $post->save();
@@ -361,7 +362,7 @@ public function testSlugFromRelatedModel(): void
     public function testSlugFromRelatedModelNotExists(): void
     {
         $post = PostWithRelation::create([
-            'title' => 'First'
+            'title' => 'First',
         ]);
         self::assertEquals('first', $post->slug);
     }
@@ -372,7 +373,7 @@ public function testSlugFromRelatedModelNotExists(): void
     public function testNullSourceGeneratesEmptySlug(): void
     {
         $post = PostWithCustomSource::create([
-            'title' => 'My Test Post'
+            'title' => 'My Test Post',
         ]);
         self::assertEquals(null, $post->slug);
     }
@@ -383,7 +384,7 @@ public function testNullSourceGeneratesEmptySlug(): void
     public function testZeroLengthSourceGeneratesEmptySlug(): void
     {
         $post = Post::create([
-            'title' => ''
+            'title' => '',
         ]);
         self::assertNull($post->slug);
     }
@@ -394,7 +395,7 @@ public function testZeroLengthSourceGeneratesEmptySlug(): void
     public function testCustomEngineRules(): void
     {
         $post = PostWithCustomEngine::create([
-            'title' => 'The quick brown fox jumps over the lazy dog'
+            'title' => 'The quick brown fox jumps over the lazy dog',
         ]);
         self::assertEquals('tha-qaack-brawn-fax-jamps-avar-tha-lazy-dag', $post->slug);
     }
@@ -405,7 +406,7 @@ public function testCustomEngineRules(): void
     public function testCustomEngineRules2(): void
     {
         $post = PostWithCustomEngine2::create([
-            'title' => 'The quick brown fox/jumps over/the lazy dog'
+            'title' => 'The quick brown fox/jumps over/the lazy dog',
         ]);
         self::assertEquals('the-quick-brown-fox/jumps-over/the-lazy-dog', $post->slug);
     }
@@ -413,7 +414,7 @@ public function testCustomEngineRules2(): void
     public function testCustomEngineOptions(): void
     {
         $post = PostWithCustomEngineOptions::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         self::assertEquals('My-First-Post', $post->slug);
     }
@@ -424,7 +425,7 @@ public function testCustomEngineOptions(): void
     public function testForeignRuleset(): void
     {
         $post = PostWithForeignRuleset::create([
-            'title' => 'Mia unua poŝto'
+            'title' => 'Mia unua poŝto',
         ]);
         self::assertEquals('mia-unua-posxto', $post->slug);
     }
@@ -435,7 +436,7 @@ public function testForeignRuleset(): void
     public function testForeignRuleset2(): void
     {
         $post = PostWithForeignRuleset2::create([
-            'title' => 'Jyväskylä'
+            'title' => 'Jyväskylä',
         ]);
         self::assertEquals('jyvaskyla', $post->slug);
     }
@@ -448,7 +449,7 @@ public function testForeignRuleset2(): void
     public function testEmptySeparator(): void
     {
         $post = PostWithEmptySeparator::create([
-            'title' => 'My Test Post'
+            'title' => 'My Test Post',
         ]);
         self::assertEquals('mytestpost', $post->slug);
     }
@@ -459,7 +460,7 @@ public function testEmptySeparator(): void
     public function testMultipleSlugs(): void
     {
         $post = PostWithMultipleSlugs::create([
-            'title' => 'My Test Post',
+            'title'    => 'My Test Post',
             'subtitle' => 'My Subtitle',
         ]);
 
@@ -468,12 +469,12 @@ public function testMultipleSlugs(): void
     }
 
     /**
-     * Test subscript characters in slug field
+     * Test subscript characters in slug field.
      */
     public function testSubscriptCharacters(): void
     {
         $post = Post::create([
-            'title' => 'RDA-125-15/30/45m³/h CAV'
+            'title' => 'RDA-125-15/30/45m³/h CAV',
         ]);
 
         self::assertEquals('rda-125-15-30-45m3-h-cav', $post->slug);
@@ -485,7 +486,7 @@ public function testSubscriptCharacters(): void
     public function testFalsyString(): void
     {
         $post = Post::create([
-            'title' => '0'
+            'title' => '0',
         ]);
         self::assertEquals('0', $post->slug);
     }
@@ -496,7 +497,7 @@ public function testFalsyString(): void
     public function testFalsyInt(): void
     {
         $post = Post::create([
-            'title' => 0
+            'title' => 0,
         ]);
         self::assertEquals('0', $post->slug);
     }
@@ -507,7 +508,7 @@ public function testFalsyInt(): void
     public function testTrueSource(): void
     {
         $post = Post::create([
-            'title' => true
+            'title' => true,
         ]);
         self::assertEquals('1', $post->slug);
     }
@@ -518,7 +519,7 @@ public function testTrueSource(): void
     public function testFalseSource(): void
     {
         $post = Post::create([
-            'title' => false
+            'title' => false,
         ]);
         self::assertEquals('0', $post->slug);
     }
@@ -530,7 +531,7 @@ public function testFalseSource(): void
     public function testIssue527(): void
     {
         $post = Post::create([
-            'title' => 'example title'
+            'title' => 'example title',
         ]);
         self::assertEquals('example-title', $post->slug);
 
@@ -551,12 +552,12 @@ public function testIssue527(): void
     public function testPrimaryKeyInSource(): void
     {
         $post = PostWithIdSourceOnSaved::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         self::assertEquals('my-first-post-1', $post->slug);
 
         $post2 = PostWithIdSourceOnSaved::create([
-            'title' => 'My Second Post'
+            'title' => 'My Second Post',
         ]);
         self::assertEquals('my-second-post-2', $post2->slug);
 
@@ -587,7 +588,7 @@ public function testOnSavedPersistsSlug()
     public function testPrimaryKeyInSourceOnSaving(): void
     {
         $post = PostWithIdSource::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         self::assertEquals('my-first-post', $post->slug);
 
@@ -603,8 +604,8 @@ public function testPrimaryKeyInSourceOnSaving(): void
     public function testCustomMethodArrayCall(): void
     {
         $post = PostWithCustomMethodArrayCall::create([
-            'title' => 'A Post Title',
-            'subtitle' => 'A Subtitle'
+            'title'    => 'A Post Title',
+            'subtitle' => 'A Subtitle',
         ]);
         self::assertEquals('eltit-tsop-a', $post->slug);
     }
diff --git a/tests/EventTests.php b/tests/EventTests.php
index 4862128..766d8f3 100644
--- a/tests/EventTests.php
+++ b/tests/EventTests.php
@@ -1,4 +1,6 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Cviebrock\EloquentSluggable\Tests\Listeners\AbortSlugging;
 use Cviebrock\EloquentSluggable\Tests\Listeners\DoNotAbortSlugging;
@@ -6,13 +8,12 @@
 use Illuminate\Support\Facades\Event;
 
 /**
- * Class EventTests
+ * Class EventTests.
  *
- * @package Tests
+ * @internal
  */
 class EventTests extends TestCase
 {
-
     /**
      * Test that the "slugging" event is fired.
      */
@@ -24,7 +25,7 @@ public function testEventsAreFired(): void
         ]);
 
         Post::create([
-            'title' => 'My Test Post'
+            'title' => 'My Test Post',
         ]);
 
         Event::assertDispatched('eloquent.slugging: ' . Post::class);
@@ -43,7 +44,7 @@ public function testDoNotCancelSluggingEventWhenItReturnsAnythingOtherThanFalse(
         $this->app['events']->listen('eloquent.slugging: ' . Post::class, DoNotAbortSlugging::class);
 
         $post = Post::create([
-            'title' => 'My Test Post'
+            'title' => 'My Test Post',
         ]);
 
         self::assertEquals('my-test-post', $post->slug);
@@ -59,7 +60,7 @@ public function testCancelSluggingEvent(): void
         $this->app['events']->listen('eloquent.slugging: ' . Post::class, AbortSlugging::class);
 
         $post = Post::create([
-            'title' => 'My Test Post'
+            'title' => 'My Test Post',
         ]);
 
         self::assertEquals(null, $post->slug);
diff --git a/tests/Listeners/AbortSlugging.php b/tests/Listeners/AbortSlugging.php
index ab52509..ed5a321 100644
--- a/tests/Listeners/AbortSlugging.php
+++ b/tests/Listeners/AbortSlugging.php
@@ -1,20 +1,14 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Listeners;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Listeners;
 
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class AbortSlugging
- *
- * @package Tests\Listeners
+ * Class AbortSlugging.
  */
 class AbortSlugging
 {
-
-    /**
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @param string $event
-     * @return bool
-     */
     public function handle(Model $model, string $event): bool
     {
         return false;
diff --git a/tests/Listeners/DoNotAbortSlugging.php b/tests/Listeners/DoNotAbortSlugging.php
index 9b822ee..35c1335 100644
--- a/tests/Listeners/DoNotAbortSlugging.php
+++ b/tests/Listeners/DoNotAbortSlugging.php
@@ -1,20 +1,14 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Listeners;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Listeners;
 
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class AbortSlugging
- *
- * @package Tests\Listeners
+ * Class AbortSlugging.
  */
 class DoNotAbortSlugging
 {
-
-    /**
-     * @param \Illuminate\Database\Eloquent\Model $model
-     * @param string $event
-     * @return bool
-     */
     public function handle(Model $model, string $event): bool
     {
         return true;
diff --git a/tests/Models/Author.php b/tests/Models/Author.php
index 2b913f7..df24079 100644
--- a/tests/Models/Author.php
+++ b/tests/Models/Author.php
@@ -1,27 +1,26 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class Author
+ * Class Author.
  *
  * A test model used for the relationship tests.
  *
- * @package Cviebrock\EloquentSluggable\Tests\Models
- *
- * @property integer $id
+ * @property int    $id
  * @property string $name
  */
 class Author extends Model
 {
-
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public $timestamps = false;
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected $fillable = ['name'];
 }
diff --git a/tests/Models/Post.php b/tests/Models/Post.php
index 2ffdb09..bc8bcf3 100644
--- a/tests/Models/Post.php
+++ b/tests/Models/Post.php
@@ -1,37 +1,36 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class Post
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class Post.
  *
- * @property int $id
- * @property string $title
+ * @property int     $id
+ * @property string  $title
  * @property ?string $subtitle
  * @property ?string $slug
  * @property ?string $dummy
- * @property ?int $author_id
+ * @property ?int    $author_id
  */
 class Post extends Model
 {
-
     use Sluggable;
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected $table = 'posts';
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public $timestamps = false;
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected $fillable = ['title', 'subtitle', 'slug', 'dummy', 'author_id'];
 
@@ -47,15 +46,13 @@ public function __toString()
 
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title'
-            ]
+                'source' => 'title',
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostNotSluggable.php b/tests/Models/PostNotSluggable.php
index 9bcff5d..91b4998 100644
--- a/tests/Models/PostNotSluggable.php
+++ b/tests/Models/PostNotSluggable.php
@@ -1,36 +1,35 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class PostNotSluggable
+ * Class PostNotSluggable.
  *
  * A test model that doesn't use the Sluggable package.
  *
- * @package Cviebrock\EloquentSluggable\Tests\Models
- *
- * @property int $id
- * @property string $title
+ * @property int     $id
+ * @property string  $title
  * @property ?string $subtitle
  * @property ?string $slug
  * @property ?string $dummy
- * @property ?int $author_id
+ * @property ?int    $author_id
  */
 class PostNotSluggable extends Model
 {
-
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected $table = 'posts';
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public $timestamps = false;
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     protected $fillable = ['title', 'subtitle'];
 
diff --git a/tests/Models/PostShortConfig.php b/tests/Models/PostShortConfig.php
index d824997..00d6023 100644
--- a/tests/Models/PostShortConfig.php
+++ b/tests/Models/PostShortConfig.php
@@ -1,22 +1,19 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostShortConfig
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostShortConfig.
  */
 class PostShortConfig extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
-            'slug'
+            'slug',
         ];
     }
 }
diff --git a/tests/Models/PostShortConfigWithScopeHelpers.php b/tests/Models/PostShortConfigWithScopeHelpers.php
index 3548234..a02f8a5 100644
--- a/tests/Models/PostShortConfigWithScopeHelpers.php
+++ b/tests/Models/PostShortConfigWithScopeHelpers.php
@@ -1,26 +1,23 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Cviebrock\EloquentSluggable\SluggableScopeHelpers;
 
 /**
- * Class PostShortConfigWithScopeHelpers
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostShortConfigWithScopeHelpers.
  */
 class PostShortConfigWithScopeHelpers extends Post
 {
-
     use SluggableScopeHelpers;
 
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
-            'slug_field'
+            'slug_field',
         ];
     }
 }
diff --git a/tests/Models/PostWithCustomCallableMethod.php b/tests/Models/PostWithCustomCallableMethod.php
index fc57d96..f2d10a9 100644
--- a/tests/Models/PostWithCustomCallableMethod.php
+++ b/tests/Models/PostWithCustomCallableMethod.php
@@ -1,32 +1,29 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
 
-use Illuminate\Support\Str;
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
+use Illuminate\Support\Str;
 
 /**
- * Class PostWithCustomCallableMethod
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithCustomCallableMethod.
  */
 class PostWithCustomCallableMethod extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
                 'source' => 'title',
-                'method' => [ static::class, 'makeSlug' ]
-            ]
+                'method' => [static::class, 'makeSlug'],
+            ],
         ];
     }
 
-    public static function makeSlug($string, $separator) {
+    public static function makeSlug($string, $separator)
+    {
         return strrev(Str::slug($string, $separator));
     }
 }
diff --git a/tests/Models/PostWithCustomEngine.php b/tests/Models/PostWithCustomEngine.php
index 4e7b561..6d134de 100644
--- a/tests/Models/PostWithCustomEngine.php
+++ b/tests/Models/PostWithCustomEngine.php
@@ -1,23 +1,16 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
 
-use Cocur\Slugify\Slugify;
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
+use Cocur\Slugify\Slugify;
 
 /**
- * Class PostCustomEngine
+ * Class PostCustomEngine.
  *
  * A test model that customizes the Slugify engine with custom rules.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithCustomEngine extends Post
 {
-
-    /**
-     * @param \Cocur\Slugify\Slugify $engine
-     * @param string $attribute
-     * @return \Cocur\Slugify\Slugify
-     */
     public function customizeSlugEngine(Slugify $engine, string $attribute): Slugify
     {
         $engine->addRule('e', 'a');
diff --git a/tests/Models/PostWithCustomEngine2.php b/tests/Models/PostWithCustomEngine2.php
index 8da8c35..496e26c 100644
--- a/tests/Models/PostWithCustomEngine2.php
+++ b/tests/Models/PostWithCustomEngine2.php
@@ -1,25 +1,18 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
 
-use Cocur\Slugify\Slugify;
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
+use Cocur\Slugify\Slugify;
 
 /**
- * Class PostCustomEngine2
+ * Class PostCustomEngine2.
  *
  * A test model that customizes the Slugify engine with other custom rules.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithCustomEngine2 extends Post
 {
-
-    /**
-     * @param \Cocur\Slugify\Slugify $engine
-     * @param string $attribute
-     * @return \Cocur\Slugify\Slugify
-     */
     public function customizeSlugEngine(Slugify $engine, string $attribute): Slugify
     {
-        return new Slugify(['regexp'=>'|[^A-Za-z0-9/]+|']);
+        return new Slugify(['regexp' => '|[^A-Za-z0-9/]+|']);
     }
 }
diff --git a/tests/Models/PostWithCustomEngineOptions.php b/tests/Models/PostWithCustomEngineOptions.php
index 7d08f36..fd93ec8 100644
--- a/tests/Models/PostWithCustomEngineOptions.php
+++ b/tests/Models/PostWithCustomEngineOptions.php
@@ -1,30 +1,26 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithCustomEngineOptions
+ * Class PostWithCustomEngineOptions.
  *
  * A test model that customizes the Slugify engine with custom options.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithCustomEngineOptions extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
+                'source'            => 'title',
                 'slugEngineOptions' => [
-                    'lowercase' => false
-                ]
-            ]
+                    'lowercase' => false,
+                ],
+            ],
         ];
     }
-
 }
diff --git a/tests/Models/PostWithCustomMethod.php b/tests/Models/PostWithCustomMethod.php
index 24d42b2..62c39e6 100644
--- a/tests/Models/PostWithCustomMethod.php
+++ b/tests/Models/PostWithCustomMethod.php
@@ -1,20 +1,16 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
 
-use Illuminate\Support\Str;
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
+use Illuminate\Support\Str;
 
 /**
- * Class PostWithCustomMethod
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithCustomMethod.
  */
 class PostWithCustomMethod extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
@@ -23,8 +19,8 @@ public function sluggable(): array
                 'source' => 'title',
                 'method' => function ($string, $separator) {
                     return strrev(Str::slug($string, $separator));
-                }
-            ]
+                },
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithCustomMethodArrayCall.php b/tests/Models/PostWithCustomMethodArrayCall.php
index f77532b..4b637c3 100644
--- a/tests/Models/PostWithCustomMethodArrayCall.php
+++ b/tests/Models/PostWithCustomMethodArrayCall.php
@@ -8,16 +8,14 @@ class PostWithCustomMethodArrayCall extends Post
 {
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
                 'source' => 'title',
-                'method' => [SluggableCustomMethod::class, 'slug']
-            ]
+                'method' => [SluggableCustomMethod::class, 'slug'],
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithCustomSeparator.php b/tests/Models/PostWithCustomSeparator.php
index 7594980..98e6eeb 100644
--- a/tests/Models/PostWithCustomSeparator.php
+++ b/tests/Models/PostWithCustomSeparator.php
@@ -1,27 +1,24 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithCustomSeparator
+ * Class PostWithCustomSeparator.
  *
  * A test model that uses a custom suffix generation method.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithCustomSeparator extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
-                'separator' => '.'
-            ]
+                'source'    => 'title',
+                'separator' => '.',
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithCustomSource.php b/tests/Models/PostWithCustomSource.php
index aaf06a0..ea8b09d 100644
--- a/tests/Models/PostWithCustomSource.php
+++ b/tests/Models/PostWithCustomSource.php
@@ -1,26 +1,23 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithCustomSource
+ * Class PostWithCustomSource.
  *
  * A test model that uses a custom suffix generation method.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithCustomSource extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'subtitle'
-            ]
+                'source' => 'subtitle',
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithCustomSuffix.php b/tests/Models/PostWithCustomSuffix.php
index d96b72d..9c3e524 100644
--- a/tests/Models/PostWithCustomSuffix.php
+++ b/tests/Models/PostWithCustomSuffix.php
@@ -1,34 +1,30 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
 
-use Illuminate\Support\Collection;
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
+use Illuminate\Support\Collection;
 
 /**
- * Class PostWithCustomSuffix
+ * Class PostWithCustomSuffix.
  *
  * A test model that uses a custom suffix generation method.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithCustomSuffix extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
+                'source'       => 'title',
                 'uniqueSuffix' => function ($slug, $separator, Collection $list) {
                     $size = count($list);
 
                     return chr($size + 96);
-                }
-            ]
+                },
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithEagerRelation.php b/tests/Models/PostWithEagerRelation.php
index 959d3dc..752b9de 100644
--- a/tests/Models/PostWithEagerRelation.php
+++ b/tests/Models/PostWithEagerRelation.php
@@ -1,14 +1,11 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
 
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithEagerRelations
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithEagerRelations.
  */
 class PostWithEagerRelation extends PostWithRelation
 {
-
     protected $with = ['author'];
-
 }
diff --git a/tests/Models/PostWithEmptySeparator.php b/tests/Models/PostWithEmptySeparator.php
index 671e446..d13493b 100644
--- a/tests/Models/PostWithEmptySeparator.php
+++ b/tests/Models/PostWithEmptySeparator.php
@@ -1,27 +1,24 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithEmptySeparator
+ * Class PostWithEmptySeparator.
  *
  * A test model that uses an empty separator.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithEmptySeparator extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
+                'source'    => 'title',
                 'separator' => '',
-            ]
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithFirstUniqueSuffix.php b/tests/Models/PostWithFirstUniqueSuffix.php
index 6620ddd..93277c4 100644
--- a/tests/Models/PostWithFirstUniqueSuffix.php
+++ b/tests/Models/PostWithFirstUniqueSuffix.php
@@ -1,25 +1,22 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithFirstUniqueSuffix
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithFirstUniqueSuffix.
  */
 class PostWithFirstUniqueSuffix extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
+                'source'            => 'title',
                 'firstUniqueSuffix' => '42',
-            ]
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithForeignRuleset.php b/tests/Models/PostWithForeignRuleset.php
index 77a9da2..5769599 100644
--- a/tests/Models/PostWithForeignRuleset.php
+++ b/tests/Models/PostWithForeignRuleset.php
@@ -1,19 +1,18 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Cocur\Slugify\Slugify;
 
 /**
- * Class PostWithForeignRuleset
+ * Class PostWithForeignRuleset.
  *
  * A test model that customizes the Slugify engine with a foreign ruleset.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithForeignRuleset extends Post
 {
-
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function customizeSlugEngine(Slugify $engine, string $attribute): Slugify
     {
diff --git a/tests/Models/PostWithForeignRuleset2.php b/tests/Models/PostWithForeignRuleset2.php
index b5d459c..b0ba83b 100644
--- a/tests/Models/PostWithForeignRuleset2.php
+++ b/tests/Models/PostWithForeignRuleset2.php
@@ -1,27 +1,24 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithForeignRuleset
+ * Class PostWithForeignRuleset.
  *
  * A test model that customizes the Slugify engine with a foreign ruleset.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithForeignRuleset2 extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
+                'source'            => 'title',
                 'slugEngineOptions' => [
-                    'ruleset' => 'finnish'
+                    'ruleset' => 'finnish',
                 ],
             ],
         ];
diff --git a/tests/Models/PostWithIdSource.php b/tests/Models/PostWithIdSource.php
index fb5afca..6babd36 100644
--- a/tests/Models/PostWithIdSource.php
+++ b/tests/Models/PostWithIdSource.php
@@ -1,25 +1,22 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithIdSource
+ * Class PostWithIdSource.
  *
  * A test model that uses the model's ID in the slug source.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithIdSource extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => ['title','id'],
+                'source'   => ['title', 'id'],
                 'onUpdate' => true,
             ],
         ];
diff --git a/tests/Models/PostWithIdSourceOnSaved.php b/tests/Models/PostWithIdSourceOnSaved.php
index 01f65ed..7c3bd75 100644
--- a/tests/Models/PostWithIdSourceOnSaved.php
+++ b/tests/Models/PostWithIdSourceOnSaved.php
@@ -1,20 +1,19 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Cviebrock\EloquentSluggable\SluggableObserver;
 
 /**
- * Class PostWithIdSourceOnSaved
+ * Class PostWithIdSourceOnSaved.
  *
  * A test model that uses the model's ID in the slug source
  * and the SluggableObserver::SAVED event listener.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithIdSourceOnSaved extends Post
 {
-
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function sluggableEvent(): string
     {
@@ -23,14 +22,12 @@ public function sluggableEvent(): string
 
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => ['title','id'],
+                'source'   => ['title', 'id'],
                 'onUpdate' => true,
             ],
         ];
diff --git a/tests/Models/PostWithIncludeTrashed.php b/tests/Models/PostWithIncludeTrashed.php
index a57eebd..05110c0 100644
--- a/tests/Models/PostWithIncludeTrashed.php
+++ b/tests/Models/PostWithIncludeTrashed.php
@@ -1,23 +1,22 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithIncludeTrashed
+ * Class PostWithIncludeTrashed.
  *
  * A test model that uses the Sluggable package and "includeTrashed",
  * but does not use Laravel's SoftDeleting trait.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithIncludeTrashed extends Post
 {
-
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
-                'includeTrashed' => true
-            ]
+                'source'         => 'title',
+                'includeTrashed' => true,
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithMaxLength.php b/tests/Models/PostWithMaxLength.php
index 72b0cf0..efab612 100644
--- a/tests/Models/PostWithMaxLength.php
+++ b/tests/Models/PostWithMaxLength.php
@@ -1,25 +1,22 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithMaxLength
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithMaxLength.
  */
 class PostWithMaxLength extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
+                'source'    => 'title',
                 'maxLength' => 10,
-            ]
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithMaxLengthSplitWords.php b/tests/Models/PostWithMaxLengthSplitWords.php
index c76f549..aeefa0e 100644
--- a/tests/Models/PostWithMaxLengthSplitWords.php
+++ b/tests/Models/PostWithMaxLengthSplitWords.php
@@ -1,24 +1,21 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithMaxLength
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithMaxLength.
  */
 class PostWithMaxLengthSplitWords extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
-                'maxLength' => 10,
+                'source'             => 'title',
+                'maxLength'          => 10,
                 'maxLengthKeepWords' => false,
             ],
         ];
diff --git a/tests/Models/PostWithMultipleSlugs.php b/tests/Models/PostWithMultipleSlugs.php
index 04dd16a..8e82c5c 100644
--- a/tests/Models/PostWithMultipleSlugs.php
+++ b/tests/Models/PostWithMultipleSlugs.php
@@ -1,17 +1,14 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithMultipleSlugs
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithMultipleSlugs.
  */
 class PostWithMultipleSlugs extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
@@ -20,7 +17,7 @@ public function sluggable(): array
                 'source' => 'title',
             ],
             'dummy' => [
-                'source' => 'subtitle',
+                'source'    => 'subtitle',
                 'separator' => '.',
             ],
         ];
diff --git a/tests/Models/PostWithMultipleSlugsAndCustomSlugKey.php b/tests/Models/PostWithMultipleSlugsAndCustomSlugKey.php
index 55d5ad2..b3eb763 100644
--- a/tests/Models/PostWithMultipleSlugsAndCustomSlugKey.php
+++ b/tests/Models/PostWithMultipleSlugsAndCustomSlugKey.php
@@ -1,13 +1,11 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithMultipleSlugsAndCustomSlugKey
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithMultipleSlugsAndCustomSlugKey.
  */
 class PostWithMultipleSlugsAndCustomSlugKey extends PostWithMultipleSlugsAndHelperTrait
 {
-
     protected $slugKeyName = 'dummy';
-    
 }
diff --git a/tests/Models/PostWithMultipleSlugsAndHelperTrait.php b/tests/Models/PostWithMultipleSlugsAndHelperTrait.php
index a74088c..080fab3 100644
--- a/tests/Models/PostWithMultipleSlugsAndHelperTrait.php
+++ b/tests/Models/PostWithMultipleSlugsAndHelperTrait.php
@@ -1,15 +1,13 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Cviebrock\EloquentSluggable\SluggableScopeHelpers;
 
 /**
- * Class PostWithMultipleSlugsAndPrimary
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithMultipleSlugsAndPrimary.
  */
 class PostWithMultipleSlugsAndHelperTrait extends PostWithMultipleSlugs
 {
-
     use SluggableScopeHelpers;
-
 }
diff --git a/tests/Models/PostWithMultipleSources.php b/tests/Models/PostWithMultipleSources.php
index 688dd03..a5bc0e8 100644
--- a/tests/Models/PostWithMultipleSources.php
+++ b/tests/Models/PostWithMultipleSources.php
@@ -1,24 +1,21 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithMultipleSources
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithMultipleSources.
  */
 class PostWithMultipleSources extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
                 'source' => ['title', 'subtitle'],
-            ]
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithNoSource.php b/tests/Models/PostWithNoSource.php
index ece5f1c..53ec8ac 100644
--- a/tests/Models/PostWithNoSource.php
+++ b/tests/Models/PostWithNoSource.php
@@ -1,26 +1,23 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithNoSource
+ * Class PostWithNoSource.
  *
  * A test model with no source field defined.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithNoSource extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => null
-            ]
+                'source' => null,
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithOnUpdate.php b/tests/Models/PostWithOnUpdate.php
index a60a86e..fe5ef31 100644
--- a/tests/Models/PostWithOnUpdate.php
+++ b/tests/Models/PostWithOnUpdate.php
@@ -1,27 +1,24 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithOnUpdate
+ * Class PostWithOnUpdate.
  *
  * A test model that uses the onUpdate functionality.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithOnUpdate extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
-                'onUpdate' => true
-            ]
+                'source'   => 'title',
+                'onUpdate' => true,
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithRelation.php b/tests/Models/PostWithRelation.php
index e1c4b6e..95e1046 100644
--- a/tests/Models/PostWithRelation.php
+++ b/tests/Models/PostWithRelation.php
@@ -1,37 +1,32 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * Class PostWithRelation
+ * Class PostWithRelation.
  *
  * A test model used for the relationship tests.
  *
- * @package Cviebrock\EloquentSluggable\Tests\Models
- *
- * @property \Cviebrock\EloquentSluggable\Tests\Models\Author|null $author
+ * @property Author|null $author
  */
 class PostWithRelation extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
                 'source' => ['author.name', 'title'],
-            ]
+            ],
         ];
     }
 
     /**
      * Relation to Author model.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function author(): BelongsTo
     {
diff --git a/tests/Models/PostWithReservedSlug.php b/tests/Models/PostWithReservedSlug.php
index 76727f4..8a11e31 100644
--- a/tests/Models/PostWithReservedSlug.php
+++ b/tests/Models/PostWithReservedSlug.php
@@ -1,27 +1,24 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 /**
- * Class PostWithReservedSlug
+ * Class PostWithReservedSlug.
  *
  * A test model that uses custom reserved slug names.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithReservedSlug extends Post
 {
-
     /**
      * Return the sluggable configuration array for this model.
-     *
-     * @return array
      */
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
-                'reserved' => ['add','add-1']
-            ]
+                'source'   => 'title',
+                'reserved' => ['add', 'add-1'],
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithSoftDeleting.php b/tests/Models/PostWithSoftDeleting.php
index bc90c36..128c687 100644
--- a/tests/Models/PostWithSoftDeleting.php
+++ b/tests/Models/PostWithSoftDeleting.php
@@ -1,16 +1,15 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class PostWithSoftDeleting
+ * Class PostWithSoftDeleting.
  *
  * A test model that uses the Sluggable package and uses Laravel's SoftDeleting trait.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithSoftDeleting extends Post
 {
-
     use SoftDeletes;
 }
diff --git a/tests/Models/PostWithSoftDeletingIncludeTrashed.php b/tests/Models/PostWithSoftDeletingIncludeTrashed.php
index 2f3b2e3..5598302 100644
--- a/tests/Models/PostWithSoftDeletingIncludeTrashed.php
+++ b/tests/Models/PostWithSoftDeletingIncludeTrashed.php
@@ -1,27 +1,26 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class PostWithSoftDeletingIncludeTrashed
+ * Class PostWithSoftDeletingIncludeTrashed.
  *
  * A test model that uses the Sluggable package and uses Laravel's SoftDeleting trait
  * but includes trashed models.
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
  */
 class PostWithSoftDeletingIncludeTrashed extends Post
 {
-
     use SoftDeletes;
 
     public function sluggable(): array
     {
         return [
             'slug' => [
-                'source' => 'title',
-                'includeTrashed' => true
-            ]
+                'source'         => 'title',
+                'includeTrashed' => true,
+            ],
         ];
     }
 }
diff --git a/tests/Models/PostWithUniqueSlugConstraints.php b/tests/Models/PostWithUniqueSlugConstraints.php
index d43fbcd..96f4af8 100644
--- a/tests/Models/PostWithUniqueSlugConstraints.php
+++ b/tests/Models/PostWithUniqueSlugConstraints.php
@@ -1,23 +1,20 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests\Models;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests\Models;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * Class PostWithUniqueSlugConstraints
- *
- * @package Cviebrock\EloquentSluggable\Tests\Models
+ * Class PostWithUniqueSlugConstraints.
  *
- * @property \Cviebrock\EloquentSluggable\Tests\Models\Author|null $author
+ * @property Author|null $author
  */
 class PostWithUniqueSlugConstraints extends Post
 {
-
     /**
      * Relation to Author model.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function author(): BelongsTo
     {
@@ -25,7 +22,7 @@ public function author(): BelongsTo
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function scopeWithUniqueSlugConstraints(Builder $query, Model $model, $attribute, $config, $slug): Builder
     {
@@ -34,5 +31,4 @@ public function scopeWithUniqueSlugConstraints(Builder $query, Model $model, $at
 
         return $query->where('author_id', $author->getKey());
     }
-
 }
diff --git a/tests/OnUpdateTests.php b/tests/OnUpdateTests.php
index 33c4aa3..a15cfcb 100644
--- a/tests/OnUpdateTests.php
+++ b/tests/OnUpdateTests.php
@@ -1,29 +1,30 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Cviebrock\EloquentSluggable\Tests\Models\Post;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithOnUpdate;
 
 /**
- * Class OnUpdateTests
+ * Class OnUpdateTests.
  *
- * @package Tests
+ * @internal
  */
 class OnUpdateTests extends TestCase
 {
-
     /**
      * Test that the slug isn't regenerated if onUpdate is false.
      */
     public function testSlugDoesntChangeWithoutOnUpdate(): void
     {
         $post = Post::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         $post->save();
         self::assertEquals('my-first-post', $post->slug);
 
         $post->update([
-            'title' => 'A New Title'
+            'title' => 'A New Title',
         ]);
         self::assertEquals('my-first-post', $post->slug);
     }
@@ -34,14 +35,14 @@ public function testSlugDoesntChangeWithoutOnUpdate(): void
     public function testSlugDoesChangeWhenEmptiedManually(): void
     {
         $post = Post::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         $post->save();
         self::assertEquals('my-first-post', $post->slug);
 
         $post->slug = null;
         $post->update([
-            'title' => 'A New Title'
+            'title' => 'A New Title',
         ]);
         self::assertEquals('a-new-title', $post->slug);
     }
@@ -52,13 +53,13 @@ public function testSlugDoesChangeWhenEmptiedManually(): void
     public function testSlugDoesChangeWithOnUpdate(): void
     {
         $post = PostWithOnUpdate::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         $post->save();
         self::assertEquals('my-first-post', $post->slug);
 
         $post->update([
-            'title' => 'A New Title'
+            'title' => 'A New Title',
         ]);
         self::assertEquals('a-new-title', $post->slug);
     }
@@ -70,13 +71,13 @@ public function testSlugDoesChangeWithOnUpdate(): void
     public function testSlugDoesNotChangeIfSourceDoesNotChange(): void
     {
         $post = PostWithOnUpdate::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         $post->save();
         self::assertEquals('my-first-post', $post->slug);
 
         $post->update([
-            'subtitle' => 'A Subtitle'
+            'subtitle' => 'A Subtitle',
         ]);
         self::assertEquals('my-first-post', $post->slug);
     }
@@ -91,7 +92,7 @@ public function testSlugDoesNotChangeIfSourceDoesNotChange(): void
     public function testSlugDoesNotChangeIfSourceDoesNotChangeMultiple(): void
     {
         $data = [
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ];
         $post1 = PostWithOnUpdate::create($data);
         $post2 = PostWithOnUpdate::create($data);
@@ -100,7 +101,7 @@ public function testSlugDoesNotChangeIfSourceDoesNotChangeMultiple(): void
         self::assertEquals('my-first-post-4', $post4->slug);
 
         $post4->update([
-            'subtitle' => 'A Subtitle'
+            'subtitle' => 'A Subtitle',
         ]);
         self::assertEquals('my-first-post-4', $post4->slug);
     }
@@ -112,13 +113,13 @@ public function testSlugDoesNotChangeIfSourceDoesNotChangeMultiple(): void
     public function testSlugDoesNotChangeIfSourceNotProvidedInModel(): void
     {
         $post = Post::create([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         self::assertEquals('my-first-post', $post->slug);
 
-        $post = Post::whereKey($post->id)->first(['id','subtitle']);
+        $post = Post::whereKey($post->id)->first(['id', 'subtitle']);
         $post->update([
-            'subtitle' => 'A Subtitle'
+            'subtitle' => 'A Subtitle',
         ]);
 
         $post = Post::findOrFail($post->id);
diff --git a/tests/RelationTests.php b/tests/RelationTests.php
index 8735301..e10105b 100644
--- a/tests/RelationTests.php
+++ b/tests/RelationTests.php
@@ -1,17 +1,18 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Cviebrock\EloquentSluggable\Tests\Models\Author;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithEagerRelation;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class RelationTests
+ * Class RelationTests.
  *
- * @package Tests
+ * @internal
  */
 class RelationTests extends TestCase
 {
-
     /**
      * Test basic slugging functionality.
      */
@@ -20,10 +21,10 @@ public function testEagerLoading(): void
         Model::shouldBeStrict(true);
 
         $author = Author::create([
-            'name' => 'Arthur Conan Doyle'
+            'name' => 'Arthur Conan Doyle',
         ]);
         $post = new PostWithEagerRelation([
-            'title' => 'My First Post'
+            'title' => 'My First Post',
         ]);
         $post->author()->associate($author);
         $post->save();
@@ -37,5 +38,4 @@ public function testEagerLoading(): void
         $post2->save();
         self::assertEquals('arthur-conan-doyle-my-second-post', $post2->slug);
     }
-
 }
diff --git a/tests/ScopeHelperTests.php b/tests/ScopeHelperTests.php
index 8f16de2..153267d 100644
--- a/tests/ScopeHelperTests.php
+++ b/tests/ScopeHelperTests.php
@@ -1,4 +1,6 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Cviebrock\EloquentSluggable\Tests\Models\PostShortConfigWithScopeHelpers;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithMultipleSlugsAndCustomSlugKey;
@@ -6,22 +8,20 @@
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 /**
- * Class ScopeHelperTests
+ * Class ScopeHelperTests.
  *
- * @package Tests
+ * @internal
  */
 class ScopeHelperTests extends TestCase
 {
-
     /**
      * Test that primary slug is set to $model->slugKeyName when set.
      */
     public function testSlugKeyNameProperty(): void
     {
-
         $post = PostWithMultipleSlugsAndCustomSlugKey::create([
-            'title' => 'A Post Title',
-            'subtitle' => 'A Post Subtitle'
+            'title'    => 'A Post Title',
+            'subtitle' => 'A Post Subtitle',
         ]);
 
         self::assertEquals('dummy', $post->getSlugKeyName());
@@ -35,7 +35,7 @@ public function testSlugKeyNameProperty(): void
     public function testFirstSlugAsFallback(): void
     {
         $post = PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title'
+            'title' => 'A Post Title',
         ]);
 
         self::assertEquals('slug', $post->getSlugKeyName());
@@ -47,21 +47,22 @@ public function testFirstSlugAsFallback(): void
      */
     public function testQueryScope(): void
     {
-
         PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title A'
+            'title' => 'A Post Title A',
         ]);
 
         $post = PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title B'
+            'title' => 'A Post Title B',
         ]);
 
         PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title C'
+            'title' => 'A Post Title C',
         ]);
 
-        self::assertEquals($post->getKey(),
-            PostWithMultipleSlugsAndHelperTrait::whereSlug('a-post-title-b')->first()->getKey());
+        self::assertEquals(
+            $post->getKey(),
+            PostWithMultipleSlugsAndHelperTrait::whereSlug('a-post-title-b')->first()->getKey()
+        );
     }
 
     /**
@@ -69,21 +70,22 @@ public function testQueryScope(): void
      */
     public function testFindBySlug(): void
     {
-
         PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title A'
+            'title' => 'A Post Title A',
         ]);
 
         $post = PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title B'
+            'title' => 'A Post Title B',
         ]);
 
         PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title C'
+            'title' => 'A Post Title C',
         ]);
 
-        self::assertEquals($post->getKey(),
-            PostWithMultipleSlugsAndHelperTrait::findBySlug('a-post-title-b')->getKey());
+        self::assertEquals(
+            $post->getKey(),
+            PostWithMultipleSlugsAndHelperTrait::findBySlug('a-post-title-b')->getKey()
+        );
     }
 
     /**
@@ -100,19 +102,21 @@ public function testFindBySlugReturnsNullForNoRecord(): void
     public function testFindBySlugOrFail(): void
     {
         PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title A'
+            'title' => 'A Post Title A',
         ]);
 
         $post = PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title B'
+            'title' => 'A Post Title B',
         ]);
 
         PostWithMultipleSlugsAndHelperTrait::create([
-            'title' => 'A Post Title C'
+            'title' => 'A Post Title C',
         ]);
 
-        self::assertEquals($post->getKey(),
-            PostWithMultipleSlugsAndHelperTrait::findBySlugOrFail('a-post-title-b')->getKey());
+        self::assertEquals(
+            $post->getKey(),
+            PostWithMultipleSlugsAndHelperTrait::findBySlugOrFail('a-post-title-b')->getKey()
+        );
 
         $this->expectException(ModelNotFoundException::class);
 
diff --git a/tests/SoftDeleteTests.php b/tests/SoftDeleteTests.php
index 1369a87..2d144c1 100644
--- a/tests/SoftDeleteTests.php
+++ b/tests/SoftDeleteTests.php
@@ -1,31 +1,32 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithIncludeTrashed;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithSoftDeleting;
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithSoftDeletingIncludeTrashed;
 
 /**
- * Class SoftDeleteTests
+ * Class SoftDeleteTests.
  *
- * @package Tests
+ * @internal
  */
 class SoftDeleteTests extends TestCase
 {
-
     /**
      * Test uniqueness with soft deletes when we ignore trashed models.
      */
     public function testSoftDeletesWithoutTrashed(): void
     {
         $post1 = PostWithSoftDeleting::create([
-            'title' => 'A Post Title'
+            'title' => 'A Post Title',
         ]);
         self::assertEquals('a-post-title', $post1->slug);
 
         $post1->delete();
 
         $post2 = PostWithSoftDeleting::create([
-            'title' => 'A Post Title'
+            'title' => 'A Post Title',
         ]);
         self::assertEquals('a-post-title', $post2->slug);
     }
@@ -36,14 +37,14 @@ public function testSoftDeletesWithoutTrashed(): void
     public function testSoftDeletesWithTrashed(): void
     {
         $post1 = PostWithSoftDeletingIncludeTrashed::create([
-            'title' => 'A Post Title'
+            'title' => 'A Post Title',
         ]);
         self::assertEquals('a-post-title', $post1->slug);
 
         $post1->delete();
 
         $post2 = PostWithSoftDeletingIncludeTrashed::create([
-            'title' => 'A Post Title'
+            'title' => 'A Post Title',
         ]);
         self::assertEquals('a-post-title-2', $post2->slug);
     }
@@ -54,7 +55,7 @@ public function testSoftDeletesWithTrashed(): void
     public function testSoftDeletesWithNonSoftDeleteModel(): void
     {
         $post1 = PostWithIncludeTrashed::create([
-            'title' => 'A Post Title'
+            'title' => 'A Post Title',
         ]);
         self::assertEquals('a-post-title', $post1->slug);
     }
diff --git a/tests/StaticTests.php b/tests/StaticTests.php
index 59ef1d2..eec23c8 100644
--- a/tests/StaticTests.php
+++ b/tests/StaticTests.php
@@ -1,16 +1,17 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Cviebrock\EloquentSluggable\Services\SlugService;
 use Cviebrock\EloquentSluggable\Tests\Models\Post;
 
 /**
- * Class StaticTests
+ * Class StaticTests.
  *
- * @package Tests
+ * @internal
  */
 class StaticTests extends TestCase
 {
-
     /**
      * Test that we can generate a slug statically.
      */
@@ -38,14 +39,14 @@ public function testStaticSlugGeneratorWhenEntriesExist(): void
     public function testStaticSlugGeneratorWithConfig(): void
     {
         $config = [
-            'separator' => '.'
+            'separator' => '.',
         ];
         $slug = SlugService::createSlug(Post::class, 'slug', 'My Test Post', $config);
         self::assertEquals('my.test.post', $slug);
     }
 
     /**
-     * Test passing an invalid attribute to static method
+     * Test passing an invalid attribute to static method.
      */
     public function testStaticSlugWithInvalidAttribute(): void
     {
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 35e66d2..0a18bc8 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,22 +1,18 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Cviebrock\EloquentSluggable\ServiceProvider;
 use Illuminate\Contracts\Events\Dispatcher;
-use Mockery;
 use Orchestra\Testbench\TestCase as Orchestra;
 
 /**
- * Class TestCase
- *
- * @package Tests
+ * Class TestCase.
  */
 abstract class TestCase extends Orchestra
 {
-
     /**
      * Setup the test environment.
-     *
-     * @return void
      */
     public function setUp(): void
     {
@@ -30,27 +26,27 @@ public function setUp(): void
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     protected function getEnvironmentSetUp($app)
     {
         // set up database configuration
         $app['config']->set('database.default', 'testbench');
         $app['config']->set('database.connections.testbench', [
-            'driver' => 'sqlite',
+            'driver'   => 'sqlite',
             'database' => ':memory:',
-            'prefix' => '',
+            'prefix'   => '',
         ]);
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     protected function getPackageProviders($app)
     {
         return [
             ServiceProvider::class,
-            TestServiceProvider::class
+            TestServiceProvider::class,
         ];
     }
 
@@ -61,7 +57,7 @@ protected function getPackageProviders($app)
      */
     protected function withoutEvents(): self
     {
-        $mock = Mockery::mock(Dispatcher::class);
+        $mock = \Mockery::mock(Dispatcher::class);
 
         $mock->shouldReceive('fire', 'until');
 
diff --git a/tests/TestServiceProvider.php b/tests/TestServiceProvider.php
index 39c0601..b49d97e 100644
--- a/tests/TestServiceProvider.php
+++ b/tests/TestServiceProvider.php
@@ -1,15 +1,14 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 
 /**
- * Class TestServiceProvider
- *
- * @package Cviebrock\EloquentSluggable
+ * Class TestServiceProvider.
  */
 class TestServiceProvider extends BaseServiceProvider
 {
-
     /**
      * Indicates if loading of the provider is deferred.
      *
@@ -19,8 +18,6 @@ class TestServiceProvider extends BaseServiceProvider
 
     /**
      * Bootstrap the application events.
-     *
-     * @return void
      */
     public function boot(): void
     {
diff --git a/tests/UniqueTests.php b/tests/UniqueTests.php
index c6cda7b..8a5a853 100644
--- a/tests/UniqueTests.php
+++ b/tests/UniqueTests.php
@@ -1,4 +1,6 @@
-<?php namespace Cviebrock\EloquentSluggable\Tests;
+<?php
+
+namespace Cviebrock\EloquentSluggable\Tests;
 
 use Cviebrock\EloquentSluggable\Tests\Models\Author;
 use Cviebrock\EloquentSluggable\Tests\Models\Post;
@@ -6,13 +8,12 @@
 use Cviebrock\EloquentSluggable\Tests\Models\PostWithUniqueSlugConstraints;
 
 /**
- * Class UniqueTests
+ * Class UniqueTests.
  *
- * @package Tests
+ * @internal
  */
 class UniqueTests extends TestCase
 {
-
     /**
      * Test uniqueness of generated slugs.
      */
@@ -20,7 +21,7 @@ public function testUnique(): void
     {
         for ($i = 1; $i <= 20; $i++) {
             $post = Post::create([
-                'title' => 'A post title'
+                'title' => 'A post title',
             ]);
             if ($i === 1) {
                 self::assertEquals('a-post-title', $post->slug);
@@ -36,19 +37,19 @@ public function testUnique(): void
     public function testUniqueAfterDelete(): void
     {
         $post1 = Post::create([
-            'title' => 'A post title'
+            'title' => 'A post title',
         ]);
         self::assertEquals('a-post-title', $post1->slug);
 
         $post2 = Post::create([
-            'title' => 'A post title'
+            'title' => 'A post title',
         ]);
         self::assertEquals('a-post-title-2', $post2->slug);
 
         $post1->delete();
 
         $post3 = Post::create([
-            'title' => 'A post title'
+            'title' => 'A post title',
         ]);
         self::assertEquals('a-post-title', $post3->slug);
     }
@@ -93,28 +94,28 @@ public function testCustomUniqueQueryScope(): void
     public function testIssue431(): void
     {
         $post1 = Post::create([
-            'title' => 'A post title'
+            'title' => 'A post title',
         ]);
         self::assertEquals('a-post-title', $post1->slug);
 
-        $post2 = new Post;
+        $post2 = new Post();
         $post2->title = 'A post title';
         $post2->save();
         self::assertEquals('a-post-title-2', $post2->slug);
     }
 
     /**
-     * Test custom firstUniqueSuffix configuration
+     * Test custom firstUniqueSuffix configuration.
      */
     public function testFirstUniqueSuffix(): void
     {
         $post1 = PostWithFirstUniqueSuffix::create([
-            'title' => 'A post title'
+            'title' => 'A post title',
         ]);
         self::assertEquals('a-post-title', $post1->slug);
 
         $post2 = PostWithFirstUniqueSuffix::create([
-            'title' => 'A post title'
+            'title' => 'A post title',
         ]);
         self::assertEquals('a-post-title-42', $post2->slug);
     }
diff --git a/tests/database/migrations/2013_11_04_163552_posts.php b/tests/database/migrations/2013_11_04_163552_posts.php
index 4760c2c..e46ee55 100644
--- a/tests/database/migrations/2013_11_04_163552_posts.php
+++ b/tests/database/migrations/2013_11_04_163552_posts.php
@@ -4,17 +4,13 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-
 /**
- * Class Posts
+ * Class Posts.
  */
 class Posts extends Migration
 {
-
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up(): void
     {
@@ -31,12 +27,9 @@ public function up(): void
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down(): void
     {
         Schema::drop('posts');
     }
-
 }
diff --git a/tests/database/migrations/2015_08_17_185144_authors.php b/tests/database/migrations/2015_08_17_185144_authors.php
index 3332e50..17cf98b 100644
--- a/tests/database/migrations/2015_08_17_185144_authors.php
+++ b/tests/database/migrations/2015_08_17_185144_authors.php
@@ -4,17 +4,13 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-
 /**
- * Class Authors
+ * Class Authors.
  */
 class Authors extends Migration
 {
-
     /**
      * Run the migrations.
-     *
-     * @return void
      */
     public function up(): void
     {
@@ -26,8 +22,6 @@ public function up(): void
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
     public function down(): void
     {