Add laravel 6 support

Author: mpociot

.gitignore

@@ -3,4 +3,5 @@ composer.lock
 docs
 vendor
 coverage
-.idea
+.idea
+.phpunit.result.cache

composer.json

@@ -17,11 +17,11 @@
     ],
     "require": {
         "php": "^7.1",
-        "illuminate/encryption": "5.6.*"
+        "illuminate/encryption": "5.6.*|5.7.*|5.8.*|^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
-        "orchestra/testbench": "~3.6"
+        "phpunit/phpunit": "^7.0|^8.0",
+        "orchestra/testbench": "~3.6|~3.7|~3.8|^4.0"
     },
     "autoload": {
         "psr-4": {

src/CredentialsServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace BeyondCode\Credentials;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Encryption\Encrypter;
 use Illuminate\Support\ServiceProvider;
@@ -28,8 +29,8 @@ public function boot()
 
     protected function fixConfig()
     {
-        collect(array_dot(config()->all()))->filter(function ($item) {
-            return is_string($item) && starts_with($item, Credentials::CONFIG_PREFIX);
+        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);
 

tests/CredentialTest.php

@@ -2,6 +2,7 @@
 
 namespace BeyondCode\Credentials\Tests;
 
+use Illuminate\Support\Str;
 use Orchestra\Testbench\TestCase;
 use Illuminate\Encryption\Encrypter;
 use BeyondCode\Credentials\Credentials;
@@ -14,15 +15,15 @@ protected function getPackageProviders($app)
         return [CredentialsServiceProvider::class];
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         @unlink(__DIR__ . '/temp/credentials.php.enc');
     }
 
     /** @test */
     public function it_can_load_encrypted_files()
     {
-        $masterKey = str_random(16);
+        $masterKey = Str::random(16);
 
         // create fake credentials
         $encrypter = new Encrypter($masterKey);
@@ -44,7 +45,7 @@ public function it_can_load_encrypted_files()
     /** @test */
     public function it_can_store_data_encrypted()
     {
-        $masterKey = str_random(16);
+        $masterKey = Str::random(16);
 
         $encrypter = new Encrypter($masterKey);
 
@@ -64,7 +65,7 @@ public function it_can_store_data_encrypted()
     /** @test */
     public function it_returns_decrypted_data()
     {
-        $masterKey = str_random(16);
+        $masterKey = Str::random(16);
 
         // create fake credentials
         $encrypter = new Encrypter($masterKey);
@@ -91,7 +92,7 @@ public function it_returns_decrypted_data()
      */
     public function it_can_not_decrypt_with_the_wrong_key()
     {
-        $masterKey = str_random(16);
+        $masterKey = Str::random(16);
 
         // create fake credentials
         $encrypter = new Encrypter($masterKey);
@@ -103,7 +104,7 @@ public function it_can_not_decrypt_with_the_wrong_key()
 
         file_put_contents(__DIR__ . '/temp/credentials.php.enc', $encryptedData);
 
-        $credentials = new Credentials(new Encrypter(str_random(16)));
+        $credentials = new Credentials(new Encrypter(Str::random(16)));
 
         $credentials->load(__DIR__ . '/temp/credentials.php.enc');
     }