chore: changes noted in the code review

Signed-off-by: Crisciany Souza <[email protected]>

Author: Any97Cris

lib/Service/Certificate/RulesService.php

@@ -43,10 +43,10 @@ class RulesService {
 	public function __construct(
 		protected IL10N $l10n,
 	) {
-
 	}
 
 	public function getRule(string $fieldName): array {
+		if (!array_key_exists($fieldName, $this->rules)) return [];
 		if (!isset($this->rules[$fieldName]['helperText'])) {
 			$this->rules[$fieldName]['helperText'] = $this->getHelperText($fieldName);
 			if (empty($this->rules[$fieldName]['helperText'])) {

lib/Service/Certificate/ValidateService.php

@@ -17,25 +17,34 @@ public function __construct(
 		protected RulesService $rulesService,
 		protected IL10N $l10n,
 	) {
-
 	}
 
-	public function validate(string $fieldName, string $value):void {
+	public function validate(string $fieldName, string $value): void {
 		$rule = $this->rulesService->getRule($fieldName);
 		$value = trim($value);
 		$length = strlen($value);
+
+		if ($fieldName === 'id' && $length === 0) {
+			throw new InvalidArgumentException('Parameter id is invalid');
+		}
+
 		if (!$length && isset($rule['required']) && $rule['required']) {
 			throw new InvalidArgumentException(
 				$this->l10n->t("Parameter '%s' is required!", [$fieldName])
 			);
 		}
+
 		if ($length > $rule['max'] || $length < $rule['min']) {
 			throw new InvalidArgumentException(
-				$this->l10n->t("Parameter '%s' should be betweeen %s and %s.", [$fieldName, $rule['min'], $rule['max']])
+				$this->l10n->t(
+					"Parameter '%s' should be between %s and %s.",
+					[$fieldName, $rule['min'], $rule['max']]
+				)
 			);
 		}
 	}
 
+
 	public function validateNames(array $names) {
 		foreach ($names as $item) {
 			if (empty($item['id'])) {

tests/php/Unit/Service/Certificate/ValidateServiceTest.php

@@ -36,17 +36,17 @@ private function getService(): ValidateService {
 	public function testValidateWithValidInput(string $fieldName, string $value): void {
 		$service = $this->getService();
 		$service->validate($fieldName, $value);
-		$this->assertTrue(true); // se não lançar exceção, passou
+		$this->assertTrue(true);
 	}
 
 	public static function providerValidInputs(): array {
 		return [
-			['CN', 'John Doe'],       // requerido, dentro do limite
-			['C', 'BR'],              // exatamente 2 letras
-			['ST', 'Amazonas'],       // válido
-			['L', 'Manaus'],          // válido
-			['O', 'LibreCode'],       // válido
-			['OU', 'Development'],    // válido
+			['CN', 'John Doe'],
+			['C', 'BR'],
+			['ST', 'Amazonas'],
+			['L', 'Manaus'],
+			['O', 'LibreCode'],
+			['OU', 'Development'],
 		];
 	}
 
@@ -60,16 +60,11 @@ public function testValidateWithInvalidInput(string $fieldName, string $value, s
 
 	public static function providerInvalidInputs(): array {
 		return [
-			// CN é obrigatório → vazio deve falhar
 			['CN', '', "Parameter 'CN' is required!"],
-			// CN muito longo
-			['CN', str_repeat('a', 65), "Parameter 'CN' should be betweeen 1 and 64."],
-			// C muito curto
-			['C', 'B', "Parameter 'C' should be betweeen 2 and 2."],
-			// C muito longo
-			['C', 'BRA', "Parameter 'C' should be betweeen 2 and 2."],
-			// ST acima do limite
-			['ST', str_repeat('x', 129), "Parameter 'ST' should be betweeen 1 and 128."],
+			['CN', str_repeat('a', 65), "Parameter 'CN' should be between 1 and 64."],
+			['C', 'B', "Parameter 'C' should be between 2 and 2."],
+			['C', 'BRA', "Parameter 'C' should be between 2 and 2."],
+			['ST', str_repeat('x', 129), "Parameter 'ST' should be between 1 and 128."],
 		];
 	}
 
@@ -90,7 +85,8 @@ public function testValidateNamesWithoutIdShouldFail(): void {
 		$service = $this->getService();
 
 		$names = [
-			['id' => '', 'value' => 'Invalid Name'],
+			['id' => '', 'value' => 'Name'],
+			['value' => 'Name'],
 		];
 
 		$this->expectException(InvalidArgumentException::class);
@@ -99,16 +95,23 @@ public function testValidateNamesWithoutIdShouldFail(): void {
 		$service->validateNames($names);
 	}
 
-	public function testValidateNamesWithInvalidValueShouldFail(): void {
-		$service = $this->getService();
 
-		$names = [
-			['id' => 'C', 'value' => 'BRA'], // inválido, deve ter 2 chars
-		];
+	#[DataProvider('providerInvalidNames')]
+	public function testValidateNamesWithInvalidValueShouldFail(array $name, string $expectedMessage): void {
+		$service = $this->getService();
 
 		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage("Parameter 'C' should be betweeen 2 and 2.");
+		$this->expectExceptionMessage($expectedMessage);
 
-		$service->validateNames($names);
+		$service->validateNames([$name]);
+	}
+
+	public static function providerInvalidNames(): array {
+		return [
+			[['id' => 'C', 'value' => ''],   "Parameter 'C' should be between 2 and 2."],
+			[['id' => 'C', 'value' => 'B'],  "Parameter 'C' should be between 2 and 2."],
+			[['id' => 'C', 'value' => 'BRA'], "Parameter 'C' should be between 2 and 2."],
+			[['id' => 'C', 'value' => 'BRAA'], "Parameter 'C' should be between 2 and 2."],
+		];
 	}
 }