Fix str_replace error when third parameter ($subject) is null (#1511)

kyryl-bogach · web-flow · commit 9e1bbadc7474 · 2021-12-01T07:53:00.000-06:00
* Fix str_replace error when third parameter ($subject) is null in PHP 8.1.0 str_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /var/www/html/vendor/laravel/passport/src/PassportServiceProvider.php line 268 * Use single quotes to fix style error
diff --git a/src/PassportServiceProvider.php b/src/PassportServiceProvider.php
@@ -265,7 +265,7 @@ protected function registerResourceServer()
      */
     protected function makeCryptKey($type)
     {
-        $key = str_replace('\\n', "\n", $this->app->make(Config::class)->get('passport.'.$type.'_key'));
+        $key = str_replace('\\n', "\n", $this->app->make(Config::class)->get('passport.'.$type.'_key') ?? '');
 
         if (! $key) {
             $key = 'file://'.Passport::keyPath('oauth-'.$type.'.key');

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ protected function registerResourceServer()`
`265`	`265`	`*/`
`266`	`266`	`protected function makeCryptKey($type)`
`267`	`267`	`{`
`268`		`- $key = str_replace('\\n', "\n", $this->app->make(Config::class)->get('passport.'.$type.'_key'));`
	`268`	`+ $key = str_replace('\\n', "\n", $this->app->make(Config::class)->get('passport.'.$type.'_key') ?? '');`
`269`	`269`
`270`	`270`	`if (! $key) {`
`271`	`271`	`$key = 'file://'.Passport::keyPath('oauth-'.$type.'.key');`