[feature] upgrade laravel to v8.0

daniel-g-wood · roshangautam · web-flow · commit a8423644faff · 2020-10-30T07:00:03.000-07:00
- updates composer.json to use laravel 8.0 depdencies
- adds factory classes for models

Co-authored-by: Roshan Gautam &lt;roshan.gautam@hotmail.com&gt;
diff --git a/composer.json b/composer.json
@@ -16,20 +16,20 @@
     }
   ],
   "require": {
-    "php": ">=7.2",
+    "php": ">=7.3",
     "doctrine/dbal": "^2.9",
-    "illuminate/bus": "^7.0",
-    "illuminate/console": "^7.0",
-    "illuminate/contracts": "^7.0",
-    "illuminate/database": "^7.0",
-    "illuminate/events": "^7.0",
-    "illuminate/notifications": "^7.0",
+    "illuminate/bus": "^8.11",
+    "illuminate/console": "^8.11",
+    "illuminate/contracts": "^8.11",
+    "illuminate/database": "^8.11",
+    "illuminate/events": "^8.11",
+    "illuminate/notifications": "^8.11",
     "laravelcollective/html": "^6.0"
   },
   "require-dev": {
     "mockery/mockery": "^1.0",
-    "orchestra/database": "^5.0",
-    "orchestra/testbench" : "^5.0",
+    "orchestra/database": "^6.0",
+    "orchestra/testbench" : "^6.0",
     "phpunit/phpunit": "^9.0"
   },
   "suggest": {
@@ -38,13 +38,14 @@
   "autoload": {
     "psr-4": {
       "Studio\\Totem\\": "src/",
-      "Studio\\Totem\\Tests\\": "tests/"
+      "Studio\\Totem\\Tests\\": "tests/",
+      "Database\\Factories\\": "database/factories/"
     }
   },
   "extra": {
     "component": "package",
     "branch-alias": {
-      "dev-7.0": "7.0.x-dev"
+      "dev-8.0": "8.0.x-dev"
     },
     "laravel": {
       "providers": [
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
diff --git a/database/factories/TotemResultFactory.php b/database/factories/TotemResultFactory.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Studio\Totem\Result;
+
+class TotemResultFactory extends Factory
+{
+    protected $model = Result::class;
+
+    public function definition()
+    {
+        return [
+            'task_id'     => $this->faker->randomDigit,
+            'ran_at'      => $this->faker->dateTimeBetween('-1 hour'),
+            'duration'    => (string) $this->faker->randomFloat(11, 0, 8000000),
+            'result'      => $this->faker->sentence,
+            'created_at'  => $this->faker->dateTimeBetween('-1 year', '-6 months'),
+            'updated_at'  => $this->faker->dateTimeBetween('-6 months'),
+        ];
+    }
+}
diff --git a/database/factories/TotemTaskFactory.php b/database/factories/TotemTaskFactory.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Studio\Totem\Task;
+
+class TotemTaskFactory extends Factory
+{
+    protected $model = Task::class;
+
+    public function definition()
+    {
+        return [
+            'description'  => $this->faker->sentence,
+            'command'      => 'Studio\Totem\Console\Commands\ListSchedule',
+            'expression'   => '* * * * *',
+        ];
+    }
+}
diff --git a/database/factories/TotemUserFactory.php b/database/factories/TotemUserFactory.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Str;
+use Studio\Totem\User;
+
+class TotemUserFactory extends Factory
+{
+    protected $model = User::class;
+
+    public function definition()
+    {
+        static $password;
+
+        return [
+            'name'           => $this->faker->name,
+            'email'          => $this->faker->unique()->safeEmail,
+            'password'       => $password ?: $password = bcrypt('secret'),
+            'remember_token' => Str::random(10),
+        ];
+    }
+}
diff --git a/src/Result.php b/src/Result.php
@@ -2,11 +2,15 @@
 
 namespace Studio\Totem;
 
+use Database\Factories\TotemResultFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;
 
 class Result extends TotemModel
 {
+    use HasFactory;
+
     protected $table = 'task_results';
 
     protected $fillable = [
@@ -44,4 +48,14 @@ public function getAverageRunTime(): Builder
             ->whereColumn('task_id', TOTEM_TABLE_PREFIX.'tasks.id')
             ->getQuery();
     }
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    protected static function newFactory()
+    {
+        return TotemResultFactory::new();
+    }
 }
diff --git a/src/Task.php b/src/Task.php
@@ -4,14 +4,16 @@
 
 use Carbon\Carbon;
 use Cron\CronExpression;
+use Database\Factories\TotemTaskFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Str;
 use Studio\Totem\Traits\FrontendSortable;
 use Studio\Totem\Traits\HasFrequencies;
 
 class Task extends TotemModel
 {
-    use Notifiable, HasFrequencies, FrontendSortable;
+    use Notifiable, HasFrequencies, FrontendSortable, HasFactory;
 
     /**
      * The attributes that are mass assignable.
@@ -205,4 +207,14 @@ public function autoCleanup()
             }
         }
     }
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    protected static function newFactory()
+    {
+        return TotemTaskFactory::new();
+    }
 }
diff --git a/src/User.php b/src/User.php
@@ -2,12 +2,14 @@
 
 namespace Studio\Totem;
 
+use Database\Factories\TotemUserFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
 class User extends Authenticatable
 {
-    use Notifiable;
+    use Notifiable, HasFactory;
 
     /**
      * The attributes that are mass assignable.
@@ -26,4 +28,14 @@ class User extends Authenticatable
     protected $hidden = [
         'password', 'remember_token',
     ];
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    protected static function newFactory()
+    {
+        return TotemUserFactory::new();
+    }
 }
diff --git a/tests/Feature/CompileParametersTest.php b/tests/Feature/CompileParametersTest.php
@@ -9,15 +9,15 @@ class CompileParametersTest extends TestCase
 {
     public function test_no_paramters()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $parameters = $task->compileParameters();
 
         $this->assertEmpty($parameters);
     }
 
     public function test_multiple_paramters()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = '--parameter-1=value --parameter-2=value --parameter-3=value';
         $parameters = $task->compileParameters();
 
@@ -29,7 +29,7 @@ public function test_multiple_paramters()
 
     public function test_flag_and_paramter()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = '--parameter-1=value --dry-run';
         $parameters = $task->compileParameters();
 
@@ -41,7 +41,7 @@ public function test_flag_and_paramter()
 
     public function test_multiple_flags()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = '--dry-run --debug --log-output';
         $parameters = $task->compileParameters();
 
@@ -56,7 +56,7 @@ public function test_multiple_flags()
 
     public function test_multiple_arguments()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = 'arg1 arg2 arg3';
         $parameters = $task->compileParameters();
 
@@ -68,7 +68,7 @@ public function test_multiple_arguments()
 
     public function test_multiple_named_arguments()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = 'arg1=name arg2=airport arg3=100';
         $parameters = $task->compileParameters();
 
@@ -80,7 +80,7 @@ public function test_multiple_named_arguments()
 
     public function test_multiple_mixed_arguments()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = 'arg1 arg2=test arg3=15 arg4';
         $parameters = $task->compileParameters();
 
@@ -93,7 +93,7 @@ public function test_multiple_mixed_arguments()
 
     public function test_all_mixed_arguments()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = 'arg1 arg2=test arg3=15 arg4 --flag --flag2 --option=yes --someplace=warm';
         $parameters = $task->compileParameters();
 
@@ -110,7 +110,7 @@ public function test_all_mixed_arguments()
 
     public function test_all_mixed_arguments_console()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = 'arg1 arg2=test arg3=15 arg4 --flag --flag2 --option=yes --someplace=warm';
         $parameters = $task->compileParameters(true);
 
@@ -127,7 +127,7 @@ public function test_all_mixed_arguments_console()
 
     public function test_single_dash()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = '-osTeSt';
         $parameters = $task->compileParameters(true);
 
@@ -137,7 +137,7 @@ public function test_single_dash()
 
     public function test_array_argument()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $task->parameters = '--id=1 --id=2';
         $parameters = $task->compileParameters(true);
 
diff --git a/tests/Feature/EditTaskTest.php b/tests/Feature/EditTaskTest.php
@@ -11,7 +11,7 @@ class EditTaskTest extends TestCase
     public function user_can_view_edit_task_form()
     {
         $this->disableExceptionHandling()->signIn();
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $response = $this->get(route('totem.task.edit', $task));
         $response->assertStatus(200);
         $response->assertSee($task->description);
@@ -21,7 +21,7 @@ public function user_can_view_edit_task_form()
     /** @test */
     public function guest_can_not_view_edit_task_form()
     {
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $response = $this->get(route('totem.task.edit', $task));
         $response->assertStatus(403);
     }
@@ -30,7 +30,7 @@ public function guest_can_not_view_edit_task_form()
     public function user_can_edit_task()
     {
         $this->disableExceptionHandling()->signIn();
-        $task = factory(Task::class)->create();
+        $task = Task::factory()->create();
         $response = $this->post(route('totem.task.edit', $task), [
             'description'         => 'List All Scheduled Commands',
             'command'             => 'Studio\Totem\Console\Commands\ListSchedule',
diff --git a/tests/Feature/ViewDashboardTest.php b/tests/Feature/ViewDashboardTest.php
diff --git a/tests/Feature/ViewTaskTest.php b/tests/Feature/ViewTaskTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,16 @@`
`4`	`4`
`5`	`5`	`use Carbon\Carbon;`
`6`	`6`	`use Cron\CronExpression;`
	`7`	`+use Database\Factories\TotemTaskFactory;`
	`8`	`+use Illuminate\Database\Eloquent\Factories\HasFactory;`
`7`	`9`	`use Illuminate\Notifications\Notifiable;`
`8`	`10`	`use Illuminate\Support\Str;`
`9`	`11`	`use Studio\Totem\Traits\FrontendSortable;`
`10`	`12`	`use Studio\Totem\Traits\HasFrequencies;`
`11`	`13`
`12`	`14`	`class Task extends TotemModel`
`13`	`15`	`{`
`14`		`- use Notifiable, HasFrequencies, FrontendSortable;`
	`16`	`+ use Notifiable, HasFrequencies, FrontendSortable, HasFactory;`
`15`	`17`
`16`	`18`	`/**`
`17`	`19`	`* The attributes that are mass assignable.`
`@@ -205,4 +207,14 @@ public function autoCleanup()`
`205`	`207`	`}`
`206`	`208`	`}`
`207`	`209`	`}`
	`210`	`+`
	`211`	`+ /**`
	`212`	`+ * Create a new factory instance for the model.`
	`213`	`+ *`
	`214`	`+ * @return \Illuminate\Database\Eloquent\Factories\Factory`
	`215`	`+ */`
	`216`	`+ protected static function newFactory()`
	`217`	`+ {`
	`218`	`+ return TotemTaskFactory::new();`
	`219`	`+ }`
`208`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,15 @@ class CompileParametersTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`public function test_no_paramters()`
`11`	`11`	`{`
`12`		`- $task = factory(Task::class)->create();`
	`12`	`+ $task = Task::factory()->create();`
`13`	`13`	`$parameters = $task->compileParameters();`
`14`	`14`
`15`	`15`	`$this->assertEmpty($parameters);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public function test_multiple_paramters()`
`19`	`19`	`{`
`20`		`- $task = factory(Task::class)->create();`
	`20`	`+ $task = Task::factory()->create();`
`21`	`21`	`$task->parameters = '--parameter-1=value --parameter-2=value --parameter-3=value';`
`22`	`22`	`$parameters = $task->compileParameters();`
`23`	`23`
`@@ -29,7 +29,7 @@ public function test_multiple_paramters()`
`29`	`29`
`30`	`30`	`public function test_flag_and_paramter()`
`31`	`31`	`{`
`32`		`- $task = factory(Task::class)->create();`
	`32`	`+ $task = Task::factory()->create();`
`33`	`33`	`$task->parameters = '--parameter-1=value --dry-run';`
`34`	`34`	`$parameters = $task->compileParameters();`
`35`	`35`
`@@ -41,7 +41,7 @@ public function test_flag_and_paramter()`
`41`	`41`
`42`	`42`	`public function test_multiple_flags()`
`43`	`43`	`{`
`44`		`- $task = factory(Task::class)->create();`
	`44`	`+ $task = Task::factory()->create();`
`45`	`45`	`$task->parameters = '--dry-run --debug --log-output';`
`46`	`46`	`$parameters = $task->compileParameters();`
`47`	`47`
`@@ -56,7 +56,7 @@ public function test_multiple_flags()`
`56`	`56`
`57`	`57`	`public function test_multiple_arguments()`
`58`	`58`	`{`
`59`		`- $task = factory(Task::class)->create();`
	`59`	`+ $task = Task::factory()->create();`
`60`	`60`	`$task->parameters = 'arg1 arg2 arg3';`
`61`	`61`	`$parameters = $task->compileParameters();`
`62`	`62`
`@@ -68,7 +68,7 @@ public function test_multiple_arguments()`
`68`	`68`
`69`	`69`	`public function test_multiple_named_arguments()`
`70`	`70`	`{`
`71`		`- $task = factory(Task::class)->create();`
	`71`	`+ $task = Task::factory()->create();`
`72`	`72`	`$task->parameters = 'arg1=name arg2=airport arg3=100';`
`73`	`73`	`$parameters = $task->compileParameters();`
`74`	`74`
`@@ -80,7 +80,7 @@ public function test_multiple_named_arguments()`
`80`	`80`
`81`	`81`	`public function test_multiple_mixed_arguments()`
`82`	`82`	`{`
`83`		`- $task = factory(Task::class)->create();`
	`83`	`+ $task = Task::factory()->create();`
`84`	`84`	`$task->parameters = 'arg1 arg2=test arg3=15 arg4';`
`85`	`85`	`$parameters = $task->compileParameters();`
`86`	`86`
`@@ -93,7 +93,7 @@ public function test_multiple_mixed_arguments()`
`93`	`93`
`94`	`94`	`public function test_all_mixed_arguments()`
`95`	`95`	`{`
`96`		`- $task = factory(Task::class)->create();`
	`96`	`+ $task = Task::factory()->create();`
`97`	`97`	`$task->parameters = 'arg1 arg2=test arg3=15 arg4 --flag --flag2 --option=yes --someplace=warm';`
`98`	`98`	`$parameters = $task->compileParameters();`
`99`	`99`
`@@ -110,7 +110,7 @@ public function test_all_mixed_arguments()`
`110`	`110`
`111`	`111`	`public function test_all_mixed_arguments_console()`
`112`	`112`	`{`
`113`		`- $task = factory(Task::class)->create();`
	`113`	`+ $task = Task::factory()->create();`
`114`	`114`	`$task->parameters = 'arg1 arg2=test arg3=15 arg4 --flag --flag2 --option=yes --someplace=warm';`
`115`	`115`	`$parameters = $task->compileParameters(true);`
`116`	`116`
`@@ -127,7 +127,7 @@ public function test_all_mixed_arguments_console()`
`127`	`127`
`128`	`128`	`public function test_single_dash()`
`129`	`129`	`{`
`130`		`- $task = factory(Task::class)->create();`
	`130`	`+ $task = Task::factory()->create();`
`131`	`131`	`$task->parameters = '-osTeSt';`
`132`	`132`	`$parameters = $task->compileParameters(true);`
`133`	`133`
`@@ -137,7 +137,7 @@ public function test_single_dash()`
`137`	`137`
`138`	`138`	`public function test_array_argument()`
`139`	`139`	`{`
`140`		`- $task = factory(Task::class)->create();`
	`140`	`+ $task = Task::factory()->create();`
`141`	`141`	`$task->parameters = '--id=1 --id=2';`
`142`	`142`	`$parameters = $task->compileParameters(true);`
`143`	`143`