Merge pull request #130 from getsentry/update-env-var-name

stayallive · web-flow · commit d6eaa731d7cb · 2018-04-30T13:47:17.000+02:00
Update SENTRY_DSN -&gt; SENTRY_LARAVEL_DSN
diff --git a/README.md b/README.md
@@ -65,9 +65,11 @@ $ php artisan vendor:publish --provider="Sentry\SentryLaravel\SentryLaravelServi
 Add your DSN to ``.env``:
 
 ```
-SENTRY_DSN=https://public:secret@sentry.example.com/1
+SENTRY_LARAVEL_DSN=https://public:secret@sentry.example.com/1
 ```
 
+_Note:_ If you use `SENTRY_DSN` in your `.env` it will overwrite the DSN value set in the `config/sentry.php` file.
+
 ### Laravel 4.x
 
 Install the ``sentry/sentry-laravel`` package on version `0.8.*` since it's the last version to support Laravel 4:
diff --git a/examples/laravel-5.1/.env b/examples/laravel-5.1/.env
@@ -15,4 +15,4 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
-SENTRY_DSN=https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@app.getsentry.com/3235
+SENTRY_LARAVEL_DSN=https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@app.getsentry.com/3235
diff --git a/examples/laravel-5.1/config/sentry.php b/examples/laravel-5.1/config/sentry.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'dsn' => env('SENTRY_DSN', 'https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@sentry.io/3235'),
+    'dsn' => env('SENTRY_LARAVEL_DSN', 'https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@sentry.io/3235'),
 
     // capture release as git sha
     // 'release' => trim(exec('git log --pretty="%h" -n1 HEAD')),
diff --git a/examples/laravel-5.2/.env b/examples/laravel-5.2/.env
@@ -20,4 +20,4 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
-SENTRY_DSN=https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@app.getsentry.com/3235
+SENTRY_LARAVEL_DSN=https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@app.getsentry.com/3235
diff --git a/examples/laravel-5.2/config/sentry.php b/examples/laravel-5.2/config/sentry.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'dsn' => env('SENTRY_DSN', 'https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@sentry.io/3235'),
+    'dsn' => env('SENTRY_LARAVEL_DSN', 'https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@sentry.io/3235'),
 
     // capture release as git sha
     // 'release' => trim(exec('git log --pretty="%h" -n1 HEAD')),
diff --git a/examples/laravel-5.4/.env b/examples/laravel-5.4/.env
@@ -11,4 +11,4 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-SENTRY_DSN=https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@app.getsentry.com/3235
+SENTRY_LARAVEL_DSN=https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@app.getsentry.com/3235
diff --git a/examples/laravel-5.4/config/sentry.php b/examples/laravel-5.4/config/sentry.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'dsn' => env('SENTRY_DSN', 'https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@sentry.io/3235'),
+    'dsn' => env('SENTRY_LARAVEL_DSN', 'https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@sentry.io/3235'),
 
     // capture release as git sha
     // 'release' => trim(exec('git log --pretty="%h" -n1 HEAD')),
diff --git a/examples/laravel-5.5/config/sentry.php b/examples/laravel-5.5/config/sentry.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'dsn' => env('SENTRY_DSN'),
+    'dsn' => env('SENTRY_LARAVEL_DSN'),
 
     // capture release as git sha
     // 'release' => trim(exec('git log --pretty="%h" -n1 HEAD')),
diff --git a/src/Sentry/SentryLaravel/config.php b/src/Sentry/SentryLaravel/config.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'dsn' => env('SENTRY_DSN'),
+    'dsn' => env('SENTRY_LARAVEL_DSN'),
 
     // capture release as git sha
     // 'release' => trim(exec('git log --pretty="%h" -n1 HEAD')),

-Original file line number
+Diff line change
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 -SENTRY_DSN=https://e9ebbd88548a441288393c457ec90441:[email protected]/3235
 +SENTRY_LARAVEL_DSN=https://e9ebbd88548a441288393c457ec90441:[email protected]/3235