Merge pull request #15839 from Godmartinz/fix-mail-envelope-variable

snipe · web-flow · commit 2a21cce4f5e6 · 2024-11-21T14:41:04.000Z
replace env with config variable for from address
diff --git a/.env.testing.example b/.env.testing.example
@@ -17,3 +17,5 @@ DB_PORT=3306
 DB_DATABASE=null
 DB_USERNAME=null
 DB_PASSWORD=null
+
+MAIL_FROM_ADDR=you@example.com
diff --git a/app/Mail/CheckinAccessoryMail.php b/app/Mail/CheckinAccessoryMail.php
@@ -34,7 +34,7 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedIn
      */
     public function envelope(): Envelope
     {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
+        $from = new Address(config('mail.from.address'));
 
         return new Envelope(
             from: $from,
diff --git a/app/Mail/CheckinAssetMail.php b/app/Mail/CheckinAssetMail.php
@@ -43,7 +43,7 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedInBy, $not
      */
     public function envelope(): Envelope
     {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
+        $from = new Address(config('mail.from.address'));
 
         return new Envelope(
             from: $from,
diff --git a/app/Mail/CheckinLicenseMail.php b/app/Mail/CheckinLicenseMail.php
@@ -34,7 +34,7 @@ public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $check
      */
     public function envelope(): Envelope
     {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
+        $from = new Address(config('mail.from.address'));
 
         return new Envelope(
             from: $from,
diff --git a/app/Mail/CheckoutAccessoryMail.php b/app/Mail/CheckoutAccessoryMail.php
@@ -37,7 +37,7 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOu
      */
     public function envelope(): Envelope
     {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
+        $from = new Address(config('mail.from.address'));
 
         return new Envelope(
             from: $from,
diff --git a/app/Mail/CheckoutAssetMail.php b/app/Mail/CheckoutAssetMail.php
@@ -52,7 +52,7 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $no
      */
     public function envelope(): Envelope
     {
-        $from = new Address(env('MAIL_FROM_ADDR', 'service@snipe-it.io'));
+        $from = new Address(config('mail.from.address'));
 
         return new Envelope(
             from: $from,
diff --git a/app/Mail/CheckoutConsumableMail.php b/app/Mail/CheckoutConsumableMail.php
@@ -38,7 +38,7 @@ public function __construct(Consumable $consumable, $checkedOutTo, User $checked
      */
     public function envelope(): Envelope
     {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
+        $from = new Address(config('mail.from.address'));
 
         return new Envelope(
             from: $from,
diff --git a/app/Mail/CheckoutLicenseMail.php b/app/Mail/CheckoutLicenseMail.php
@@ -36,7 +36,7 @@ public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $check
      */
     public function envelope(): Envelope
     {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
+        $from = new Address(config('mail.from.address'));
 
         return new Envelope(
             from: $from,

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedIn`
`34`	`34`	`*/`
`35`	`35`	`public function envelope(): Envelope`
`36`	`36`	`{`
`37`		`- $from = new Address(env('MAIL_FROM_ADDR','[email protected]'));`
	`37`	`+ $from = new Address(config('mail.from.address'));`
`38`	`38`
`39`	`39`	`return new Envelope(`
`40`	`40`	`from: $from,`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedInBy, $not`
`43`	`43`	`*/`
`44`	`44`	`public function envelope(): Envelope`
`45`	`45`	`{`
`46`		`- $from = new Address(env('MAIL_FROM_ADDR','[email protected]'));`
	`46`	`+ $from = new Address(config('mail.from.address'));`
`47`	`47`
`48`	`48`	`return new Envelope(`
`49`	`49`	`from: $from,`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOu`
`37`	`37`	`*/`
`38`	`38`	`public function envelope(): Envelope`
`39`	`39`	`{`
`40`		`- $from = new Address(env('MAIL_FROM_ADDR','[email protected]'));`
	`40`	`+ $from = new Address(config('mail.from.address'));`
`41`	`41`
`42`	`42`	`return new Envelope(`
`43`	`43`	`from: $from,`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $no`
`52`	`52`	`*/`
`53`	`53`	`public function envelope(): Envelope`
`54`	`54`	`{`
`55`		`- $from = new Address(env('MAIL_FROM_ADDR', '[email protected]'));`
	`55`	`+ $from = new Address(config('mail.from.address'));`
`56`	`56`
`57`	`57`	`return new Envelope(`
`58`	`58`	`from: $from,`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function __construct(Consumable $consumable, $checkedOutTo, User $checked`
`38`	`38`	`*/`
`39`	`39`	`public function envelope(): Envelope`
`40`	`40`	`{`
`41`		`- $from = new Address(env('MAIL_FROM_ADDR','[email protected]'));`
	`41`	`+ $from = new Address(config('mail.from.address'));`
`42`	`42`
`43`	`43`	`return new Envelope(`
`44`	`44`	`from: $from,`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $check`
`36`	`36`	`*/`
`37`	`37`	`public function envelope(): Envelope`
`38`	`38`	`{`
`39`		`- $from = new Address(env('MAIL_FROM_ADDR','[email protected]'));`
	`39`	`+ $from = new Address(config('mail.from.address'));`
`40`	`40`
`41`	`41`	`return new Envelope(`
`42`	`42`	`from: $from,`