Merge branch 'development'

Author: marickvantuil

src/LaravelDatabaseEmailsServiceProvider.php

@@ -34,6 +34,7 @@ public function register()
         $this->commands([
             SendEmailsCommand::class,
             RetryFailedEmailsCommand::class,
+            ResendEmailsCommand::class,
         ]);
     }
 }

src/ResendEmailsCommand.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Buildcode\LaravelDatabaseEmails;
+
+class ResendEmailsCommand extends RetryFailedEmailsCommand
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'email:resend {id?}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Resend failed e-mails';
+}

src/RetryFailedEmailsCommand.php

@@ -46,6 +46,10 @@ public function __construct(Store $store)
      */
     public function handle()
     {
+        if (get_class($this) === RetryFailedEmailsCommand::class) {
+            $this->warn('This command is deprecated, please use email:resend instead');
+        }
+
         $emails = $this->store->getFailed(
             $this->argument('id')
         );

tests/RetryFailedEmailsCommandTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 
 class RetryFailedEmailsCommandTest extends TestCase
@@ -31,7 +32,7 @@ function an_email_cannot_be_reset_if_the_max_attempt_count_has_not_been_reached(
         // try 2 more times, reaching 3 attempts and thus failing and able to retry
         $this->artisan('email:send');
         $this->artisan('email:send');
-        $this->artisan('email:retry');
+        $this->artisan('email:resend');
 
         $this->assertEquals(2, DB::table('emails')->count());
     }
@@ -45,8 +46,22 @@ function a_single_email_can_be_resent()
         // simulate emailB being failed...
         $emailB->update(['failed' => 1, 'attempts' => 3]);
 
-        $this->artisan('email:retry', ['id' => 2]);
+        $this->artisan('email:resend', ['id' => 2]);
 
         $this->assertEquals(3, DB::table('emails')->count());
     }
+
+    /** @test */
+    function email_retry_is_deprecated()
+    {
+        $deprecated = 'This command is deprecated';
+
+        $this->artisan('email:retry');
+
+        $this->assertContains($deprecated, Artisan::output());
+
+        $this->artisan('email:resend');
+
+        $this->assertNotContains($deprecated, Artisan::output());
+    }
 }