adds test for Validator Factory (#42408)

laravel · May 17, 2022 · 658800d · 658800d
1 parent 465dbee
commit 658800d
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/src/Illuminate/Validation/Factory.php b/src/Illuminate/Validation/Factory.php
@@ -27,7 +27,7 @@ class Factory implements FactoryContract
     /**
      * The IoC container instance.
      *
-     * @var \Illuminate\Contracts\Container\Container
+     * @var \Illuminate\Contracts\Container\Container|null
      */
     protected $container;
 
@@ -313,7 +313,7 @@ public function setPresenceVerifier(PresenceVerifierInterface $presenceVerifier)
     /**
      * Get the container instance used by the validation factory.
      *
-     * @return \Illuminate\Contracts\Container\Container
+     * @return \Illuminate\Contracts\Container\Container|null
      */
     public function getContainer()
     {

diff --git a/tests/Validation/ValidationFactoryTest.php b/tests/Validation/ValidationFactoryTest.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Tests\Validation;
 
+use Illuminate\Container\Container;
 use Illuminate\Contracts\Translation\Translator as TranslatorInterface;
 use Illuminate\Validation\Factory;
 use Illuminate\Validation\PresenceVerifierInterface;
@@ -106,4 +107,48 @@ public function testValidateMethodCanBeCalledPublicly()
         $validator = $factory->make(['bar' => ['baz']], ['bar' => 'foo']);
         $this->assertTrue($validator->passes());
     }
+
+    public function testExcludeAndIncludeUnvalidatedArrayKeys()
+    {
+        $translator = m::mock(TranslatorInterface::class);
+
+        $factory = new Factory($translator);
+        // check the default behaviour.
+        $validator1 = $factory->make(['key' => ['val']], ['key' => 'required']);
+        $this->assertTrue($validator1->excludeUnvalidatedArrayKeys);
+
+        $factory->excludeUnvalidatedArrayKeys();
+        $validator2 = $factory->make(['key' => ['val']], ['key' => 'required']);
+        $this->assertTrue($validator2->excludeUnvalidatedArrayKeys);
+
+        $factory->includeUnvalidatedArrayKeys();
+        $validator3 = $factory->make(['key' => ['val']], ['key' => 'required']);
+        $this->assertFalse($validator3->excludeUnvalidatedArrayKeys);
+
+        // checks it does not switch behaviour automatically.
+        $validator4 = $factory->make(['key' => ['val']], ['key' => 'required']);
+        $this->assertFalse($validator4->excludeUnvalidatedArrayKeys);
+
+        // checks it can switch.
+        $factory->excludeUnvalidatedArrayKeys();
+        $validator5 = $factory->make(['key' => ['val']], ['key' => 'required']);
+        $this->assertTrue($validator5->excludeUnvalidatedArrayKeys);
+
+        // checks switching does not affect previously created validator objects.
+        $this->assertTrue($validator1->excludeUnvalidatedArrayKeys);
+        $this->assertTrue($validator2->excludeUnvalidatedArrayKeys);
+        $this->assertFalse($validator3->excludeUnvalidatedArrayKeys);
+        $this->assertFalse($validator4->excludeUnvalidatedArrayKeys);
+    }
+
+    public function testSetContainer()
+    {
+        $translator = m::mock(TranslatorInterface::class);
+        $container = new Container;
+        $factory = new Factory($translator);
+
+        $this->assertNull($factory->getContainer());
+
+        $this->assertSame($container, $factory->setContainer($container)->getContainer());
+    }
 }