From 3cd3d0e92cb93768624e87c47b73c673b262f925 Mon Sep 17 00:00:00 2001 From: Walmir Silva Date: Thu, 24 Oct 2024 18:30:32 -0300 Subject: [PATCH] fix: remove unused parameter from createProcessorMock method The name parameter in createProcessorMock was not being used in the method implementation. This change removes the unnecessary parameter and updates all method calls accordingly to maintain the same test functionality while keeping the code cleaner. --- composer.lock | 20 ++++++++++---------- src/Sanitizer.php | 23 +++++++++++------------ tests/SanitizerTest.php | 38 +++++++------------------------------- 3 files changed, 28 insertions(+), 53 deletions(-) diff --git a/composer.lock b/composer.lock index 00573c5..be607d2 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "kariricode/contract", - "version": "v2.7.10", + "version": "v2.7.11", "source": { "type": "git", "url": "https://github.com/KaririCode-Framework/kariricode-contract.git", - "reference": "84db138e9e03e7173ee1a37d75fa21d756a6d060" + "reference": "72c834a3afe2dbded8f6a7f96005635424636d4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KaririCode-Framework/kariricode-contract/zipball/84db138e9e03e7173ee1a37d75fa21d756a6d060", - "reference": "84db138e9e03e7173ee1a37d75fa21d756a6d060", + "url": "https://api.github.com/repos/KaririCode-Framework/kariricode-contract/zipball/72c834a3afe2dbded8f6a7f96005635424636d4b", + "reference": "72c834a3afe2dbded8f6a7f96005635424636d4b", "shasum": "" }, "require": { @@ -66,7 +66,7 @@ "issues": "https://github.com/KaririCode-Framework/kariricode-contract/issues", "source": "https://github.com/KaririCode-Framework/kariricode-contract" }, - "time": "2024-10-21T18:32:50+00:00" + "time": "2024-10-24T18:51:39+00:00" }, { "name": "kariricode/data-structure", @@ -144,16 +144,16 @@ }, { "name": "kariricode/processor-pipeline", - "version": "v1.1.5", + "version": "v1.1.6", "source": { "type": "git", "url": "https://github.com/KaririCode-Framework/kariricode-processor-pipeline.git", - "reference": "6bc3e747f254c56b5fc0cbdf22b1d3ce1497a7d0" + "reference": "58a25f345d066c7d7b69331bdbe1d468513964bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KaririCode-Framework/kariricode-processor-pipeline/zipball/6bc3e747f254c56b5fc0cbdf22b1d3ce1497a7d0", - "reference": "6bc3e747f254c56b5fc0cbdf22b1d3ce1497a7d0", + "url": "https://api.github.com/repos/KaririCode-Framework/kariricode-processor-pipeline/zipball/58a25f345d066c7d7b69331bdbe1d468513964bf", + "reference": "58a25f345d066c7d7b69331bdbe1d468513964bf", "shasum": "" }, "require": { @@ -199,7 +199,7 @@ "issues": "https://github.com/KaririCode-Framework/kariricode-processor-pipeline/issues", "source": "https://github.com/KaririCode-Framework/kariricode-processor-pipeline" }, - "time": "2024-10-18T18:33:05+00:00" + "time": "2024-10-24T18:55:45+00:00" }, { "name": "kariricode/property-inspector", diff --git a/src/Sanitizer.php b/src/Sanitizer.php index f88ba5e..ebb1752 100644 --- a/src/Sanitizer.php +++ b/src/Sanitizer.php @@ -12,7 +12,6 @@ use KaririCode\PropertyInspector\Utility\PropertyInspector; use KaririCode\Sanitizer\Attribute\Sanitize; use KaririCode\Sanitizer\Contract\SanitizationResult; -use KaririCode\Sanitizer\Contract\SanitizationResultProcessor; use KaririCode\Sanitizer\Processor\DefaultSanitizationResultProcessor; class Sanitizer implements SanitizerContract @@ -20,25 +19,25 @@ class Sanitizer implements SanitizerContract private const IDENTIFIER = 'sanitizer'; private ProcessorBuilder $builder; - private PropertyInspector $propertyInspector; - private AttributeHandler $attributeHandler; public function __construct( - private readonly ProcessorRegistry $registry, - private readonly SanitizationResultProcessor $resultProcessor = new DefaultSanitizationResultProcessor() + private readonly ProcessorRegistry $registry ) { $this->builder = new ProcessorBuilder($this->registry); - $this->attributeHandler = new AttributeHandler(self::IDENTIFIER, $this->builder); - $this->propertyInspector = new PropertyInspector( - new AttributeAnalyzer(Sanitize::class) - ); } public function sanitize(mixed $object): SanitizationResult { - $this->propertyInspector->inspect($object, $this->attributeHandler); - $this->attributeHandler->applyChanges($object); + $attributeHandler = new AttributeHandler(self::IDENTIFIER, $this->builder); + $propertyInspector = new PropertyInspector( + new AttributeAnalyzer(Sanitize::class) + ); + + $propertyInspector->inspect($object, $attributeHandler); + $attributeHandler->applyChanges($object); + + $resultProcessor = new DefaultSanitizationResultProcessor(); - return $this->resultProcessor->process($this->attributeHandler); + return $resultProcessor->process($attributeHandler); } } diff --git a/tests/SanitizerTest.php b/tests/SanitizerTest.php index 18d8762..3e8feb0 100644 --- a/tests/SanitizerTest.php +++ b/tests/SanitizerTest.php @@ -8,8 +8,6 @@ use KaririCode\Contract\Processor\ProcessorRegistry; use KaririCode\Sanitizer\Attribute\Sanitize; use KaririCode\Sanitizer\Contract\SanitizationResult; -use KaririCode\Sanitizer\Contract\SanitizationResultProcessor; -use KaririCode\Sanitizer\Processor\Input\TrimSanitizer; use KaririCode\Sanitizer\Sanitizer; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; @@ -18,18 +16,14 @@ final class SanitizerTest extends TestCase { private Sanitizer $sanitizer; private ProcessorRegistry|MockObject $registry; - private SanitizationResultProcessor|MockObject $resultProcessor; - private SanitizationResult|MockObject $sanitizationResult; protected function setUp(): void { $this->registry = $this->createMock(ProcessorRegistry::class); - $this->resultProcessor = $this->createMock(SanitizationResultProcessor::class); - $this->sanitizationResult = $this->createMock(SanitizationResult::class); - $this->sanitizer = new Sanitizer($this->registry, $this->resultProcessor); + $this->sanitizer = new Sanitizer($this->registry); } - private function createProcessorMock(string $name, mixed $input, mixed $output): Processor|MockObject + private function createProcessorMock(mixed $input, mixed $output): Processor|MockObject { $processor = $this->createMock(Processor::class); $processor->method('process') @@ -76,14 +70,11 @@ public function testSanitizeProcessesObjectProperties(): void return null; }); - $this->resultProcessor->method('process') - ->willReturn($this->sanitizationResult); - $result = $this->sanitizer->sanitize($testObject); $this->assertSame('Walmir Silva', $testObject->name); $this->assertSame('walmir.silva@example.com', $testObject->email); - $this->assertSame($this->sanitizationResult, $result); + $this->assertInstanceOf(SanitizationResult::class, $result); } public function testSanitizeHandlesNonProcessableAttributes(): void @@ -96,7 +87,6 @@ public function testSanitizeHandlesNonProcessableAttributes(): void }; $trimProcessor = $this->createProcessorMock( - 'trim', ' trim me ', 'trim me' ); @@ -105,14 +95,11 @@ public function testSanitizeHandlesNonProcessableAttributes(): void ->with('sanitizer', 'trim') ->willReturn($trimProcessor); - $this->resultProcessor->method('process') - ->willReturn($this->sanitizationResult); - $result = $this->sanitizer->sanitize($testObject); $this->assertSame('trim me', $testObject->processable); $this->assertSame('leave me alone', $testObject->nonProcessable); - $this->assertSame($this->sanitizationResult, $result); + $this->assertInstanceOf(SanitizationResult::class, $result); } public function testSanitizeHandlesExceptionsAndUsesFallbackValue(): void @@ -130,13 +117,10 @@ public function testSanitizeHandlesExceptionsAndUsesFallbackValue(): void ->with('sanitizer', 'problematic') ->willReturn($problematicProcessor); - $this->resultProcessor->method('process') - ->willReturn($this->sanitizationResult); - $result = $this->sanitizer->sanitize($testObject); $this->assertSame('cause problem', $testObject->problematic); - $this->assertSame($this->sanitizationResult, $result); + $this->assertInstanceOf(SanitizationResult::class, $result); } public function testSanitizeHandlesPrivateAndProtectedProperties(): void @@ -171,14 +155,11 @@ public function getProtectedProp(): string ->with('sanitizer', 'trim') ->willReturn($trimProcessor); - $this->resultProcessor->method('process') - ->willReturn($this->sanitizationResult); - $result = $this->sanitizer->sanitize($testObject); $this->assertSame('private', $testObject->getPrivateProp()); $this->assertSame('protected', $testObject->getProtectedProp()); - $this->assertSame($this->sanitizationResult, $result); + $this->assertInstanceOf(SanitizationResult::class, $result); } public function testSanitizeHandlesMultipleProcessorsForSingleProperty(): void @@ -189,13 +170,11 @@ public function testSanitizeHandlesMultipleProcessorsForSingleProperty(): void }; $trimProcessor = $this->createProcessorMock( - 'trim', ' hello world ', 'hello world' ); $uppercaseProcessor = $this->createProcessorMock( - 'uppercase', 'hello world', 'HELLO WORLD' ); @@ -206,12 +185,9 @@ public function testSanitizeHandlesMultipleProcessorsForSingleProperty(): void ['sanitizer', 'uppercase', $uppercaseProcessor], ]); - $this->resultProcessor->method('process') - ->willReturn($this->sanitizationResult); - $result = $this->sanitizer->sanitize($testObject); $this->assertSame('HELLO WORLD', $testObject->multiProcessed); - $this->assertSame($this->sanitizationResult, $result); + $this->assertInstanceOf(SanitizationResult::class, $result); } }