Merge pull request #27 from kkobold/master

Laravel 7 and Symfony\Component\Process

Author: mpociot

src/CredentialsServiceProvider.php

@@ -38,7 +38,7 @@ protected function fixConfig()
         collect(Arr::dot(config()->all()))->filter(function ($item) {
             return is_string($item) && Str::startsWith($item, Credentials::CONFIG_PREFIX);
         })->map(function ($item, $key) {
-            $item = str_replace_first(Credentials::CONFIG_PREFIX, '', $item);
+            $item = Str::replaceFirst(Credentials::CONFIG_PREFIX, '', $item);
 
             config()->set($key, credentials($item));
         });

src/EditCredentialsCommand.php

@@ -41,7 +41,7 @@ public function handle(Credentials $credentials)
 
         $editor = env('EDITOR', 'vi');
 
-        $process = new Process($editor.' '.$meta['uri']);
+        $process = new Process([$editor, $meta['uri']]);
 
         $process->setTty(true);
         $process->mustRun();

src/helpers.php

@@ -1,6 +1,7 @@
 <?php
 
 use BeyondCode\Credentials\Credentials;
+use Illuminate\Contracts\Container\BindingResolutionException;
 
 if (! function_exists('credentials')) {
     /**
@@ -13,14 +14,17 @@
     function credentials(string $key, $default = null)
     {
         $filename = config('credentials.file');
-
         try {
             $credentials = app(Credentials::class);
             $credentials->load($filename);
 
             return $credentials->get($key, $default);
-        } catch (ReflectionException $e) {
-            return Credentials::CONFIG_PREFIX.$key;
+
+        } catch (ReflectionException | BindingResolutionException $e) {
+
+            return Credentials::CONFIG_PREFIX . $key;
+
         }
+
     }
 }