Merge pull request #6 from stackkit/development

Development

Author: marickvantuil

.styleci.yml

@@ -0,0 +1,7 @@
+preset: laravel
+
+enabled:
+  - concat_with_spaces
+
+disabled:
+  - concat_without_spaces

config/laravel-database-emails.php

@@ -44,9 +44,9 @@
 
         'enabled' => function () {
             return false;
-            // ...or...
+        // ...or...
             // return app()->environment('local', 'staging');
-        }
+        },
 
     ],
 
@@ -61,5 +61,5 @@
     |
     */
 
-    'limit' => 20
+    'limit' => 20,
 ];

src/Email.php

@@ -2,9 +2,9 @@
 
 namespace Buildcode\LaravelDatabaseEmails;
 
-use Illuminate\Database\Eloquent\Model;
-use Carbon\Carbon;
 use Exception;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * @property $id
@@ -124,7 +124,7 @@ public function getRecipientsAsString()
     {
         $glue = ', ';
 
-        return implode($glue, (array)$this->recipient);
+        return implode($glue, (array) $this->recipient);
     }
 
     /**
@@ -164,7 +164,6 @@ public function getSubject()
      */
     public function getView()
     {
-
         return $this->view;
     }
 
@@ -225,7 +224,7 @@ public function getScheduledDate()
      */
     public function hasVariables()
     {
-        return !is_null($this->variables);
+        return ! is_null($this->variables);
     }
 
     /**
@@ -299,7 +298,7 @@ public function hasBcc()
      */
     public function isScheduled()
     {
-        return !is_null($this->getScheduledDate());
+        return ! is_null($this->getScheduledDate());
     }
 
     /**
@@ -309,7 +308,7 @@ public function isScheduled()
      */
     public function isEncrypted()
     {
-        return !!$this->getOriginal('encrypted');
+        return (bool) $this->getOriginal('encrypted');
     }
 
     /**
@@ -319,7 +318,7 @@ public function isEncrypted()
      */
     public function isSent()
     {
-        return !is_null($this->sent_at);
+        return ! is_null($this->sent_at);
     }
 
     /**
@@ -373,7 +372,7 @@ public function markAsFailed(Exception $exception)
         $this->update([
             'sending' => 0,
             'failed'  => 1,
-            'error'   => (string)$exception,
+            'error'   => (string) $exception,
         ]);
     }
 

src/EmailComposer.php

@@ -63,7 +63,7 @@ public function setData($key, $value)
      */
     public function getData($key, $default = null)
     {
-        if (!is_null($default) && !$this->hasData($key)) {
+        if (! is_null($default) && ! $this->hasData($key)) {
             return $default;
         }
 

src/Encrypter.php

@@ -85,7 +85,7 @@ private function encryptSubject(EmailComposer $composer)
      */
     private function encryptVariables(EmailComposer $composer)
     {
-        if (!$composer->hasData('variables')) {
+        if (! $composer->hasData('variables')) {
             return;
         }
 

src/HasEncryptedAttributes.php

@@ -56,7 +56,7 @@ public function getAttribute($key)
         if (in_array($key, $this->encoded) && is_string($value)) {
             $decoded = json_decode($value, true);
 
-            if (!is_null($decoded)) {
+            if (! is_null($decoded)) {
                 $value = $decoded;
             }
         }

src/MailableReader.php

@@ -2,8 +2,8 @@
 
 namespace Buildcode\LaravelDatabaseEmails;
 
-use function call_user_func_array;
 use Exception;
+use function call_user_func_array;
 
 class MailableReader
 {
@@ -135,11 +135,11 @@ private function readAttachments(EmailComposer $composer)
     {
         $mailable = $composer->getData('mailable');
 
-        foreach ((array)$mailable->attachments as $attachment) {
+        foreach ((array) $mailable->attachments as $attachment) {
             call_user_func_array([$composer, 'attach'], $attachment);
         }
 
-        foreach ((array)$mailable->rawAttachments as $rawAttachment) {
+        foreach ((array) $mailable->rawAttachments as $rawAttachment) {
             call_user_func_array([$composer, 'attachData'], $rawAttachment);
         }
     }

src/Preparer.php

@@ -43,12 +43,12 @@ public function prepare(EmailComposer $composer)
      */
     private function prepareLabel(EmailComposer $composer)
     {
-        if (!$composer->hasData('label')) {
+        if (! $composer->hasData('label')) {
             return;
         }
 
         $composer->getEmail()->fill([
-            'label' => $composer->getData('label')
+            'label' => $composer->getData('label'),
         ]);
     }
 
@@ -143,7 +143,7 @@ private function prepareView(EmailComposer $composer)
      */
     private function prepareVariables(EmailComposer $composer)
     {
-        if (!$composer->hasData('variables')) {
+        if (! $composer->hasData('variables')) {
             return;
         }
 
@@ -181,14 +181,14 @@ private function prepareAttachments(EmailComposer $composer)
     {
         $attachments = [];
 
-        foreach ((array)$composer->getData('attachments', []) as $attachment) {
+        foreach ((array) $composer->getData('attachments', []) as $attachment) {
             $attachments[] = [
                 'type'       => 'attachment',
                 'attachment' => $attachment,
             ];
         }
 
-        foreach ((array)$composer->getData('rawAttachments', []) as $rawAttachment) {
+        foreach ((array) $composer->getData('rawAttachments', []) as $rawAttachment) {
             $attachments[] = [
                 'type'       => 'rawAttachment',
                 'attachment' => $rawAttachment,
@@ -207,7 +207,7 @@ private function prepareAttachments(EmailComposer $composer)
      */
     private function prepareScheduled(EmailComposer $composer)
     {
-        if (!$composer->hasData('scheduled_at')) {
+        if (! $composer->hasData('scheduled_at')) {
             return;
         }
 

src/RetryFailedEmailsCommand.php

@@ -46,7 +46,7 @@ public function __construct(Store $store)
      */
     public function handle()
     {
-        if (get_class($this) === RetryFailedEmailsCommand::class) {
+        if (get_class($this) === self::class) {
             $this->warn('This command is deprecated, please use email:resend instead');
         }
 
@@ -56,6 +56,7 @@ public function handle()
 
         if ($emails->isEmpty()) {
             $this->line('There is nothing to reset.');
+
             return;
         }
 

src/SendEmailsCommand.php

@@ -2,8 +2,8 @@
 
 namespace Buildcode\LaravelDatabaseEmails;
 
-use Illuminate\Console\Command;
 use Exception;
+use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Collection;
 
 class SendEmailsCommand extends Command
@@ -54,6 +54,7 @@ public function handle()
 
         if ($emails->isEmpty()) {
             $this->line('There is nothing to send.');
+
             return;
         }