Made Required::isValid more readable, added a test for an untested path in Validator

src/Particle/Validator/Rule/Required.php

@@ -109,6 +109,11 @@ public function shouldBreakChain()
      */
     public function validate($value)
     {
+        if (!$this->allowEmpty && strlen($value) === 0) {
+            $this->shouldBreak = true;
+            return $this->error(self::EMPTY_VALUE);
+        }
+
         return true;
     }
 
@@ -121,32 +126,14 @@ public function validate($value)
      */
     public function isValid($key, Container $input)
     {
-        $array = $input->getArrayCopy();
-
-        if (isset($this->requiredCallback)) {
-            $this->required = call_user_func_array($this->requiredCallback, [$array]);
-        }
-
-        if (isset($this->allowEmptyCallback)) {
-            $this->allowEmpty = call_user_func_array($this->allowEmptyCallback, [$array]);
-        }
-
-        if ($this->required && !$input->has($key)) {
-            $this->shouldBreak = true;
-            return $this->error(self::NON_EXISTENT_KEY);
-        }
-
-        if (!$this->required && !$input->has($key)) {
-            $this->shouldBreak = true;
-            return true;
-        }
+        $this->required = $this->isRequired($input);
+        $this->allowEmpty = $this->hasAllowEmpty($input);
 
-        if (!$this->allowEmpty && strlen($input->get($key)) === 0) {
-            $this->shouldBreak = true;
-            return $this->error(self::EMPTY_VALUE);
+        if (!$input->has($key)) {
+            return $this->checkRequired();
         }
 
-        return true;
+        return $this->validate($input->get($key));
     }
 
     /**
@@ -176,4 +163,44 @@ public function setAllowEmpty(callable $allowEmpty)
         $this->allowEmptyCallback = $allowEmpty;
         return $this;
     }
+
+    /**
+     * Determines if the value is required.
+     *
+     * @param Container $input
+     * @return bool
+     */
+    protected function isRequired(Container $input)
+    {
+        if (isset($this->requiredCallback)) {
+            $this->required = call_user_func_array($this->requiredCallback, [$input->getArrayCopy()]);
+        }
+        return $this->required;
+    }
+
+    /**
+     * Determines if the value may be empty.
+     *
+     * @param Container $input
+     * @return bool
+     */
+    public function hasAllowEmpty(Container $input)
+    {
+        if (isset($this->allowEmptyCallback)) {
+            $this->allowEmpty = call_user_func_array($this->allowEmptyCallback, [$input->getArrayCopy()]);
+        }
+        return $this->allowEmpty;
+    }
+
+    /**
+     * Returns an error on a required value, and true on an optional value.
+     *
+     * @return bool
+     */
+    protected function checkRequired()
+    {
+        $this->shouldBreak = true;
+
+        return $this->required ? $this->error(self::NON_EXISTENT_KEY) : true;
+    }
 }

src/Particle/Validator/Validator.php

@@ -52,6 +52,13 @@ class Validator
      */
     protected $output;
 
+    /**
+     * Contains the name of the current context.
+     *
+     * @var string
+     */
+    protected $context;
+
     /**
      * Construct the validator.
      */

tests/Particle/Validator/ValidatorTest.php

@@ -256,4 +256,10 @@ public function testReturnsValidatedValues()
 
         $this->assertEquals($expected, $this->validator->getValues());
     }
+
+    public function testReturnsEmptyArrayInsteadOfValidatedValues()
+    {
+        $this->validator->required('first_name')->lengthBetween(2, 20);
+        $this->assertEquals([], $this->validator->getValues());
+    }
 }