actually remove the attribute

laravel · Dec 18, 2019 · f9ea321 · f9ea321
1 parent 30cc4bb
commit f9ea321
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -351,7 +351,7 @@ protected function shouldBeExcluded($attribute)
      */
     protected function removeAttribute($attribute)
     {
-        unset($this->rules[$attribute]);
+        unset($this->data[$attribute], $this->rules[$attribute]);
     }
 
     /**

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -5035,6 +5035,28 @@ public function testExcludeUnless()
         $this->assertSame(['mouse' => ['validation.required']], $validator->messages()->toArray());
     }
 
+    public function testExcludeValuesAreReallyRemoved()
+    {
+        $validator = new Validator(
+            $this->getIlluminateArrayTranslator(),
+            ['cat' => 'Tom', 'mouse' => 'Jerry'],
+            ['cat' => 'required|string', 'mouse' => 'exclude_if:cat,Tom|required|string']
+        );
+        $this->assertTrue($validator->passes());
+        $this->assertSame(['cat' => 'Tom'], $validator->validated());
+        $this->assertSame(['cat' => 'Tom'], $validator->valid());
+        $this->assertSame([], $validator->invalid());
+
+        $validator = new Validator(
+            $this->getIlluminateArrayTranslator(),
+            ['cat' => 'Tom', 'mouse' => null],
+            ['cat' => 'required|string', 'mouse' => 'exclude_if:cat,Felix|required|string']
+        );
+        $this->assertTrue($validator->fails());
+        $this->assertSame(['cat' => 'Tom'], $validator->valid());
+        $this->assertSame(['mouse' => null], $validator->invalid());
+    }
+
     protected function getTranslator()
     {
         return m::mock(TranslatorContract::class);