Merge branch 'main' of https://github.com/messikiller/desensitization

src/Desensitizer.php

@@ -54,7 +54,7 @@ public function __construct(
         string|GuardContract|RuleContract|SecurityPolicyContract|callable|null $guard = null
     ) {
         if (is_null($guard)) {
-            $guard = new NoneGuard();
+            $guard = new NoneGuard;
         }
         $this->via($guard);
         $this->config = new Config($config);

src/Guards/NoneGuard.php

@@ -24,6 +24,6 @@ class NoneGuard extends RuleFixedGuard implements GuardContract
 {
     public function __construct()
     {
-        parent::__construct(new None());
+        parent::__construct(new None);
     }
 }

src/Policies/UnlimitedSecurityPolicy.php

@@ -24,6 +24,6 @@ class UnlimitedSecurityPolicy extends RuleFixedSecurityPolicy implements Securit
 {
     public function __construct()
     {
-        parent::__construct(new None());
+        parent::__construct(new None);
     }
 }

src/Rules/Hash.php

@@ -38,7 +38,7 @@ class Hash extends AbstractRule implements RuleContract
     public function __construct(?HasherContract $hasher = null)
     {
         if (is_null($hasher)) {
-            $hasher = new BcryptHasher();
+            $hasher = new BcryptHasher;
         }
         $this->use($hasher);
     }

tests/DesensitizerTest.php

@@ -18,7 +18,7 @@ final class DesensitizerTest extends TestCase
 {
     public function testDesensitize(): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
 
         $data = [
             'k1' => 'abcdefg',
@@ -34,7 +34,7 @@ public function testDesensitize(): void
         ];
         $desensitized = $desensitizer->desensitize($data, [
             'k1' => (fn ($str) => strrev($str)),
-            'k2.k2_1' => new Mask(),
+            'k2.k2_1' => new Mask,
             'k2.subkey.*' => new Replace('-'),
             'k2.xyz' => 'mask|use:-|repeat:2|padding:3',
         ]);
@@ -47,7 +47,7 @@ public function testDesensitize(): void
 
     public function testInvoke(): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
 
         $this->assertSame(
             '654321',
@@ -71,29 +71,29 @@ public function testInvokePriority(): void
     {
         $this->assertSame(
             'lio--ssi',
-            (new Desensitizer())->invoke('lionel messi', 'mask|use:-|repeat:2|padding:3')
+            (new Desensitizer)->invoke('lionel messi', 'mask|use:-|repeat:2|padding:3')
         );
 
         $this->assertSame(
             'lionel messi',
-            (new Desensitizer())->invoke('lionel messi', 'invalid_rule_and_ungarded')
+            (new Desensitizer)->invoke('lionel messi', 'invalid_rule_and_ungarded')
         );
 
         $this->assertSame(
             'lio--ssi',
-            (new Desensitizer())->via('replace|user:xxx')->invoke('lionel messi', 'mask|use:-|repeat:2|padding:3')
+            (new Desensitizer)->via('replace|user:xxx')->invoke('lionel messi', 'mask|use:-|repeat:2|padding:3')
         );
 
         $this->assertSame(
             '***',
-            (new Desensitizer())->via(Replace::create('***'))->invoke('lionel messi', 'invalid_rule_but_guarded')
+            (new Desensitizer)->via(Replace::create('***'))->invoke('lionel messi', 'invalid_rule_but_guarded')
         );
     }
 
     public function testDesensitizePriority(): void
     {
-        $desensitizer = new Desensitizer();
-        $desensitizer->via((new Mask())->use('-')->repeat(3)->padding(1));
+        $desensitizer = new Desensitizer;
+        $desensitizer->via((new Mask)->use('-')->repeat(3)->padding(1));
 
         $data = [
             'k1' => 'abcdefg',
@@ -119,7 +119,7 @@ public function testExtractMatchedDataKeys(): void
         $reflector = new ReflectionMethod(Desensitizer::class, 'extractMatchedDataKeys');
         $reflector->setAccessible(true);
 
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
         $caller = fn (...$args) => $reflector->invoke($desensitizer, ...$args);
 
         $this->assertSame(['testkey'], $caller('testkey', [
@@ -146,7 +146,7 @@ public function testExtractMatchedDataKeys(): void
 
     public function testConfig(): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
 
         $this->assertSame(
             [
@@ -175,7 +175,7 @@ public function testConfig(): void
         $desensitizer->config('wildcard_char', '-');
 
         $desensitized = $desensitizer->desensitize($data, [
-            'a__b__m-' => (new Mask())->use('*')->padding(1)->repeat(3),
+            'a__b__m-' => (new Mask)->use('*')->padding(1)->repeat(3),
         ]);
 
         $this->assertSame([
@@ -193,7 +193,7 @@ public function testConfig(): void
     #[DataProvider('parseDataProvider')]
     public function testParse(string $definition, string $expectedClass, mixed $input, mixed $expectedOutput): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
         $testMaskRule = $desensitizer->parse($definition);
         $this->assertInstanceOf($expectedClass, $testMaskRule);
         $this->assertSame(
@@ -205,7 +205,7 @@ public function testParse(string $definition, string $expectedClass, mixed $inpu
     public function testParseFailureException(): void
     {
         $this->expectException(DesensitizationException::class);
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
         $desensitizer->parse('invalid');
     }
 
@@ -227,15 +227,15 @@ public function testGlobal(): void
 
     public function testGlobalize(): void
     {
-        $local = new Desensitizer();
+        $local = new Desensitizer;
         $local->via('mask|use:*|repeat:2|padding:2')->globalize();
         $this->assertSame(Desensitizer::global(), $local);
         $this->assertSame('Cr**do', Desensitizer::global()->invoke('CristianoRonaldo'));
     }
 
     public function testVia(): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
 
         $testRule = $this->createStub(RuleContract::class);
         $testRule->method('transform')->willReturn('transformed');
@@ -275,7 +275,7 @@ public function testRegister(): void
     {
         \Leoboy\Desensitization\Tests\Rules\Custom::$handler = fn ($input) => strrev($input);
 
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
         $desensitizer->register(\Leoboy\Desensitization\Tests\Rules\Custom::class, 'custom');
         $this->assertSame('tupnItseT', $desensitizer->invoke('TestInput', 'custom'));
     }

tests/FactoryTest.php

@@ -22,7 +22,7 @@ public function testAttribute(): void
         $this->assertInstanceOf(InvokableAttribute::class, $attribute);
         $this->assertSame('dcba', $attribute->transform('abcd'));
 
-        $attribute = Factory::attribute('testKey2', new Mask());
+        $attribute = Factory::attribute('testKey2', new Mask);
         $this->assertInstanceOf(InvokableAttribute::class, $attribute);
         $this->assertSame('a***z', $attribute->transform('abc123456567xyz'));
     }

tests/RulesTest.php

@@ -19,7 +19,7 @@ final class RulesTest extends TestCase
     #[DataProvider('cutDataProvider')]
     public function testCut(Cut $cutRule, mixed $input, mixed $expectedOutput): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
         $this->assertSame(
             $expectedOutput,
             $desensitizer->invoke($input, $cutRule)
@@ -28,9 +28,9 @@ public function testCut(Cut $cutRule, mixed $input, mixed $expectedOutput): void
 
     public function testHash(): void
     {
-        $desensitizer = new Desensitizer();
-        $bcryptHasher = new BcryptHasher();
-        $argonHasher = new ArgonHasher();
+        $desensitizer = new Desensitizer;
+        $bcryptHasher = new BcryptHasher;
+        $argonHasher = new ArgonHasher;
 
         $this->assertTrue($bcryptHasher->check(
             'LionelMessi',
@@ -46,7 +46,7 @@ public function testHash(): void
     #[DataProvider('maskDataProvider')]
     public function testMask(Mask $maskRule, mixed $input, mixed $expectedOutput): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
         $this->assertSame(
             $expectedOutput,
             $desensitizer->invoke($input, $maskRule)
@@ -55,7 +55,7 @@ public function testMask(Mask $maskRule, mixed $input, mixed $expectedOutput): v
 
     public function testReplace(): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
         $this->assertSame(
             '-',
             $desensitizer->invoke('abc123', Replace::create()->use('-'))
@@ -64,7 +64,7 @@ public function testReplace(): void
 
     public function testNone(): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
         $this->assertSame(
             'abc123',
             $desensitizer->invoke('abc123', None::create())
@@ -73,7 +73,7 @@ public function testNone(): void
 
     public function testMix(): void
     {
-        $desensitizer = new Desensitizer();
+        $desensitizer = new Desensitizer;
         $this->assertSame(
             'i***L',
             $desensitizer->invoke(