chore: rename Loader to KeyLoader

Signed-off-by: Dusan Malusev <[email protected]>

Author: CodeLieutenant

benchmarks/EncryptionBench.php

@@ -62,7 +62,7 @@ public function providerChaCha20Crypto(): Generator
             foreach ($encoders as $encoderName => $encoder) {
                 yield 'ChaCha20-' . $encoderName . '-' . $dataName => [
                     'data' => $dataValue,
-                    'encrypter' => new XChaCha20Poly1305Encrypter(new KeyLoader(Random::bytes(32)), $logger, $encoder),
+                    'encrypter' => new XChaCha20Poly1305Encrypter(new KeyKeyLoader(Random::bytes(32)), $logger, $encoder),
                 ];
             }
         }
@@ -91,7 +91,7 @@ public function providerAESGCMCrypto(): Generator
             foreach ($encoders as $encoderName => $encoder) {
                 yield 'ChaCha20-' . $encoderName . '-' . $dataName => [
                     'data' => $dataValue,
-                    'encrypter' => new AesGcm256Encrypter(new KeyLoader(Random::bytes(32)), $logger, $encoder),
+                    'encrypter' => new AesGcm256Encrypter(new KeyKeyLoader(Random::bytes(32)), $logger, $encoder),
                 ];
             }
         }

benchmarks/KeyLoader.php renamed to benchmarks/KeyKeyLoader.php

@@ -4,9 +4,9 @@
 
 namespace CodeLieutenant\LaravelCrypto\Benchmarks;
 
-use CodeLieutenant\LaravelCrypto\Keys\Loader;
+use CodeLieutenant\LaravelCrypto\Keys\KeyLoader;
 
