FIX: RequiredIf rule

RequiredIf was formatting its error message string incorrectly when using the spatie RequiredIf attribute.

Author: bradenkeith

src/Services/MessageResolutionService.php

@@ -93,9 +93,6 @@ private function getDefaultMessage(): string
         $lowerRule = strtolower($this->ruleName);
         $snakeRule = Str::snake($this->ruleName);
 
-        $messageParameters = $this->parameters;
-        $messageParameters['attribute'] = $this->field;
-
         $originalData = $this->validator->getData();
         $tempData = $originalData;
         $dataModified = false;
@@ -105,10 +102,17 @@ private function getDefaultMessage(): string
             $dataModified = true;
         }
 
-        if ($snakeRule === 'required_if' && $this->applyRequiredIfValue($tempData)) {
-            $dataModified = true;
+        if ($snakeRule === 'required_if') {
+            if ($this->applyRequiredIfValue($tempData)) {
+                $dataModified = true;
+            } else {
+                $this->normalizeRequiredIfParameters();
+            }
         }
 
+        $messageParameters = $this->parameters;
+        $messageParameters['attribute'] = $this->field;
+
         if ($dataModified) {
             $this->validator->setData($tempData);
         }
@@ -180,7 +184,15 @@ private function applyRequiredIfValue(array &$data): bool
 
         $value = $values[0] ?? null;
 
-        $this->setNestedValue($data, $otherField, $value);
+        $normalizedField = $this->normalizeDependentField($otherField);
+
+        if ($normalizedField === '') {
+            $normalizedField = $otherField;
+        }
+
+        $this->parameters[0] = $normalizedField;
+
+        $this->setNestedValue($data, $normalizedField, $value);
 
         return true;
     }
@@ -424,4 +436,67 @@ private function assignValueToSegments(&$target, array $segments, $value): void
 
         $this->assignValueToSegments($target[$segment], $segments, $value);
     }
+
+    private function normalizeRequiredIfParameters(): void
+    {
+        if (! isset($this->parameters[0]) || ! is_string($this->parameters[0])) {
+            return;
+        }
+
+        $normalized = $this->normalizeDependentField($this->parameters[0]);
+
+        if ($normalized !== '' && $normalized !== $this->parameters[0]) {
+            $this->parameters[0] = $normalized;
+        }
+    }
+
+    private function normalizeDependentField(string $dependentField): string
+    {
+        $dependentField = trim($dependentField);
+
+        if ($dependentField === '') {
+            return '';
+        }
+
+        $fieldSegments = array_values(array_filter(
+            explode('.', $this->field),
+            static fn (string $segment): bool => $segment !== ''
+        ));
+
+        $dependentSegments = array_values(array_filter(
+            explode('.', $dependentField),
+            static fn (string $segment): bool => $segment !== ''
+        ));
+
+        if (empty($fieldSegments) || empty($dependentSegments)) {
+            return $dependentField;
+        }
+
+        $fieldSegmentCount = count($fieldSegments);
+
+        if (count($dependentSegments) <= $fieldSegmentCount) {
+            return $dependentField;
+        }
+
+        for ($index = 0; $index < $fieldSegmentCount; $index++) {
+            if (! isset($dependentSegments[$index]) || $dependentSegments[$index] !== $fieldSegments[$index]) {
+                return $dependentField;
+            }
+        }
+
+        $parentSegments = array_slice($fieldSegments, 0, -1);
+        $remainingSegments = array_slice($dependentSegments, $fieldSegmentCount);
+
+        if (empty($remainingSegments)) {
+            return $dependentField;
+        }
+
+        $normalizedSegments = array_merge($parentSegments, $remainingSegments);
+
+        if (empty($normalizedSegments)) {
+            return '';
+        }
+
+        return implode('.', $normalizedSegments);
+    }
 }

tests/Unit/Services/LaravelValidationResolverTest.php

@@ -645,6 +645,41 @@ public function it_resolves_required_if_messages_with_expected_value(): void
         );
     }
 
+    #[Test]
+    public function it_normalizes_required_if_messages_from_relative_field_references(): void
+    {
+        $translator = new \Illuminate\Translation\Translator(new \Illuminate\Translation\ArrayLoader, 'en');
+        $translator->addLines([
+            'validation.required_if' => 'The :attribute field is required when :other is :value.',
+        ], 'en');
+
+        $validator = new \Illuminate\Validation\Validator(
+            $translator,
+            [
+                'connection_type' => 'new',
+                'existing_account_id' => null,
+            ],
+            [
+                'connection_type' => 'nullable|in:new,existing',
+                'existing_account_id' => 'required_if:existing_account_id.connection_type,existing|string',
+            ]
+        );
+
+        $result = $this->resolver->resolve(
+            'existing_account_id',
+            'required_if:existing_account_id.connection_type,existing|string',
+            $validator
+        );
+
+        $requiredIfValidation = $result->getValidation('RequiredIf');
+
+        $this->assertNotNull($requiredIfValidation);
+        $this->assertSame(
+            'The existing account id field is required when connection type is existing.',
+            $requiredIfValidation->message
+        );
+    }
+
     #[Test]
     public function it_never_returns_translation_keys_as_messages()
     {