From 5fee43abe08f83b67b618baa01675020fab0522a Mon Sep 17 00:00:00 2001
From: Rick Gladwin <rick@iddesign.ca>
Date: Wed, 13 Jan 2021 16:12:20 -0500
Subject: [PATCH 1/8] add 8.0 to laravel/support in composr.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3db6493..e805dd4 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.2.5",
-        "illuminate/support": "^6.0|^7.0",
+        "illuminate/support": "^6.0|^7.0|^8.0",
         "illuminate/console": "^6.0|^7.0",
         "illuminate/filesystem": "^6.0|^7.0",
         "doctrine/dbal": "^2.9"

From a6fe4bbd699690e0482cdbbb727c43dd1b041f65 Mon Sep 17 00:00:00 2001
From: Rick Gladwin <rick@iddesign.ca>
Date: Wed, 13 Jan 2021 22:27:00 -0500
Subject: [PATCH 2/8] add illuminate/filesystem ^8.0 to composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e805dd4..7b45b75 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
         "php": "^7.2.5",
         "illuminate/support": "^6.0|^7.0|^8.0",
         "illuminate/console": "^6.0|^7.0",
-        "illuminate/filesystem": "^6.0|^7.0",
+        "illuminate/filesystem": "^6.0|^7.0|^8.0",
         "doctrine/dbal": "^2.9"
     },
     "autoload": {

From 4f9fccf9e35d7939a0aaf518633607d57d6571dc Mon Sep 17 00:00:00 2001
From: Rick Gladwin <rick@iddesign.ca>
Date: Wed, 13 Jan 2021 22:28:03 -0500
Subject: [PATCH 3/8] add illuminate/console ^8.0 to composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7b45b75..bc0e5e6 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": "^7.2.5",
         "illuminate/support": "^6.0|^7.0|^8.0",
-        "illuminate/console": "^6.0|^7.0",
+        "illuminate/console": "^6.0|^7.0|^8.0",
         "illuminate/filesystem": "^6.0|^7.0|^8.0",
         "doctrine/dbal": "^2.9"
     },

From 8c90fefb871920fa598c4e2bcc5e900b4ff775d0 Mon Sep 17 00:00:00 2001
From: Rick Gladwin <rick@iddesign.ca>
Date: Wed, 13 Jan 2021 22:57:31 -0500
Subject: [PATCH 4/8] modify factory.blade.php to match Laravel 8 factory class
 template

---
 resources/views/factory.blade.php     | 36 ++++++++++++++++++++-------
 resources/views/factory_old.blade.php | 11 ++++++++
 2 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 resources/views/factory_old.blade.php

diff --git a/resources/views/factory.blade.php b/resources/views/factory.blade.php
index 4c17d52..fbb1934 100644
--- a/resources/views/factory.blade.php
+++ b/resources/views/factory.blade.php
@@ -1,11 +1,29 @@
-/* @@var $factory \Illuminate\Database\Eloquent\Factory */
+namespace Database\Factories;
 
-use Faker\Generator as Faker;
+use {{$reflection->getName()}};
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Str;
 
-$factory->define({{ $reflection->getName() }}::class, function (Faker $faker) {
-    return [
-@foreach($properties as $name => $property)
-        '{{$name}}' => {!! $property !!},
-@endforeach
-    ];
-});
+class {{$reflection->getShortName()}}Factory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = {{$reflection->getShortName()}}::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            @foreach($properties as $name => $property)
+                    '{{$name}}' => {!! $property !!},
+            @endforeach
+                ];
+    }
+}
diff --git a/resources/views/factory_old.blade.php b/resources/views/factory_old.blade.php
new file mode 100644
index 0000000..4c17d52
--- /dev/null
+++ b/resources/views/factory_old.blade.php
@@ -0,0 +1,11 @@
+/* @@var $factory \Illuminate\Database\Eloquent\Factory */
+
+use Faker\Generator as Faker;
+
+$factory->define({{ $reflection->getName() }}::class, function (Faker $faker) {
+    return [
+@foreach($properties as $name => $property)
+        '{{$name}}' => {!! $property !!},
+@endforeach
+    ];
+});

