Merge pull request #10 from stackkit/development

4.0.0

Author: marickvantuil

src/LaravelDatabaseEmailsServiceProvider.php

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

src/ResendEmailsCommand.php

@@ -13,7 +13,7 @@ class SendEmailsCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'email:send {--timeout=300}';
+    protected $signature = 'email:send';
 
     /**
      * The console command description.
@@ -48,8 +48,6 @@ public function __construct(Store $store)
      */
     public function handle()
     {
-        set_time_limit($this->option('timeout'));
-
         $emails = $this->store->getQueue();
 
         if ($emails->isEmpty()) {
@@ -73,8 +71,6 @@ public function handle()
         $progress->finish();
 
         $this->result($emails);
-
-        set_time_limit(0);
     }
 
     /**

src/RetryFailedEmailsCommand.php

@@ -29,25 +29,4 @@ public function getQueue()
             ->limit(Config::cronjobEmailLimit())
             ->get();
     }
-
-    /**
-     * Get all e-mails that failed to be sent.
-     *
-     * @param int $id
-     * @return Collection|Email[]
-     */
-    public function getFailed($id = null)
-    {
-        $query = new Email;
-
-        return $query
-            ->when($id, function ($query) use ($id) {
-                $query->where('id', '=', $id);
-            })
-            ->where('failed', '=', 1)
-            ->where('attempts', '>=', Config::maxAttemptCount())
-            ->whereNull('sent_at')
-            ->whereNull('deleted_at')
-            ->get();
-    }
 }

src/SendEmailsCommand.php

@@ -122,18 +122,4 @@ public function the_failed_status_and_error_is_cleared_if_a_previously_failed_em
         $this->assertFalse($email->fresh()->hasFailed());
         $this->assertEmpty($email->fresh()->getError());
     }
-
-    /** @test */
-    public function the_command_will_be_stopped_after_the_timeout()
-    {
-        $this->assertEquals(0, ini_get('max_execution_time'));
-
-        $this->artisan('email:send');
-
-        $this->assertEquals(300, ini_get('max_execution_time'));
-
-        $this->artisan('email:send', ['--timeout' => 60]);
-
-        $this->assertEquals(60, ini_get('max_execution_time'));
-    }
 }