Merge branch '10.x'

# Conflicts:
#	CHANGELOG.md
#	tests/Feature/PassportTestCase.php

Author: driesvints

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/passport/compare/v10.2.0...master)
+## [Unreleased](https://github.com/laravel/passport/compare/v10.2.1...master)
+
+
+## [v10.2.1 (2021-12-07)](https://github.com/laravel/passport/compare/v10.2.0...v10.2.1)
+
+### Fixed
+- Fix `str_replace` error when third parameter ($subject) is null ([#1511](https://github.com/laravel/passport/pull/1511))
 
 
 ## [v10.2.0 (2021-11-02)](https://github.com/laravel/passport/compare/v10.1.4...v10.2.0)

src/Console/KeysCommand.php

@@ -29,7 +29,7 @@ class KeysCommand extends Command
     /**
      * Execute the console command.
      *
-     * @return void
+     * @return int
      */
     public function handle()
     {
@@ -40,6 +40,8 @@ public function handle()
 
         if ((file_exists($publicKey) || file_exists($privateKey)) && ! $this->option('force')) {
             $this->error('Encryption keys already exist. Use the --force option to overwrite them.');
+
+            return 1;
         } else {
             if (class_exists(LegacyRSA::class)) {
                 $keys = (new LegacyRSA)->createKey($this->input ? (int) $this->option('length') : 4096);
@@ -55,5 +57,7 @@ public function handle()
 
             $this->info('Encryption keys generated successfully.');
         }
+
+        return 0;
     }
 }

src/PassportServiceProvider.php

@@ -311,7 +311,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');

tests/Feature/KeysCommandTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Laravel\Passport\Tests\Feature;
+
+use Mockery as m;
+
+class KeysCommandTest extends PassportTestCase
+{
+    protected function tearDown(): void
+    {
+        m::close();
+
+        @unlink(self::PUBLIC_KEY);
+        @unlink(self::PRIVATE_KEY);
+    }
+
+    public function testPrivateAndPublicKeysAreGenerated()
+    {
+        $this->assertFileExists(self::PUBLIC_KEY);
+        $this->assertFileExists(self::PRIVATE_KEY);
+    }
+
+    public function testPrivateAndPublicKeysShouldNotBeGeneratedTwice()
+    {
+        $this->artisan('passport:keys')
+            ->assertFailed()
+            ->expectsOutput('Encryption keys already exist. Use the --force option to overwrite them.');
+    }
+}

tests/Feature/PassportTestCase.php

@@ -5,13 +5,14 @@
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Passport\PassportServiceProvider;
+use Laravel\Passport\Passport;
 use Orchestra\Testbench\TestCase;
 
 abstract class PassportTestCase extends TestCase
 {
     use RefreshDatabase;
 
-    const KEYS = __DIR__.'/keys';
+    const KEYS = __DIR__.'/../keys';
     const PUBLIC_KEY = self::KEYS.'/oauth-public.key';
     const PRIVATE_KEY = self::KEYS.'/oauth-private.key';
 
@@ -21,6 +22,8 @@ protected function setUp(): void
 
         $this->artisan('migrate:fresh');
 
+        Passport::loadKeysFrom(self::KEYS);
+
         @unlink(self::PUBLIC_KEY);
         @unlink(self::PRIVATE_KEY);