From 01554173385a5524257ab98a5177e9b24bd42de7 Mon Sep 17 00:00:00 2001
From: Rick Gladwin <rick@iddesign.ca>
Date: Wed, 13 Jan 2021 23:08:30 -0500
Subject: [PATCH 5/8] modify factory.blade.php formatting and add  = ->factory
 to match Laravel 8 Factory class variable

---
 resources/views/factory.blade.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/views/factory.blade.php b/resources/views/factory.blade.php
index fbb1934..3a626ae 100644
--- a/resources/views/factory.blade.php
+++ b/resources/views/factory.blade.php
@@ -20,10 +20,11 @@ class {{$reflection->getShortName()}}Factory extends Factory
      */
     public function definition()
     {
+        $faker = $this->faker;
         return [
-            @foreach($properties as $name => $property)
-                    '{{$name}}' => {!! $property !!},
-            @endforeach
-                ];
+        @foreach($properties as $name => $property)
+            '{{$name}}' => {!! $property !!},
+        @endforeach
+        ];
     }
 }

From d86c5476bbcafdb4d163e7bc19d2f05ced6ca0c9 Mon Sep 17 00:00:00 2001
From: Rick Gladwin <rick@iddesign.ca>
Date: Wed, 13 Jan 2021 23:35:37 -0500
Subject: [PATCH 6/8] modify factory.blade.php indentation

---
 resources/views/factory.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/factory.blade.php b/resources/views/factory.blade.php
index 3a626ae..65a77cc 100644
--- a/resources/views/factory.blade.php
+++ b/resources/views/factory.blade.php
@@ -22,9 +22,9 @@ public function definition()
     {
         $faker = $this->faker;
         return [
-        @foreach($properties as $name => $property)
+@foreach($properties as $name => $property)
             '{{$name}}' => {!! $property !!},
-        @endforeach
+@endforeach
         ];
     }
 }

From a0ce55c1bcb58ccda64af86c15c2ab7f486e0547 Mon Sep 17 00:00:00 2001
From: Rick Gladwin <rick@iddesign.ca>
Date: Wed, 13 Jan 2021 23:48:23 -0500
Subject: [PATCH 7/8] remove old factory.blade.php

---
 resources/views/factory_old.blade.php | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 resources/views/factory_old.blade.php

diff --git a/resources/views/factory_old.blade.php b/resources/views/factory_old.blade.php
deleted file mode 100644
index 4c17d52..0000000
--- a/resources/views/factory_old.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-/* @@var $factory \Illuminate\Database\Eloquent\Factory */
-
-use Faker\Generator as Faker;
-
-$factory->define({{ $reflection->getName() }}::class, function (Faker $faker) {
-    return [
-@foreach($properties as $name => $property)
-        '{{$name}}' => {!! $property !!},
-@endforeach
-    ];
-});

From d4c8c8bcbe33187341a6eca51ac934d7034bc824 Mon Sep 17 00:00:00 2001
From: Rick Gladwin <rick@iddesign.ca>
Date: Mon, 18 Jul 2022 11:48:26 -0400
Subject: [PATCH 8/8] change default models directory to `app/Models` (Laravel
 8 default)

---
 src/Console/GenerateCommand.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Console/GenerateCommand.php b/src/Console/GenerateCommand.php
index 57f814e..4da37ae 100644
--- a/src/Console/GenerateCommand.php
+++ b/src/Console/GenerateCommand.php
@@ -31,7 +31,7 @@ class GenerateCommand extends Command
     /**
      * @var string
      */
-    protected $dir = 'app';
+    protected $dir = 'app/Models';
 
     /** @var \Illuminate\Contracts\View\Factory */
     protected $view;
@@ -173,7 +173,7 @@ protected function generateFactory($model)
         return $output;
     }
 
-
+    // TODO: look in app/Models instead of app for the models (Laravel 8 default)
     protected function loadModels($models = [])
     {
         if (!empty($models)) {