Merge branch '1.0' into 1.1

This commit is contained in:
Henrique Moody 2017-10-16 10:39:15 +02:00
commit 631affdbf2
No known key found for this signature in database
GPG key ID: 221E9281655813A6
3 changed files with 9 additions and 5 deletions

View file

@ -46,7 +46,7 @@ class CurrencyCode extends AbstractRule
'BSD', // Bahamian Dollar
'BTN', // Ngultrum
'BWP', // Pula
'BYR', // Belarussian Ruble
'BYN', // Belarussian Ruble
'BZD', // Belize Dollar
'CAD', // Canadian Dollar
'CDF', // Congolese Franc

View file

@ -21,7 +21,7 @@ use Respect\Validation\Rules\Key;
/**
* @method static Validator age(int $minAge = null, int $maxAge = null)
* @method static Validator allOf()
* @method static Validator allOf(Validatable ...$rule)
* @method static Validator alnum(string $additionalChars = null)
* @method static Validator alpha(string $additionalChars = null)
* @method static Validator alwaysInvalid()
@ -86,7 +86,7 @@ use Respect\Validation\Rules\Key;
* @method static Validator json()
* @method static Validator key(string $reference, Validatable $referenceValidator = null, bool $mandatory = true)
* @method static Validator keyNested(string $reference, Validatable $referenceValidator = null, bool $mandatory = true)
* @method static Validator keySet(Key $rule...)
* @method static Validator keySet(Key ...$rule)
* @method static Validator keyValue(string $comparedKey, string $ruleName, string $baseKey)
* @method static Validator languageCode(string $set)
* @method static Validator leapDate(string $format)
@ -101,7 +101,7 @@ use Respect\Validation\Rules\Key;
* @method static Validator multiple(int $multipleOf)
* @method static Validator negative()
* @method static Validator no($useLocale = false)
* @method static Validator noneOf()
* @method static Validator noneOf(Validatable ...$rule)
* @method static Validator not(Validatable $rule)
* @method static Validator notBlank()
* @method static Validator notEmpty()
@ -111,7 +111,7 @@ use Respect\Validation\Rules\Key;
* @method static Validator numeric()
* @method static Validator objectType()
* @method static Validator odd()
* @method static Validator oneOf()
* @method static Validator oneOf(Validatable ...$rule)
* @method static Validator optional(Validatable $rule)
* @method static Validator perfectSquare()
* @method static Validator pesel()

View file

@ -26,6 +26,10 @@ class MimetypeTest extends PHPUnit_Framework_TestCase
protected function setUp()
{
if (defined('HHVM_VERSION')) {
return $this->markTestSkipped('If you are a HHVM user, and you are in the mood, please fix it');
}
$this->filename = sprintf('%s/validation.txt', sys_get_temp_dir());
file_put_contents($this->filename, 'File content');