From 74a882969ecaa4e8d4deb1c2259274efa68ac0a8 Mon Sep 17 00:00:00 2001 From: Matteo Kloiber Date: Sun, 6 Nov 2016 01:46:28 +0100 Subject: [PATCH] Indent fixed --- src/Valitron/Validator.php | 64 +++---- .../Valitron/ValidateAddInstanceRuleTest.php | 158 +++++++++--------- 2 files changed, 111 insertions(+), 111 deletions(-) diff --git a/src/Valitron/Validator.php b/src/Valitron/Validator.php index 54f6bf5..20dc88e 100644 --- a/src/Valitron/Validator.php +++ b/src/Valitron/Validator.php @@ -1037,10 +1037,10 @@ class Validator */ public static function addRule($name, $callback, $message = null) { - if ($message === null) - { - $message = static::ERROR_DEFAULT; - } + if ($message === null) + { + $message = static::ERROR_DEFAULT; + } static::assertRuleCallback($callback); @@ -1048,23 +1048,23 @@ class Validator static::$_ruleMessages[$name] = $message; } - public function getUniqueRuleName($fields) - { - if (is_array($fields)) - { - $fields = implode("_", $fields); - } + public function getUniqueRuleName($fields) + { + if (is_array($fields)) + { + $fields = implode("_", $fields); + } - $orgName = "{$fields}_rule"; - $name = $orgName; - $rules = $this->getRules(); - while (isset($rules[$name])) - { - $name = $orgName . "_" . rand(0, 10000); - } + $orgName = "{$fields}_rule"; + $name = $orgName; + $rules = $this->getRules(); + while (isset($rules[$name])) + { + $name = $orgName . "_" . rand(0, 10000); + } - return $name; - } + return $name; + } /** * Convenience method to add a single validation rule @@ -1079,19 +1079,19 @@ class Validator // Get any other arguments passed to function $params = array_slice(func_get_args(), 2); - // Note: we cannot use is_callable here since max, int, and many - // other string can also be callables but aren't really rule callbacks. - // - // If a closure is used, we can be sure that the user actually - // wants $rule to be a custom rule check. - if (is_object($rule) && ($rule instanceof \Closure)) - { - $name = $this->getUniqueRuleName($fields); - $msg = isset($params[0]) ? $params[0] : null; - $this->addInstanceRule($name, $rule, $msg); - $rule = $name; - } - + // Note: we cannot use is_callable here since max, int, and many + // other string can also be callables but aren't really rule callbacks. + // + // If a closure is used, we can be sure that the user actually + // wants $rule to be a custom rule check. + if (is_object($rule) && ($rule instanceof \Closure)) + { + $name = $this->getUniqueRuleName($fields); + $msg = isset($params[0]) ? $params[0] : null; + $this->addInstanceRule($name, $rule, $msg); + $rule = $name; + } + $errors = $this->getRules(); if (!isset($errors[$rule])) { $ruleMethod = 'validate' . ucfirst($rule); diff --git a/tests/Valitron/ValidateAddInstanceRuleTest.php b/tests/Valitron/ValidateAddInstanceRuleTest.php index c1f759e..cc10d0b 100644 --- a/tests/Valitron/ValidateAddInstanceRuleTest.php +++ b/tests/Valitron/ValidateAddInstanceRuleTest.php @@ -3,99 +3,99 @@ use Valitron\Validator; class ValidateAddInstanceRuleTest extends BaseTestCase { - protected function assertValid($v) - { - $msg = "\tErrors:\n"; - $status = $v->validate(); - foreach ($v->errors() as $label => $messages) - { - foreach ($messages as $theMessage) - { - $msg .= "\n\t{$label}: {$theMessage}"; - } - } + protected function assertValid($v) + { + $msg = "\tErrors:\n"; + $status = $v->validate(); + foreach ($v->errors() as $label => $messages) + { + foreach ($messages as $theMessage) + { + $msg .= "\n\t{$label}: {$theMessage}"; + } + } - $this->assertTrue($v->validate(), $msg); - } + $this->assertTrue($v->validate(), $msg); + } - public function testAddInstanceRule() - { - $v = new Validator(array( - "foo" => "bar", - "fuzz" => "bazz", - )); + public function testAddInstanceRule() + { + $v = new Validator(array( + "foo" => "bar", + "fuzz" => "bazz", + )); - $v->addInstanceRule("fooRule", function($field, $value) - { - return $field !== "foo" || $value !== "barz"; - }); + $v->addInstanceRule("fooRule", function($field, $value) + { + return $field !== "foo" || $value !== "barz"; + }); - Validator::addRule("fuzzerRule", function($field, $value) - { - return $field !== "fuzz" || $value === "bazz"; - }); + Validator::addRule("fuzzerRule", function($field, $value) + { + return $field !== "fuzz" || $value === "bazz"; + }); - $v->rule("required", array("foo", "fuzz")); - $v->rule("fuzzerRule", "fuzz"); - $v->rule("fooRule", "foo"); + $v->rule("required", array("foo", "fuzz")); + $v->rule("fuzzerRule", "fuzz"); + $v->rule("fooRule", "foo"); - $this->assertValid($v); - } + $this->assertValid($v); + } - public function testAddInstanceRuleFail() - { - $v = new Validator(array("foo" => "bar")); - $v->addInstanceRule("fooRule", function($field) - { - return $field === "for"; - }); - $v->rule("fooRule", "foo"); - $this->assertFalse($v->validate()); - } + public function testAddInstanceRuleFail() + { + $v = new Validator(array("foo" => "bar")); + $v->addInstanceRule("fooRule", function($field) + { + return $field === "for"; + }); + $v->rule("fooRule", "foo"); + $this->assertFalse($v->validate()); + } - public function testAddAddRuleWithCallback() - { - $v = new Validator(array("foo" => "bar")); - $v->rule(function($field, $value) { - return $field === "foo" && $value === "bar"; - }, "foo"); + public function testAddAddRuleWithCallback() + { + $v = new Validator(array("foo" => "bar")); + $v->rule(function($field, $value) { + return $field === "foo" && $value === "bar"; + }, "foo"); - $this->assertValid($v); - } + $this->assertValid($v); + } - public function testAddAddRuleWithCallbackFail() - { - $v = new Validator(array("foo" => "baz")); - $v->rule(function($field, $value) { - return $field === "foo" && $value === "bar"; - }, "foo"); + public function testAddAddRuleWithCallbackFail() + { + $v = new Validator(array("foo" => "baz")); + $v->rule(function($field, $value) { + return $field === "foo" && $value === "bar"; + }, "foo"); - $this->assertFalse($v->validate()); - } + $this->assertFalse($v->validate()); + } - public function testAddAddRuleWithCallbackFailMessage() - { - $v = new Validator(array("foo" => "baz")); - $v->rule(function($field, $value) { - return $field === "foo" && $value === "bar"; - }, "foo", "test error message"); + public function testAddAddRuleWithCallbackFailMessage() + { + $v = new Validator(array("foo" => "baz")); + $v->rule(function($field, $value) { + return $field === "foo" && $value === "bar"; + }, "foo", "test error message"); - $this->assertFalse($v->validate()); + $this->assertFalse($v->validate()); $errors = $v->errors(); - $this->assertArrayHasKey("foo", $errors); - $this->assertCount(1, $errors["foo"]); - $this->assertEquals("Foo test error message", $errors["foo"][0]); - } + $this->assertArrayHasKey("foo", $errors); + $this->assertCount(1, $errors["foo"]); + $this->assertEquals("Foo test error message", $errors["foo"][0]); + } - public function testUniqueRuleName() - { - $v = new Validator(array()); - $args = array("foo", "bar"); - $this->assertEquals("foo_bar_rule", $v->getUniqueRuleName($args)); - $this->assertEquals("foo_rule", $v->getUniqueRuleName("foo")); + public function testUniqueRuleName() + { + $v = new Validator(array()); + $args = array("foo", "bar"); + $this->assertEquals("foo_bar_rule", $v->getUniqueRuleName($args)); + $this->assertEquals("foo_rule", $v->getUniqueRuleName("foo")); - $v->addInstanceRule("foo_rule", function() {}); - $u = $v->getUniqueRuleName("foo"); - $this->assertRegExp("/^foo_rule_[0-9]{1,5}$/", $u); - } + $v->addInstanceRule("foo_rule", function() {}); + $u = $v->getUniqueRuleName("foo"); + $this->assertRegExp("/^foo_rule_[0-9]{1,5}$/", $u); + } }