[4.x] Consolidate database directory

composer.json

@@ -16,7 +16,7 @@
     "require": {
         "php": "^7.3",
         "ext-json": "*",
-        "laravel/framework": "^8.0",
+        "laravel/framework": "^8.2",
         "symfony/var-dumper": "^5.0"
     },
     "require-dev": {
@@ -25,7 +25,8 @@
     },
     "autoload": {
         "psr-4": {
-            "Laravel\\Telescope\\": "src/"
+            "Laravel\\Telescope\\": "src/",
+            "Laravel\\Telescope\\Database\\Factories\\": "database/factories/"
         }
     },
     "autoload-dev": {

tests/EntryModelFactory.php → database/factories/EntryModelFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Laravel\Telescope\Tests;
+namespace Laravel\Telescope\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Laravel\Telescope\EntryType;

src/Storage/EntryModel.php

@@ -2,10 +2,14 @@
 
 namespace Laravel\Telescope\Storage;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Laravel\Telescope\Database\Factories\EntryModelFactory;
 
 class EntryModel extends Model
 {
+    use HasFactory;
+
     /**
      * The table associated with the model.
      *
@@ -179,4 +183,14 @@ public function getConnectionName()
     {
         return config('telescope.storage.database.connection');
     }
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    public static function newFactory()
+    {
+        return EntryModelFactory::new();
+    }
 }

src/TelescopeServiceProvider.php

@@ -71,7 +71,7 @@ private function routeConfiguration()
     private function registerMigrations()
     {
         if ($this->app->runningInConsole() && $this->shouldMigrate()) {
-            $this->loadMigrationsFrom(__DIR__.'/Storage/migrations');
+            $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
         }
     }
 

tests/Console/ClearCommandTest.php

@@ -3,8 +3,8 @@
 namespace Laravel\Telescope\Tests\Console;
 
 use Illuminate\Support\Facades\DB;
+use Laravel\Telescope\Database\Factories\EntryModelFactory;
 use Laravel\Telescope\Storage\EntryModel;
-use Laravel\Telescope\Tests\EntryModelFactory;
 use Laravel\Telescope\Tests\FeatureTestCase;
 
 class ClearCommandTest extends FeatureTestCase

tests/Console/PruneCommandTest.php

@@ -2,7 +2,7 @@
 
 namespace Laravel\Telescope\Tests\Console;
 
-use Laravel\Telescope\Tests\EntryModelFactory;
+use Laravel\Telescope\Database\Factories\EntryModelFactory;
 use Laravel\Telescope\Tests\FeatureTestCase;
 
 class PruneCommandTest extends FeatureTestCase

tests/Http/RouteTest.php

@@ -5,9 +5,9 @@
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Testing\TestResponse as LegacyTestResponse;
 use Illuminate\Testing\TestResponse;
+use Laravel\Telescope\Database\Factories\EntryModelFactory;
 use Laravel\Telescope\EntryType;
 use Laravel\Telescope\Http\Middleware\Authorize;
-use Laravel\Telescope\Tests\EntryModelFactory;
 use Laravel\Telescope\Tests\FeatureTestCase;
 use Orchestra\Testbench\Http\Middleware\VerifyCsrfToken;
 use PHPUnit\Framework\Assert as PHPUnit;

tests/Storage/DatabaseEntriesRepositoryTest.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Telescope\Tests\Storage;
 
+use Laravel\Telescope\Database\Factories\EntryModelFactory;
 use Laravel\Telescope\Storage\DatabaseEntriesRepository;
-use Laravel\Telescope\Tests\EntryModelFactory;
 use Laravel\Telescope\Tests\FeatureTestCase;
 
 class DatabaseEntriesRepositoryTest extends FeatureTestCase

tests/Telescope/ExtractTagTest.php

@@ -3,9 +3,9 @@
 namespace Laravel\Telescope\Tests\Telescope;
 
 use Illuminate\Mail\Mailable;
+use Laravel\Telescope\Database\Factories\EntryModelFactory;
 use Laravel\Telescope\ExtractTags;
 use Laravel\Telescope\FormatModel;
-use Laravel\Telescope\Tests\EntryModelFactory;
 use Laravel\Telescope\Tests\FeatureTestCase;
 
 class ExtractTagTest extends FeatureTestCase