Merge pull request #22 from CodeLieutenant/chore/encryption

chore: move Cryto trait to Traits, move Encryption enum to Enums **BREAKING**

Author: CodeLieutenant

src/Encryption/AesGcm256Encryptor.php

@@ -4,16 +4,17 @@
 
 namespace CodeLieutenant\LaravelCrypto\Encryption;
 
+use CodeLieutenant\LaravelCrypto\Contracts\KeyGeneration;
 use CodeLieutenant\LaravelCrypto\Encoder\Encoder;
 use CodeLieutenant\LaravelCrypto\Encoder\JsonEncoder;
 use CodeLieutenant\LaravelCrypto\Keys\Loader;
+use CodeLieutenant\LaravelCrypto\Support\Base64;
+use CodeLieutenant\LaravelCrypto\Traits\Crypto;
 use Exception;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Encryption\EncryptException;
 use Illuminate\Contracts\Encryption\StringEncrypter;
-use CodeLieutenant\LaravelCrypto\Contracts\KeyGeneration;
-use CodeLieutenant\LaravelCrypto\Support\Base64;
 use Psr\Log\LoggerInterface;
 
 final class AesGcm256Encryptor implements Encrypter, KeyGeneration, StringEncrypter

src/Encryption/XChaCha20Poly1305Encryptor.php

@@ -9,6 +9,7 @@
 use CodeLieutenant\LaravelCrypto\Encoder\JsonEncoder;
 use CodeLieutenant\LaravelCrypto\Keys\Loader;
 use CodeLieutenant\LaravelCrypto\Support\Base64;
+use CodeLieutenant\LaravelCrypto\Traits\Crypto;
 use Exception;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Contracts\Encryption\Encrypter;

src/Encryption/Encryption.php renamed to src/Enums/Encryption.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CodeLieutenant\LaravelCrypto\Encryption;
+namespace CodeLieutenant\LaravelCrypto\Enums;
 
 enum Encryption: string
 {

src/Keys/AppKey.php

@@ -4,11 +4,7 @@
 
 namespace CodeLieutenant\LaravelCrypto\Keys;
 
-use CodeLieutenant\LaravelCrypto\Encryption\AesGcm256Encryptor;
-use CodeLieutenant\LaravelCrypto\Encryption\Encryption;
-use CodeLieutenant\LaravelCrypto\Encryption\XChaCha20Poly1305Encryptor;
 use Illuminate\Contracts\Config\Repository;
-use Illuminate\Encryption\Encrypter;
 
 class AppKey implements Loader
 {

src/Keys/Generators/AppKeyGenerator.php

@@ -5,8 +5,8 @@
 namespace CodeLieutenant\LaravelCrypto\Keys\Generators;
 
 use CodeLieutenant\LaravelCrypto\Encryption\AesGcm256Encryptor;
-use CodeLieutenant\LaravelCrypto\Encryption\Encryption;
 use CodeLieutenant\LaravelCrypto\Encryption\XChaCha20Poly1305Encryptor;
+use CodeLieutenant\LaravelCrypto\Enums\Encryption;
 use CodeLieutenant\LaravelCrypto\Keys\EnvKeySaver;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Encryption\Encrypter;

src/ServiceProvider.php

@@ -13,8 +13,8 @@
 use CodeLieutenant\LaravelCrypto\Encoder\MessagePackEncoder;
 use CodeLieutenant\LaravelCrypto\Encoder\PhpEncoder;
 use CodeLieutenant\LaravelCrypto\Encryption\AesGcm256Encryptor;
-use CodeLieutenant\LaravelCrypto\Encryption\Encryption;
 use CodeLieutenant\LaravelCrypto\Encryption\XChaCha20Poly1305Encryptor;
+use CodeLieutenant\LaravelCrypto\Enums\Encryption;
 use CodeLieutenant\LaravelCrypto\Hashing\Blake2b;
 use CodeLieutenant\LaravelCrypto\Hashing\HashingManager;
 use CodeLieutenant\LaravelCrypto\Hashing\Sha256;

src/Encryption/Crypto.php renamed to src/Traits/Crypto.php

@@ -2,16 +2,11 @@
 
 declare(strict_types=1);
 
-namespace CodeLieutenant\LaravelCrypto\Encryption;
+namespace CodeLieutenant\LaravelCrypto\Traits;
 
-use CodeLieutenant\LaravelCrypto\Encoder\Encoder;
-use CodeLieutenant\LaravelCrypto\Keys\Loader;
+use CodeLieutenant\LaravelCrypto\Enums\Encryption;
 use CodeLieutenant\LaravelCrypto\Support\Random;
-use Illuminate\Contracts\Encryption\Encrypter;
-use CodeLieutenant\LaravelCrypto\Contracts\KeyGeneration;
-use Illuminate\Contracts\Encryption\StringEncrypter;
 use Illuminate\Encryption\Encrypter as LaravelEncrypter;
-use Psr\Log\LoggerInterface;
 
 trait Crypto
 {

tests/Architecture/EncryptionTest.php

@@ -4,28 +4,15 @@
 
 use CodeLieutenant\LaravelCrypto\Contracts\KeyGeneration;
 use CodeLieutenant\LaravelCrypto\Encryption\AesGcm256Encryptor;
-use CodeLieutenant\LaravelCrypto\Encryption\Crypto;
-use CodeLieutenant\LaravelCrypto\Encryption\Encryption;
 use CodeLieutenant\LaravelCrypto\Encryption\XChaCha20Poly1305Encryptor;
+use CodeLieutenant\LaravelCrypto\Enums\Encryption;
+use CodeLieutenant\LaravelCrypto\Traits\Crypto;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Encryption\StringEncrypter;
 
-arch('encryption xchacha')
-    ->expect(XChaCha20Poly1305Encryptor::class)
-    ->toImplement([Encrypter::class, StringEncrypter::class, KeyGeneration::class])
-    ->toBeClass()
-    ->toBeFinal();
-
-arch('encryption aesgcm256')
-    ->expect(AesGcm256Encryptor::class)
-    ->toImplement([Encrypter::class, StringEncrypter::class, KeyGeneration::class])
-    ->toBeClass()
-    ->toBeFinal();
-
-arch('encryption enum')
-    ->expect(Encryption::class)
-    ->toBeStringBackedEnum();
-
-arch('encryption crypto')
-    ->expect(Crypto::class)
-    ->toBeTrait();
+arch('encryption')
+    ->expect('CodeLieutenant\LaravelCrypto\Encryption')
+    ->toImplement([Encrypter::class, StringEncrypter::class])
+    ->toBeClasses()
+    ->toHaveSuffix('Encryptor')
+    ->toBeFinal();

tests/Architecture/EnumTest.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+arch('enums')
+    ->expect('CodeLieutenant\LaravelCrypto\Enums')
+    ->toBeEnums();

tests/Feature/ServiceProviderLoadingTest.php

@@ -4,9 +4,9 @@
 
 use CodeLieutenant\LaravelCrypto\Encryption\AesGcm256Encryptor;
 use CodeLieutenant\LaravelCrypto\Encryption\XChaCha20Poly1305Encryptor;
+use CodeLieutenant\LaravelCrypto\Enums\Encryption;
 use Illuminate\Encryption\Encrypter;
 use Illuminate\Support\Facades\Config;
-use CodeLieutenant\LaravelCrypto\Encryption\Encryption;
 
 test('encrypter resolver', function (string $cipher, string $instance) {
     Config::set('app.cipher', $cipher);