Skip to content

Commit 3179ddb

Browse files
feat: merge with master
Signed-off-by: Dusan Malusev <[email protected]>
2 parents 287d3d0 + c61a569 commit 3179ddb

File tree

9 files changed

+22
-5
lines changed

9 files changed

+22
-5
lines changed

src/Keys/AppKey.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace CodeLieutenant\LaravelCrypto\Keys;
66

77
use CodeLieutenant\LaravelCrypto\Contracts\KeyLoader;
8+
use CodeLieutenant\LaravelCrypto\Traits\LaravelKeyParser;
89
use Illuminate\Contracts\Config\Repository;
910

1011
class AppKey implements KeyLoader

src/Keys/Generators/AppKeyGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use CodeLieutenant\LaravelCrypto\Encryption\AesGcm256Encrypter;
88
use CodeLieutenant\LaravelCrypto\Encryption\XChaCha20Poly1305Encrypter;
99
use CodeLieutenant\LaravelCrypto\Enums\Encryption;
10-
use CodeLieutenant\LaravelCrypto\Keys\EnvKeySaver;
10+
use CodeLieutenant\LaravelCrypto\Traits\EnvKeySaver;
1111
use Illuminate\Contracts\Config\Repository;
1212
use Illuminate\Encryption\Encrypter;
1313

src/Keys/Generators/Blake2bHashingKeyGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace CodeLieutenant\LaravelCrypto\Keys\Generators;
66

7-
use CodeLieutenant\LaravelCrypto\Keys\EnvKeySaver;
87
use CodeLieutenant\LaravelCrypto\Support\Random;
8+
use CodeLieutenant\LaravelCrypto\Traits\EnvKeySaver;
99
use Illuminate\Contracts\Config\Repository;
1010

1111
class Blake2bHashingKeyGenerator implements Generator

src/Keys/EnvKeySaver.php renamed to src/Traits/EnvKeySaver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace CodeLieutenant\LaravelCrypto\Keys;
5+
namespace CodeLieutenant\LaravelCrypto\Traits;
66

77
use CodeLieutenant\LaravelCrypto\Support\Base64;
88
use RuntimeException;

src/Keys/LaravelKeyParser.php renamed to src/Traits/LaravelKeyParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace CodeLieutenant\LaravelCrypto\Keys;
5+
namespace CodeLieutenant\LaravelCrypto\Traits;
66

77
use CodeLieutenant\LaravelCrypto\Support\Base64;
88
use Illuminate\Encryption\MissingAppKeyException;

tests/Architecture/HashingTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
3+
declare(strict_types=1);

tests/Architecture/KeysTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
arch('keys')
88
->expect('CodeLieutenant\LaravelCrypto\Keys')
99
->toBeClasses()
10-
->toImplement(KeyLoader::class);
10+
->toImplement(KeyLoader::class)
11+
->toHaveSuffix('Key');

tests/Architecture/SigningTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+

tests/Architecture/TraitTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,11 @@
66
->expect('CodeLieutenant\LaravelCrypto\Traits')
77
->toBeTraits();
88

9+
arch('hashing traits')
10+
->expect('CodeLieutenant\LaravelCrypto\Hashing\Traits')
11+
->toBeTraits();
12+
13+
arch('signing traits')
14+
->expect('CodeLieutenant\LaravelCrypto\Signing\Traits')
15+
->toBeTraits();
16+

0 commit comments

Comments
 (0)