-class KeyLoader implements Loader
+class KeyKeyLoader implements KeyLoader
 {
     public function __construct(
         private readonly string $key

src/Encryption/AesGcm256Encrypter.php

@@ -8,7 +8,7 @@
 use CodeLieutenant\LaravelCrypto\Contracts\Encoder;
 use CodeLieutenant\LaravelCrypto\Contracts\KeyGeneration;
 use CodeLieutenant\LaravelCrypto\Encoder\JsonEncoder;
-use CodeLieutenant\LaravelCrypto\Keys\Loader;
+use CodeLieutenant\LaravelCrypto\Keys\KeyLoader;
 use CodeLieutenant\LaravelCrypto\Support\Base64;
 use CodeLieutenant\LaravelCrypto\Traits\Crypto;
 use Illuminate\Contracts\Encryption\DecryptException;
@@ -22,7 +22,7 @@ final class AesGcm256Encrypter implements Encrypter, KeyGeneration, StringEncryp
     use Crypto;
 
     public function __construct(
-        private readonly Loader $keyLoader,
+        private readonly KeyLoader $keyLoader,
         private readonly Encoder $encoder = new JsonEncoder(),
         private readonly ?LoggerInterface $logger = null,
     ) {

src/Encryption/XChaCha20Poly1305Encrypter.php

@@ -7,7 +7,7 @@
 use CodeLieutenant\LaravelCrypto\Contracts\Encoder;
 use CodeLieutenant\LaravelCrypto\Contracts\KeyGeneration;
 use CodeLieutenant\LaravelCrypto\Encoder\JsonEncoder;
-use CodeLieutenant\LaravelCrypto\Keys\Loader;
+use CodeLieutenant\LaravelCrypto\Keys\KeyLoader;
 use CodeLieutenant\LaravelCrypto\Support\Base64;
 use CodeLieutenant\LaravelCrypto\Traits\Crypto;
 use Exception;
@@ -22,7 +22,7 @@ final class XChaCha20Poly1305Encrypter implements Encrypter, KeyGeneration, Stri
     use Crypto;
 
     public function __construct(
-        private readonly Loader $keyLoader,
+        private readonly KeyLoader $keyLoader,
         private readonly Encoder $encoder = new JsonEncoder(),
         private readonly ?LoggerInterface $logger = null,
     ) {

src/Keys/AppKey.php

@@ -6,7 +6,7 @@
 
 use Illuminate\Contracts\Config\Repository;
 
-class AppKey implements Loader
+class AppKey implements KeyLoader
 {
     use LaravelKeyParser;
 

src/Keys/EdDSASignerKey.php

@@ -10,7 +10,7 @@
 use RuntimeException;
 use SplFileObject;
 
-class EdDSASignerKey implements Loader
+class EdDSASignerKey implements KeyLoader
 {
     public const KEY_LENGTH = SODIUM_CRYPTO_SIGN_KEYPAIRBYTES;
     public const PUBLIC_KEY_LENGTH = SODIUM_CRYPTO_SIGN_PUBLICKEYBYTES;

src/Keys/Loader.php renamed to src/Keys/KeyLoader.php

@@ -4,7 +4,7 @@
 
 namespace CodeLieutenant\LaravelCrypto\Keys;
 
-interface Loader
+interface KeyLoader
 {
     public function getKey(): string|array;
 }

src/ServiceProvider.php

@@ -27,7 +27,7 @@
 use CodeLieutenant\LaravelCrypto\Keys\Generators\EdDSASignerKeyGenerator;
 use CodeLieutenant\LaravelCrypto\Keys\Generators\HmacKeyGenerator;
 use CodeLieutenant\LaravelCrypto\Keys\HmacKey;
-use CodeLieutenant\LaravelCrypto\Keys\Loader;
+use CodeLieutenant\LaravelCrypto\Keys\KeyLoader;
 use CodeLieutenant\LaravelCrypto\Signing\EdDSA\EdDSA;
 use CodeLieutenant\LaravelCrypto\Signing\Hmac\Blake2b as HmacBlake2b;
 use CodeLieutenant\LaravelCrypto\Signing\Hmac\Sha256 as HmacSha256;
@@ -118,7 +118,7 @@ protected function registerSigners(): void
         $this->app->singleton(SigningManager::class);
 
         $this->app->when(EdDSA::class)
-            ->needs(Loader::class)
+            ->needs(KeyLoader::class)
             ->give(EdDSASignerKey::class);
 
         $hmacSigners = [
@@ -176,7 +176,7 @@ protected function registerEncrypter(): void
         foreach ([AesGcm256Encrypter::class, XChaCha20Poly1305Encrypter::class] as $encryptor) {
             $this->app->singleton($encryptor);
             $this->app->when($encryptor)
-                ->needs(Loader::class)
+                ->needs(KeyLoader::class)
                 ->give(AppKey::class);
         }
 

src/Signing/EdDSA/EdDSA.php

@@ -5,15 +5,15 @@
 namespace CodeLieutenant\LaravelCrypto\Signing\EdDSA;
 
 use CodeLieutenant\LaravelCrypto\Contracts\PublicKeySigning;
-use CodeLieutenant\LaravelCrypto\Keys\Loader;
+use CodeLieutenant\LaravelCrypto\Keys\KeyLoader;
 use CodeLieutenant\LaravelCrypto\Signing\Traits\Signing;
 use CodeLieutenant\LaravelCrypto\Support\Base64;
 final class EdDSA implements PublicKeySigning
 {
     use Signing;
 
     public function __construct(
-        private readonly Loader $loader,
+        private readonly KeyLoader $loader,
     ) {
     }
 

src/Signing/Hmac/Blake2b.php

@@ -5,15 +5,15 @@
 namespace CodeLieutenant\LaravelCrypto\Signing\Hmac;
 
 use CodeLieutenant\LaravelCrypto\Contracts\Signing as SigningContract;
-use CodeLieutenant\LaravelCrypto\Keys\Loader;
+use CodeLieutenant\LaravelCrypto\Keys\KeyLoader;
 use CodeLieutenant\LaravelCrypto\Signing\Traits\Signing;
 
 final class Blake2b implements SigningContract
 {
     use Signing;
 
     public function __construct(
-        private readonly Loader $loader,
+        private readonly KeyLoader $loader,
         private readonly int $outputSize
     ) {
     }