mirror of
https://github.com/vlucas/valitron.git
synced 2025-12-31 07:01:54 +00:00
Compare commits
No commits in common. "master" and "v1.4.8" have entirely different histories.
73
.github/workflows/test.yml
vendored
73
.github/workflows/test.yml
vendored
@ -1,73 +0,0 @@
|
|||||||
name: Run Tests
|
|
||||||
|
|
||||||
on: [push, pull_request]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ${{ matrix.operating-system }}
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
operating-system: ['ubuntu-latest']
|
|
||||||
php-versions:
|
|
||||||
- '5.4'
|
|
||||||
- '5.5'
|
|
||||||
- '5.6'
|
|
||||||
- '7.0'
|
|
||||||
- '7.1'
|
|
||||||
- '7.2'
|
|
||||||
- '7.3'
|
|
||||||
- '7.4'
|
|
||||||
- '8.0'
|
|
||||||
# - '8.1'
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
- name: Setup PHP
|
|
||||||
uses: shivammathur/setup-php@v2
|
|
||||||
with:
|
|
||||||
php-version: ${{ matrix.php-versions }}
|
|
||||||
- name: Cache composer packages
|
|
||||||
id: composer-cache
|
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: vendor
|
|
||||||
key: ${{ runner.os }}-php-${{ matrix.php-versions }}-${{ hashFiles('**/composer.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-php-${{ matrix.php-versions }}-
|
|
||||||
- name: Validate composer configuration
|
|
||||||
run: |
|
|
||||||
composer validate
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
composer install --no-progress
|
|
||||||
- name: Run tests
|
|
||||||
run: |
|
|
||||||
composer run-script test
|
|
||||||
|
|
||||||
# test-hhvm:
|
|
||||||
# runs-on: ubuntu-latest
|
|
||||||
# steps:
|
|
||||||
# - name: Checkout
|
|
||||||
# uses: actions/checkout@v2
|
|
||||||
# - name: Setup HHVM
|
|
||||||
# uses: azjezz/setup-hhvm@v1
|
|
||||||
# with:
|
|
||||||
# version: latest
|
|
||||||
# debug: false
|
|
||||||
# - name: Cache composer packages
|
|
||||||
# id: composer-cache
|
|
||||||
# uses: actions/cache@v2
|
|
||||||
# with:
|
|
||||||
# path: vendor
|
|
||||||
# key: ${{ runner.os }}-hhvm-${{ hashFiles('**/composer.lock') }}
|
|
||||||
# restore-keys: |
|
|
||||||
# ${{ runner.os }}-hhvm-
|
|
||||||
# - name: Validate composer configuration
|
|
||||||
# run: |
|
|
||||||
# composer validate
|
|
||||||
# - name: Install dependencies
|
|
||||||
# run: |
|
|
||||||
# composer install --no-progress
|
|
||||||
# - name: Run tests
|
|
||||||
# run: |
|
|
||||||
# composer run-script test
|
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,4 +3,3 @@ composer.phar
|
|||||||
composer.lock
|
composer.lock
|
||||||
vendor
|
vendor
|
||||||
.idea/
|
.idea/
|
||||||
.phpunit.result.cache
|
|
||||||
32
.travis.yml
Normal file
32
.travis.yml
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
#see https://travis-ci.community/t/php-5-4-and-5-5-archives-missing/3723
|
||||||
|
dist: trusty
|
||||||
|
|
||||||
|
# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
|
||||||
|
language: php
|
||||||
|
|
||||||
|
# list any PHP version you want to test against
|
||||||
|
php:
|
||||||
|
- 5.4
|
||||||
|
- 5.5
|
||||||
|
- 5.6
|
||||||
|
- 7.0
|
||||||
|
- 7.1
|
||||||
|
- 7.2
|
||||||
|
- 7.3
|
||||||
|
- 7.4
|
||||||
|
- nightly
|
||||||
|
- hhvm
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
allow_failures:
|
||||||
|
- php: hhvm
|
||||||
|
- php: nightly
|
||||||
|
include:
|
||||||
|
- php: 5.3
|
||||||
|
dist: precise
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- composer install
|
||||||
|
|
||||||
|
# Script to run tests
|
||||||
|
script: composer test
|
||||||
29
README.md
29
README.md
@ -6,7 +6,7 @@ methods with a focus on readable and concise syntax. Valitron is the
|
|||||||
simple and pragmatic validation library you've been looking for.
|
simple and pragmatic validation library you've been looking for.
|
||||||
|
|
||||||
[](https://github.com/vlucas/valitron/actions/workflows/test.yml)
|
Status](https://travis-ci.org/vlucas/valitron.png?branch=master)](https://travis-ci.org/vlucas/valitron)
|
||||||
[](https://packagist.org/packages/vlucas/valitron)
|
[](https://packagist.org/packages/vlucas/valitron)
|
||||||
[](https://packagist.org/packages/vlucas/valitron)
|
[](https://packagist.org/packages/vlucas/valitron)
|
||||||
|
|
||||||
@ -127,33 +127,6 @@ V::lang('ar');
|
|||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Disabling the {field} name in the output of the error message.
|
|
||||||
|
|
||||||
```php
|
|
||||||
use Valitron\Validator as V;
|
|
||||||
|
|
||||||
$v = new Valitron\Validator(['name' => 'John']);
|
|
||||||
$v->rule('required', ['name']);
|
|
||||||
|
|
||||||
// Disable prepending the labels
|
|
||||||
$v->setPrependLabels(false);
|
|
||||||
|
|
||||||
// Error output for the "false" condition
|
|
||||||
[
|
|
||||||
["name"] => [
|
|
||||||
"is required"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
|
|
||||||
// Error output for the default (true) condition
|
|
||||||
[
|
|
||||||
["name"] => [
|
|
||||||
"name is required"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
You can conditionally require values using required conditional rules. In this example, for authentication, we're requiring either a token when both the email and password are not present, or a password when the email address is present.
|
You can conditionally require values using required conditional rules. In this example, for authentication, we're requiring either a token when both the email and password are not present, or a password when the email address is present.
|
||||||
```php
|
```php
|
||||||
// this rule set would work for either data set...
|
// this rule set would work for either data set...
|
||||||
|
|||||||
@ -3,20 +3,20 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"description": "Simple, elegant, stand-alone validation library with NO dependencies",
|
"description": "Simple, elegant, stand-alone validation library with NO dependencies",
|
||||||
"keywords": ["validation", "validator", "valid"],
|
"keywords": ["validation", "validator", "valid"],
|
||||||
"homepage": "https://github.com/vlucas/valitron",
|
"homepage": "http://github.com/vlucas/valitron",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
"name": "Vance Lucas",
|
"name": "Vance Lucas",
|
||||||
"email": "vance@vancelucas.com",
|
"email": "vance@vancelucas.com",
|
||||||
"homepage": "https://www.vancelucas.com"
|
"homepage": "http://www.vancelucas.com"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.2"
|
"php": ">=5.3.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": ">=4.8.35"
|
"phpunit/phpunit": "^4.8.35 || ^5.5 || ^6.5"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-mbstring": "It can support the multiple bytes string length."
|
"ext-mbstring": "It can support the multiple bytes string length."
|
||||||
|
|||||||
42
lang/fa.php
42
lang/fa.php
@ -1,42 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return array(
|
|
||||||
'required' => "الزامی است",
|
|
||||||
'equals' => " باید برابر باشد با '%s'",
|
|
||||||
'different' => "باید متفاوت باشد از '%s'",
|
|
||||||
'accepted' => "باید پذیرفته شده باشد",
|
|
||||||
'numeric' => "باید مقدار عددی باشد",
|
|
||||||
'integer' => "باید عددی طبیعی باشد",
|
|
||||||
'length' => "طول باید %d باشد",
|
|
||||||
'min' => "حداقل باید %s کاراکتر باشد",
|
|
||||||
'max' => "نباید بیشتر از %s کارکتر باشد",
|
|
||||||
'listContains' => "حاوی مقدار نامعتبر",
|
|
||||||
'in' => "حاوی مقدار نامعتبر",
|
|
||||||
'notIn' => "حاوی مقدار نامعتبر",
|
|
||||||
'ip' => " آدرس معتبر نیست IP",
|
|
||||||
'ipv4' => "آدرس معتبر نیست IPv4",
|
|
||||||
'ipv6' => "آدرس معتبر نیست IPv6",
|
|
||||||
'email' => "آدرس ایمیل معتبر نیست",
|
|
||||||
'url' => "معتبر نیست URL",
|
|
||||||
'urlActive' => "دامنه باید فعال باشد",
|
|
||||||
'alpha' => "باید حاوی حروف a-z باشد",
|
|
||||||
'alphaNum' => "باید حاوی حروف a-z و/یا اعداد 0-9 باشد",
|
|
||||||
'slug' => "باید حاوی حروف a-z, اعداد 0-9, دش و آندراسکور باشد",
|
|
||||||
'regex' => "حاوی کارکترهای نامعتبر",
|
|
||||||
'date' => "تاریخ معتبر نیست",
|
|
||||||
'dateFormat' => "فرمت تاریخ باید به این شکل '%s' باشد",
|
|
||||||
'dateBefore' => "تاریخ باید قبل از '%s' باشد",
|
|
||||||
'dateAfter' => "تاریخ باید بعد از '%s' باشد",
|
|
||||||
'contains' => "باید حاوی %s باشد",
|
|
||||||
'boolean' => "مقدار باید بولین باشد",
|
|
||||||
'lengthBetween' => "طول باید بین %d و %d کاراکتر باشد",
|
|
||||||
'creditCard' => "شماره کارت اعتباری معتبر نیست",
|
|
||||||
'lengthMin' => "طول باید حداقل %d کاراکتر باشد",
|
|
||||||
'lengthMax' => "طول نباید بیشتر از %d کاراکتر باشد",
|
|
||||||
'instanceOf' => "باید آبجکتی از نوع '%s' باشد",
|
|
||||||
'containsUnique' => "باید حاوی المان ها یونیک باشد",
|
|
||||||
'requiredWith' => "الزامی است",
|
|
||||||
'requiredWithout'=> "الزامی است",
|
|
||||||
'subset' => "حاوی آیتمی است که در لیست موجود نیست",
|
|
||||||
'arrayHasKeys' => "همه کلیدهای الزامی را ندارد",
|
|
||||||
);
|
|
||||||
@ -14,8 +14,6 @@ return array(
|
|||||||
'in' => "には選択できない値が含まれています",
|
'in' => "には選択できない値が含まれています",
|
||||||
'notIn' => "には選択できない値が含まれています",
|
'notIn' => "には選択できない値が含まれています",
|
||||||
'ip' => "はIPアドレスの書式として正しくありません",
|
'ip' => "はIPアドレスの書式として正しくありません",
|
||||||
'ipv4' => "はIPv4のIPアドレスの書式として正しくありません",
|
|
||||||
'ipv6' => "はIPv6のIPアドレスの書式として正しくありません",
|
|
||||||
'email' => "はメールアドレスの書式として正しくありません",
|
'email' => "はメールアドレスの書式として正しくありません",
|
||||||
'url' => "はURLの書式として正しくありません",
|
'url' => "はURLの書式として正しくありません",
|
||||||
'urlActive' => "はアクティブなドメインではありません",
|
'urlActive' => "はアクティブなドメインではありません",
|
||||||
@ -34,9 +32,4 @@ return array(
|
|||||||
'lengthMin' => "は%d文字以上入力してください",
|
'lengthMin' => "は%d文字以上入力してください",
|
||||||
'lengthMax' => "は%d文字以内で入力してください",
|
'lengthMax' => "は%d文字以内で入力してください",
|
||||||
'instanceOf' => "は「%s」のインスタンスではありません",
|
'instanceOf' => "は「%s」のインスタンスではありません",
|
||||||
'containsUnique' => "は重複のないように入力してください",
|
|
||||||
'requiredWith' => "を入力してください",
|
|
||||||
'requiredWithout' => "を入力してください",
|
|
||||||
'subset' => "には選択できない値が含まれています",
|
|
||||||
'arrayHasKeys' => "の必要な項目が選択されていません",
|
|
||||||
);
|
);
|
||||||
|
|||||||
20
lang/sv.php
20
lang/sv.php
@ -13,23 +13,23 @@ return array(
|
|||||||
'listContains' => "innehåller ogiltigt värde",
|
'listContains' => "innehåller ogiltigt värde",
|
||||||
'in' => "innehåller ogiltigt värde",
|
'in' => "innehåller ogiltigt värde",
|
||||||
'notIn' => "innehåller ogiltigt värde",
|
'notIn' => "innehåller ogiltigt värde",
|
||||||
'ip' => "är inte en giltig IP-adress",
|
'ip' => "är inte en giltlig IP-adress",
|
||||||
'email' => "är inte en giltig e-postadress",
|
'email' => "är inte en giltlig e-postadress",
|
||||||
'url' => "är inte en giltig URL",
|
'url' => "är inte en giltlig URL",
|
||||||
'urlActive' => "måste vara ett aktivt domännamn",
|
'urlActive' => "måste vara ett aktivt domännamn",
|
||||||
'alpha' => "får bara innehålla bokstäver a-z",
|
'alpha' => "får bara inehålla bokstäver a-z",
|
||||||
'alphaNum' => "får bara innehålla bokstäver a-z och/eller siffror 0-9",
|
'alphaNum' => "får bara inehålla bokstäver a-z och/eller siffror 0-9",
|
||||||
'slug' => "får bara innehålla bokstäver a-z och/eller siffror 0-9, bindesstreck och understreck",
|
'slug' => "får bara inehålla bokstäver a-z och/eller siffror 0-9, bindesträck og understräck",
|
||||||
'regex' => "innehåller ogiltiga tecken",
|
'regex' => "inehåller ogiltliga tecken",
|
||||||
'date' => "är inte ett giltigt datum",
|
'date' => "är inte ett giltligt datum",
|
||||||
'dateFormat' => "måste vara ett datum med formatet '%s'",
|
'dateFormat' => "måste vara ett datum med formatet '%s'",
|
||||||
'dateBefore' => "måste vara ett datum före '%s'",
|
'dateBefore' => "måste vara ett datum före '%s'",
|
||||||
'dateAfter' => "måste vara ett datum efter '%s'",
|
'dateAfter' => "måste vara ett datum efter '%s'",
|
||||||
'contains' => "måste innehålla %s",
|
'contains' => "måste innehålla %s",
|
||||||
'boolean' => "måste vara ett booleskt värde",
|
'boolean' => "måste vara ett booleskt värde",
|
||||||
'lengthBetween' => "måste vara mellan %d och %d tecken långt",
|
'lengthBetween' => "måste vara mellan %d och %d tecken långt",
|
||||||
'creditCard' => "måste vara ett giltigt kreditkortsnummer",
|
'creditCard' => "måste vara et gyldig kredittkortnummer",
|
||||||
'lengthMin' => "måste vara minst %d tecken långt",
|
'lengthMin' => "måste vara minst %d tecken långt",
|
||||||
'lengthMax' => "får inte överstiga %d tecken",
|
'lengthMax' => "får itne överstiga %d tecken",
|
||||||
'instanceOf' => "måste vara en instans av '%s'"
|
'instanceOf' => "måste vara en instans av '%s'"
|
||||||
);
|
);
|
||||||
|
|||||||
@ -29,7 +29,7 @@ return array(
|
|||||||
'boolean' => "boolean olmalı",
|
'boolean' => "boolean olmalı",
|
||||||
'lengthBetween' => "%d ve %d karakter arasında olmalı",
|
'lengthBetween' => "%d ve %d karakter arasında olmalı",
|
||||||
'creditCard' => "geçerli bir kredi kartı numarası olmalı",
|
'creditCard' => "geçerli bir kredi kartı numarası olmalı",
|
||||||
"lengthMin" => "%d karakterden fazla içermeli",
|
"lengthMin" => "%d katakterden fazla içermeli",
|
||||||
"lengthMax" => "%d karakterden az içermeli",
|
"lengthMax" => "%d karakterden az içermeli",
|
||||||
"instanceOf" => "bunun bir örneği olmalı '%s'"
|
"instanceOf" => "bunun bir örneği olmalı '%s'"
|
||||||
);
|
);
|
||||||
|
|||||||
@ -7,7 +7,7 @@ return array(
|
|||||||
'accepted' => "必须接受",
|
'accepted' => "必须接受",
|
||||||
'numeric' => "只能是数字",
|
'numeric' => "只能是数字",
|
||||||
'integer' => "只能是整数",
|
'integer' => "只能是整数",
|
||||||
'length' => "长度必须等于 %d",
|
'length' => "长度必须大于 %d",
|
||||||
'min' => "必须大于 %s",
|
'min' => "必须大于 %s",
|
||||||
'max' => "必须小于 %s",
|
'max' => "必须小于 %s",
|
||||||
'listContains' => "无效的值",
|
'listContains' => "无效的值",
|
||||||
@ -30,11 +30,5 @@ return array(
|
|||||||
'lengthBetween' => "长度只能介于 %d 和 %d 之间",
|
'lengthBetween' => "长度只能介于 %d 和 %d 之间",
|
||||||
'creditCard' => "信用卡号码不正确",
|
'creditCard' => "信用卡号码不正确",
|
||||||
'lengthMin' => "长度必须大于 %d",
|
'lengthMin' => "长度必须大于 %d",
|
||||||
'lengthMax' => "长度必须小于 %d",
|
'lengthMax' => "长度必须小于 %d"
|
||||||
'instanceOf' => "必须是 '%s' 的实例",
|
|
||||||
'containsUnique' => "必须仅包含唯一的元素",
|
|
||||||
'requiredWith' => "是必须的",
|
|
||||||
'requiredWithout' => "是必须的",
|
|
||||||
'subset' => "包含不在列表中的项目",
|
|
||||||
'arrayHasKeys' => "不包含所有必需的键",
|
|
||||||
);
|
);
|
||||||
|
|||||||
@ -25,16 +25,5 @@ return array(
|
|||||||
'dateFormat' => "日期的格式應該為 '%s'",
|
'dateFormat' => "日期的格式應該為 '%s'",
|
||||||
'dateBefore' => "日期必須在 '%s' 之前",
|
'dateBefore' => "日期必須在 '%s' 之前",
|
||||||
'dateAfter' => "日期必須在 '%s' 之後",
|
'dateAfter' => "日期必須在 '%s' 之後",
|
||||||
'contains' => "必須包含 %s",
|
'contains' => "必須包含 %s"
|
||||||
'boolean' => "必須是真或假",
|
|
||||||
'lengthBetween' => "長度只能介於 %d 和 %d 之間",
|
|
||||||
'creditCard' => "信用卡號碼不正確",
|
|
||||||
'lengthMin' => "長度必須大於 %d",
|
|
||||||
'lengthMax' => "長度必須小於 %d",
|
|
||||||
'instanceOf' => "必須是 '%s' 的實例",
|
|
||||||
'containsUnique' => "必須僅包含唯一的元素",
|
|
||||||
'requiredWith' => "是必須的",
|
|
||||||
'requiredWithout' => "是必須的",
|
|
||||||
'subset' => "包含不在列表中的項目",
|
|
||||||
'arrayHasKeys' => "不包含所有必需的鍵",
|
|
||||||
);
|
);
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
convertWarningsToExceptions="true"
|
convertWarningsToExceptions="true"
|
||||||
processIsolation="false"
|
processIsolation="false"
|
||||||
stopOnFailure="false"
|
stopOnFailure="false"
|
||||||
|
syntaxCheck="false"
|
||||||
bootstrap="tests/bootstrap.php"
|
bootstrap="tests/bootstrap.php"
|
||||||
>
|
>
|
||||||
<testsuites>
|
<testsuites>
|
||||||
@ -14,4 +15,12 @@
|
|||||||
<directory suffix="Test.php">tests/Valitron</directory>
|
<directory suffix="Test.php">tests/Valitron</directory>
|
||||||
</testsuite>
|
</testsuite>
|
||||||
</testsuites>
|
</testsuites>
|
||||||
|
<filter>
|
||||||
|
<whitelist>
|
||||||
|
<directory suffix=".php">src/</directory>
|
||||||
|
</whitelist>
|
||||||
|
<blacklist>
|
||||||
|
<directory suffix=".php">vendor/</directory>
|
||||||
|
</blacklist>
|
||||||
|
</filter>
|
||||||
</phpunit>
|
</phpunit>
|
||||||
|
|||||||
@ -83,11 +83,6 @@ class Validator
|
|||||||
*/
|
*/
|
||||||
protected $stop_on_first_fail = false;
|
protected $stop_on_first_fail = false;
|
||||||
|
|
||||||
/**
|
|
||||||
* @var bool
|
|
||||||
*/
|
|
||||||
protected $prepend_labels = true;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Setup validation
|
* Setup validation
|
||||||
*
|
*
|
||||||
@ -149,14 +144,6 @@ class Validator
|
|||||||
return static::$_langDir ?: dirname(dirname(__DIR__)) . '/lang';
|
return static::$_langDir ?: dirname(dirname(__DIR__)) . '/lang';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param bool $prepend_labels
|
|
||||||
*/
|
|
||||||
public function setPrependLabels($prepend_labels = true)
|
|
||||||
{
|
|
||||||
$this->prepend_labels = $prepend_labels;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Required field validator
|
* Required field validator
|
||||||
*
|
*
|
||||||
@ -172,7 +159,9 @@ class Validator
|
|||||||
return $find[1];
|
return $find[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_null($value) || (is_string($value) && trim($value) === '')) {
|
if (is_null($value)) {
|
||||||
|
return false;
|
||||||
|
} elseif (is_string($value) && trim($value) === '') {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -420,12 +409,8 @@ class Validator
|
|||||||
*/
|
*/
|
||||||
protected function validateIn($field, $value, $params)
|
protected function validateIn($field, $value, $params)
|
||||||
{
|
{
|
||||||
$forceAsAssociative = false;
|
$isAssoc = array_values($params[0]) !== $params[0];
|
||||||
if (isset($params[2])) {
|
if ($isAssoc) {
|
||||||
$forceAsAssociative = (bool) $params[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($forceAsAssociative || $this->isAssociativeArray($params[0])) {
|
|
||||||
$params[0] = array_keys($params[0]);
|
$params[0] = array_keys($params[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -447,12 +432,8 @@ class Validator
|
|||||||
*/
|
*/
|
||||||
protected function validateListContains($field, $value, $params)
|
protected function validateListContains($field, $value, $params)
|
||||||
{
|
{
|
||||||
$forceAsAssociative = false;
|
$isAssoc = array_values($value) !== $value;
|
||||||
if (isset($params[2])) {
|
if ($isAssoc) {
|
||||||
$forceAsAssociative = (bool) $params[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($forceAsAssociative || $this->isAssociativeArray($value)) {
|
|
||||||
$value = array_keys($value);
|
$value = array_keys($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -630,17 +611,12 @@ class Validator
|
|||||||
*/
|
*/
|
||||||
protected function validateEmailDNS($field, $value)
|
protected function validateEmailDNS($field, $value)
|
||||||
{
|
{
|
||||||
if (!is_string($value)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->validateEmail($field, $value)) {
|
if ($this->validateEmail($field, $value)) {
|
||||||
$domain = ltrim(stristr($value, '@'), '@') . '.';
|
$domain = ltrim(stristr($value, '@'), '@') . '.';
|
||||||
if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46')) {
|
if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46')) {
|
||||||
$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
|
$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
|
||||||
}
|
}
|
||||||
|
return checkdnsrr($domain, 'ANY');
|
||||||
return checkdnsrr($domain, 'MX');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@ -655,10 +631,6 @@ class Validator
|
|||||||
*/
|
*/
|
||||||
protected function validateUrl($field, $value)
|
protected function validateUrl($field, $value)
|
||||||
{
|
{
|
||||||
if (!is_string($value)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($this->validUrlPrefixes as $prefix) {
|
foreach ($this->validUrlPrefixes as $prefix) {
|
||||||
if (strpos($value, $prefix) !== false) {
|
if (strpos($value, $prefix) !== false) {
|
||||||
return filter_var($value, \FILTER_VALIDATE_URL) !== false;
|
return filter_var($value, \FILTER_VALIDATE_URL) !== false;
|
||||||
@ -677,10 +649,6 @@ class Validator
|
|||||||
*/
|
*/
|
||||||
protected function validateUrlActive($field, $value)
|
protected function validateUrlActive($field, $value)
|
||||||
{
|
{
|
||||||
if (!is_string($value)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($this->validUrlPrefixes as $prefix) {
|
foreach ($this->validUrlPrefixes as $prefix) {
|
||||||
if (strpos($value, $prefix) !== false) {
|
if (strpos($value, $prefix) !== false) {
|
||||||
$host = parse_url(strtolower($value), PHP_URL_HOST);
|
$host = parse_url(strtolower($value), PHP_URL_HOST);
|
||||||
@ -909,11 +877,13 @@ class Validator
|
|||||||
} elseif (isset($cards)) {
|
} elseif (isset($cards)) {
|
||||||
// if we have cards, check our users card against only the ones we have
|
// if we have cards, check our users card against only the ones we have
|
||||||
foreach ($cards as $card) {
|
foreach ($cards as $card) {
|
||||||
if (in_array($card, array_keys($cardRegex)) && preg_match($cardRegex[$card], $value) === 1) {
|
if (in_array($card, array_keys($cardRegex))) {
|
||||||
// if the card is valid, we want to stop looping
|
// if the card is valid, we want to stop looping
|
||||||
|
if (preg_match($cardRegex[$card], $value) === 1) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// loop through every card
|
// loop through every card
|
||||||
foreach ($cardRegex as $regex) {
|
foreach ($cardRegex as $regex) {
|
||||||
@ -971,8 +941,8 @@ class Validator
|
|||||||
$emptyFields = 0;
|
$emptyFields = 0;
|
||||||
foreach ($reqParams as $requiredField) {
|
foreach ($reqParams as $requiredField) {
|
||||||
// check the field is set, not null, and not the empty string
|
// check the field is set, not null, and not the empty string
|
||||||
list($requiredFieldValue, $multiple) = $this->getPart($fields, explode('.', $requiredField));
|
if (isset($fields[$requiredField]) && !is_null($fields[$requiredField])
|
||||||
if (isset($requiredFieldValue) && (!is_string($requiredFieldValue) || trim($requiredFieldValue) !== '')) {
|
&& (is_string($fields[$requiredField]) ? trim($fields[$requiredField]) !== '' : true)) {
|
||||||
if (!$allRequired) {
|
if (!$allRequired) {
|
||||||
$conditionallyReq = true;
|
$conditionallyReq = true;
|
||||||
break;
|
break;
|
||||||
@ -1015,8 +985,8 @@ class Validator
|
|||||||
$filledFields = 0;
|
$filledFields = 0;
|
||||||
foreach ($reqParams as $requiredField) {
|
foreach ($reqParams as $requiredField) {
|
||||||
// check the field is NOT set, null, or the empty string, in which case we are requiring this value be present
|
// check the field is NOT set, null, or the empty string, in which case we are requiring this value be present
|
||||||
list($requiredFieldValue, $multiple) = $this->getPart($fields, explode('.', $requiredField));
|
if (!isset($fields[$requiredField]) || (is_null($fields[$requiredField])
|
||||||
if (!isset($requiredFieldValue) || (is_string($requiredFieldValue) && trim($requiredFieldValue) === '')) {
|
|| (is_string($fields[$requiredField]) && trim($fields[$requiredField]) === ''))) {
|
||||||
if (!$allEmpty) {
|
if (!$allEmpty) {
|
||||||
$conditionallyReq = true;
|
$conditionallyReq = true;
|
||||||
break;
|
break;
|
||||||
@ -1119,9 +1089,11 @@ class Validator
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Use custom label instead of field name if set
|
// Use custom label instead of field name if set
|
||||||
if (is_string($params[0]) && isset($this->_labels[$param])) {
|
if (is_string($params[0])) {
|
||||||
|
if (isset($this->_labels[$param])) {
|
||||||
$param = $this->_labels[$param];
|
$param = $this->_labels[$param];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$values[] = $param;
|
$values[] = $param;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1306,10 +1278,12 @@ class Validator
|
|||||||
protected function hasRule($name, $field)
|
protected function hasRule($name, $field)
|
||||||
{
|
{
|
||||||
foreach ($this->_validations as $validation) {
|
foreach ($this->_validations as $validation) {
|
||||||
if ($validation['rule'] == $name && in_array($field, $validation['fields'])) {
|
if ($validation['rule'] == $name) {
|
||||||
|
if (in_array($field, $validation['fields'])) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -1497,9 +1471,7 @@ class Validator
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$message = $this->prepend_labels
|
$message = str_replace('{field}', ucwords(str_replace('_', ' ', $field)), $message);
|
||||||
? str_replace('{field}', ucwords(str_replace('_', ' ', $field)), $message)
|
|
||||||
: str_replace('{field} ', '', $message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $message;
|
return $message;
|
||||||
@ -1586,9 +1558,4 @@ class Validator
|
|||||||
$me->mapFieldRules($field, $rules[$field]);
|
$me->mapFieldRules($field, $rules[$field]);
|
||||||
}, array_keys($rules));
|
}, array_keys($rules));
|
||||||
}
|
}
|
||||||
|
|
||||||
private function isAssociativeArray($input){
|
|
||||||
//array contains at least one key that's not an can not be cast to an integer
|
|
||||||
return count(array_filter(array_keys($input), 'is_string')) > 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,8 +4,10 @@ use PHPUnit\Framework\TestCase;
|
|||||||
|
|
||||||
class BaseTestCase extends TestCase
|
class BaseTestCase extends TestCase
|
||||||
{
|
{
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
public function tearDown()
|
public function tearDown()
|
||||||
{
|
{
|
||||||
$this->resetProperty('_lang');
|
$this->resetProperty('_lang');
|
||||||
@ -21,5 +23,4 @@ class BaseTestCase extends TestCase
|
|||||||
$prop->setValue($value);
|
$prop->setValue($value);
|
||||||
$prop->setAccessible(false);
|
$prop->setAccessible(false);
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,19 +12,6 @@ class ErrorMessagesTest extends BaseTestCase
|
|||||||
$this->assertSame(array("Name is required"), $v->errors('name'));
|
$this->assertSame(array("Name is required"), $v->errors('name'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Test the disabling of prepending the field labels
|
|
||||||
* to error messages.
|
|
||||||
*/
|
|
||||||
public function testErrorMessageExcludeFieldName()
|
|
||||||
{
|
|
||||||
$v = new Validator(array());
|
|
||||||
$v->setPrependLabels(false);
|
|
||||||
$v->rule('required', 'name');
|
|
||||||
$v->validate();
|
|
||||||
$this->assertSame(array("is required"), $v->errors('name'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testAccurateErrorMessageParams()
|
public function testAccurateErrorMessageParams()
|
||||||
{
|
{
|
||||||
$v = new Validator(array('num' => 5));
|
$v = new Validator(array('num' => 5));
|
||||||
|
|||||||
@ -15,8 +15,8 @@ class LangTest extends BaseTestCase
|
|||||||
{
|
{
|
||||||
$lang = 'ar';
|
$lang = 'ar';
|
||||||
Validator::lang($lang);
|
Validator::lang($lang);
|
||||||
|
$validator = new Validator(array());
|
||||||
$this->assertEquals($lang, Validator::lang());
|
$this->assertEquals($lang, Validator::lang());
|
||||||
Validator::lang('en');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -42,15 +42,13 @@ class LangTest extends BaseTestCase
|
|||||||
$this->assertEquals(realpath($this->getLangDir()), realpath(Validator::langDir()));
|
$this->assertEquals(realpath($this->getLangDir()), realpath(Validator::langDir()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage Fail to load language file '/this/dir/does/not/exists/en.php'
|
||||||
|
*/
|
||||||
public function testLangException()
|
public function testLangException()
|
||||||
{
|
{
|
||||||
try{
|
|
||||||
new Validator(array(), array(), 'en', '/this/dir/does/not/exists');
|
new Validator(array(), array(), 'en', '/this/dir/does/not/exists');
|
||||||
} catch (Exception $exception){
|
|
||||||
$this->assertInstanceOf("InvalidArgumentException", $exception);
|
|
||||||
$this->assertEquals("Fail to load language file '/this/dir/does/not/exists/en.php'", $exception->getMessage());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,6 @@ class StaticVsInstanceTest extends BaseTestCase
|
|||||||
$this->assertEquals(
|
$this->assertEquals(
|
||||||
'ar', Validator::lang(), 'instance defined lang should not replace static global lang'
|
'ar', Validator::lang(), 'instance defined lang should not replace static global lang'
|
||||||
);
|
);
|
||||||
Validator::lang('en');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -980,7 +980,6 @@ class ValidateTest extends BaseTestCase
|
|||||||
array('color', array('blue', 'green', 'red', 'yellow'))
|
array('color', array('blue', 'green', 'red', 'yellow'))
|
||||||
)
|
)
|
||||||
));
|
));
|
||||||
$this->assertFalse($v->validate());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testAsciiValid()
|
public function testAsciiValid()
|
||||||
@ -2920,46 +2919,6 @@ class ValidateTest extends BaseTestCase
|
|||||||
$v->rule('optional', 'address');
|
$v->rule('optional', 'address');
|
||||||
$this->assertTrue($v->validate());
|
$this->assertTrue($v->validate());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @see https://github.com/vlucas/valitron/issues/332
|
|
||||||
*/
|
|
||||||
public function testInRuleSearchesValuesForNumericArray(){
|
|
||||||
|
|
||||||
$v = new Valitron\Validator(array('color' => 'purple'));
|
|
||||||
|
|
||||||
$v->rules(array(
|
|
||||||
'in' => array(
|
|
||||||
array('color', array(3=>'green', 2=>'purple'))
|
|
||||||
)
|
|
||||||
));
|
|
||||||
|
|
||||||
$this->assertTrue($v->validate());
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testInRuleSearchesKeysForAssociativeArray(){
|
|
||||||
$v = new Valitron\Validator(array('color' => 'c-2'));
|
|
||||||
|
|
||||||
$v->rules(array(
|
|
||||||
'in' => array(
|
|
||||||
array('color', array('c-3'=>'green', 'c-2'=>'purple'))
|
|
||||||
)
|
|
||||||
));
|
|
||||||
|
|
||||||
$this->assertTrue($v->validate());
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testInRuleSearchesKeysWhenForcedTo(){
|
|
||||||
$v = new Valitron\Validator(array('color' => 2));
|
|
||||||
|
|
||||||
$v->rules(array(
|
|
||||||
'in' => array(
|
|
||||||
array('color', array('3'=>'green', '2'=>'purple'), null, true)
|
|
||||||
)
|
|
||||||
));
|
|
||||||
$this->assertTrue($v->validate());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function sampleFunctionCallback($field, $value, array $params)
|
function sampleFunctionCallback($field, $value, array $params)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user