From 36ab20ae3aa5c4d1d6d082ba27966a86dd4302c3 Mon Sep 17 00:00:00 2001
From: arubacao <arubacao@users.noreply.github.com>
Date: Mon, 1 Jul 2019 17:08:27 +0200
Subject: [PATCH 1/2] Sync services.php with upstream repo

https://raw.githubusercontent.com/laravel/laravel/5.4/config/services.php
---
 config/services.php | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/config/services.php b/config/services.php
index 453cb0395183..5ec49f65217d 100644
--- a/config/services.php
+++ b/config/services.php
@@ -16,29 +16,30 @@ return [
 
     'postmark' => env('POSTMARK_API_TOKEN', ''),
 
-	'mailgun' => [
-		'domain' => env('MAILGUN_DOMAIN',''),
-		'secret' => env('MAILGUN_SECRET',''),
-	],
+    'mailgun' => [
+        'domain' => env('MAILGUN_DOMAIN'),
+        'secret' => env('MAILGUN_SECRET'),
+    ],
 
-	'mandrill' => [
-		'secret' => '',
-	],
+    'mandrill' => [
+        'secret' => '',
+    ],
 
-	'sparkpost' => [
-		'secret' => env('SPARKPOST_API_KEY'),
-	],
+    'ses' => [
+        'key' => env('SES_KEY'),
+        'secret' => env('SES_SECRET'),
+        'region' => env('SES_DEFAULT_REGION', 'us-east-1'),
+    ],
 
-	'ses' => [
-		'key' => '',
-		'secret' => '',
-		'region' => 'us-east-1',
-	],
+    'sparkpost' => [
+        'secret' => env('SPARKPOST_SECRET'),
+    ],
 
-	'stripe' => [
-		'model'  => 'User',
-		'secret' => '',
-	],
+    'stripe' => [
+        'model' => App\User::class,
+        'key' => env('STRIPE_KEY'),
+        'secret' => env('STRIPE_SECRET'),
+    ],
 
     'github' => [
         'client_id' => env('GITHUB_CLIENT_ID'),

From 161f160ba799e3dbb5c7bfe89c71377a6300b249 Mon Sep 17 00:00:00 2001
From: arubacao <arubacao@users.noreply.github.com>
Date: Mon, 1 Jul 2019 23:40:24 +0200
Subject: [PATCH 2/2] Update services.php

---
 config/services.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/services.php b/config/services.php
index 5ec49f65217d..7a9327a189a0 100644
--- a/config/services.php
+++ b/config/services.php
@@ -17,8 +17,8 @@ return [
     'postmark' => env('POSTMARK_API_TOKEN', ''),
 
     'mailgun' => [
-        'domain' => env('MAILGUN_DOMAIN'),
-        'secret' => env('MAILGUN_SECRET'),
+        'domain' => env('MAILGUN_DOMAIN',''),
+        'secret' => env('MAILGUN_SECRET',''),
     ],
 
     'mandrill' => [
@@ -26,8 +26,8 @@ return [
     ],
 
     'ses' => [
-        'key' => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
+        'key' => env('SES_KEY', ''),
+        'secret' => env('SES_SECRET', ''),
         'region' => env('SES_DEFAULT_REGION', 'us-east-1'),
     ],
 
@@ -36,9 +36,8 @@ return [
     ],
 
     'stripe' => [
-        'model' => App\User::class,
-        'key' => env('STRIPE_KEY'),
-        'secret' => env('STRIPE_SECRET'),
+        'model'  => 'User',
+        'secret' => '',
     ],
 
     'github' => [