libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Версия полностью совместимая c CMS

Browse source
This commit is contained in:
origami11 2017-02-17 17:31:17 +03:00
parent 7ce493414e
commit 75bb35d5bf
21 changed files with 1404 additions and 783 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Validator/Rule/Alpha.php
View file

@ -3,7 +3,7 @@
/**
* Проверка на число
*/
class Validator_Rule_Alpha extends Rule_Abstract
class Validator_Rule_Alpha extends Validator_Rule_Abstract
{
public function getErrorMsg()
{

2
src/Validator/Rule/Date.php
View file

@ -3,7 +3,7 @@
/**
* Проверка формата даты
*/
class Validator_Rule_Date extends Rule_Abstract
class Validator_Rule_Date extends Validator_Rule_Abstract
{
private $split = "\\/";

2
src/Validator/Rule/Email.php
View file

@ -3,7 +3,7 @@
/**
* Проверка формата электронной почты
*/
class Validator_Rule_Email extends Rule_Abstract
class Validator_Rule_Email extends Validator_Rule_Abstract
{
public function getErrorMsg()
{

2
src/Validator/Rule/EmailList.php
View file

@ -3,7 +3,7 @@
/**
* Проверка формата электронной почты
*/
class Validator_Rule_EmailList extends Rule_Abstract
class Validator_Rule_EmailList extends Validator_Rule_Abstract
{
public function getErrorMsg()
{

10
src/Validator/Rule/Match.php
View file

@ -3,7 +3,7 @@
/**
* Проверка на равентство двух полей
*/
class Validator_Rule_Match extends Rule_Abstract
class Validator_Rule_Match extends Validator_Rule_Abstract
{
public $same;
@ -12,14 +12,6 @@ class Validator_Rule_Match extends Rule_Abstract
return "Поля не совпадают";
}
/* public function __construct($field, $refField, $errorMsg)
{
$this->field = $field;
$this->refField = $refField;
$this->errorMsg = $errorMsg;
}
*/
public function isValid(Collection $container, $status = null) {
return (strcmp($container->get($this->field), $container->get($this->same)) == 0);
}

2
src/Validator/Rule/Numeric.php
View file

@ -3,7 +3,7 @@
/**
* Проверка на число
*/
class Validator_Rule_Numeric extends Rule_Abstract
class Validator_Rule_Numeric extends Validator_Rule_Abstract
{
public function getErrorMsg()
{

2
src/Validator/Rule/Time.php
View file

@ -3,7 +3,7 @@
/**
* Проверка формата времени
*/
class Validator_Rule_Time extends Rule_Abstract
class Validator_Rule_Time extends Validator_Rule_Abstract
{
private $split = ":";

5
src/Validator/Rule/Unique.php
View file

@ -1,9 +1,8 @@
<?php
/**
* Проверка формата времени
*/
class Validator_Rule_Unique extends Rule_Abstract
class Validator_Rule_Unique extends Validator_Rule_Abstract
{
public function getErrorMsg()
{
@ -12,7 +11,7 @@ class Validator_Rule_Unique extends Rule_Abstract
public function isValid(Collection $container, $status = null)
{
return $this->ctx->isUnique($container->get($this->field), $status);
return $this->ctx->isUnique($container->get($this->field), $status, $container);
}
}

25
src/Validator/Validator.php
View file

@ -32,7 +32,8 @@ class Validator_Validator
'require' => 'Validator_Rule_Notnull',
'numeric' => 'Validator_Rule_Numeric',
'unique' => 'Validator_Rule_Unique',
'count' => 'Validator_Rule_Count',
'filename' => 'Validator_Rule_FileName',
'count' => 'Validator_Rule_Count',
'isfile' => 'Validator_Rule_IsFile',
'code' => 'Validator_Rule_Code'
);
@ -41,8 +42,7 @@ class Validator_Validator
// Формат правила 'rule1|rule2,param1=value1|rule3,param1=value1,param2=value2'
foreach ($input as $value) {
// Список правил
if (!isset($value['validate']) || $value['validate'] == '') continue;
if (! isset($value['validate'])) continue;
$rules = explode("|", $value['validate']);
foreach ($rules as $rule) {
// Список параметров правила
@ -50,17 +50,17 @@ class Validator_Validator
$name = array_shift($rule_param);
if (isset($type[$name])) {
$constructor = $type[$name]; // "Rule_" . ucfirst($name)
$rule = new $constructor($value['name'], false); // Нужны шаблонные сообщения для правил
$constructor = $type[$name];
$ruleObj = new $constructor($value['name'], false); // Нужны шаблонные сообщения для правил
if (isset($value['context'])) {
$rule->setContext($value['context']);
$ruleObj->setContext($value['context']);
}
foreach ($rule_param as $param) {
// Имя и значение параметра
list($name, $value) = explode("=", $param);
$rule->$name = $value;
list($p_name, $p_value) = explode("=", $param);
$ruleObj->$p_name = $p_value;
}
$this->addRule($rule);
$this->addRule($ruleObj);
} else {
throw new Exception('Unknown validation rule "' . $rule . "'");
}
@ -90,14 +90,17 @@ class Validator_Validator
public function validate(Collection $container, $rule = null, $status = null)
{
$fields = array();
if ($rule) {
$this->chain = $rule;
}
$this->errorMsg = array();
foreach ($this->chain as $key => $rule) {
if (!$this->skip($rule, $container) && !$rule->isValid($container, $status)) {
foreach ($this->chain as $rule) {
//echo $key;
if (!in_array($rule->field, $fields) && !$this->skip($rule, $container) && !$rule->isValid($container, $status)) {
$name = $rule->field;
$this->errorMsg[$name] = $rule->getErrorMsg();
$fields [] = $name;
}
}
return $this->isValid();