Merge pull request #16 from nonamephp/feature/validator-add

Validator: Add values and rules after construct

Author: cdtweb

src/Validator.php

@@ -147,6 +147,72 @@ public static function __callStatic($method, $arguments)
         throw new \BadMethodCallException("Validator::{$method}() not defined.");
     }
 
+    /**
+     * Add value.
+     *
+     * @param string $name
+     * @param mixed $value
+     */
+    public function addValue(string $name, $value)
+    {
+        $this->values->set($name, $value);
+    }
+
+    /**
+     * Add multiple values.
+     *
+     * @param array $values
+     */
+    public function addValues(array $values)
+    {
+        foreach ($values as $name => $value) {
+            $this->values->set($name, $value);
+        }
+    }
+
+    /**
+     * Get values.
+     *
+     * @return array
+     */
+    public function values() : array
+    {
+        return $this->values->toArray();
+    }
+
+    /**
+     * Add rule.
+     *
+     * @param string $name
+     * @param mixed $rule
+     */
+    public function addRule(string $name, $rule)
+    {
+        $this->rules->set($name, $rule);
+    }
+
+    /**
+     * Add multiple rules.
+     *
+     * @param array $rules
+     */
+    public function addRules(array $rules)
+    {
+        foreach ($rules as $name => $rule) {
+            $this->rules->set($name, $rule);
+        }
+    }
+
+    /**
+     * Get rules.
+     *
+     * @return array
+     */
+    public function rules() : array
+    {
+        return $this->rules->toArray();
+    }
+
     /**
      * Validate the values based on the rules.
      *

tests/ValidatorTest.php

@@ -93,6 +93,50 @@ protected function tearDown()
     ///////////////////////////////////
     // Tests
 
+    /**
+     * @covers Validator::addValue, Validator::addValues, Validator::values
+     */
+    public function testAddValue()
+    {
+        $validator = new Validator();
+
+        // Add single value
+        $validator->addValue('a', 'b');
+
+        // Add multiple values
+        $validator->addValues(['b' => 'c', 'c' => 'd']);
+
+        // Get values from validator
+        $values = $validator->values();
+
+        // Assertions
+        $this->assertTrue(isset($values['a']) && $values['a'] == 'b');
+        $this->assertTrue(isset($values['b']) && $values['b'] == 'c');
+        $this->assertTrue(isset($values['c']) && $values['c'] == 'd');
+    }
+
+    /**
+     * @covers Validator::addRule, Validator::addRules, Validator::rules
+     */
+    public function testAddRule()
+    {
+        $validator = new Validator();
+
+        // Add single rule
+        $validator->addRule('a', 'int');
+
+        // Add multiple rules
+        $validator->addRules(['b' => 'str', 'c' => 'bool']);
+
+        // Get rules from validator
+        $rules = $validator->rules();
+
+        // Assertions
+        $this->assertTrue(isset($rules['a']) && $rules['a'] == 'int');
+        $this->assertTrue(isset($rules['b']) && $rules['b'] == 'str');
+        $this->assertTrue(isset($rules['c']) && $rules['c'] == 'bool');
+    }
+
     /**
      * @covers Validator::validate, Validator::hasErrors, Validator::getErrors
      */