Merge branch '1.0' into 1.1

qiuer · Oct 16, 2017 · 631affd · 631affd
2 parents 5ab87d1 + c013fac
commit 631affd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/library/Rules/CurrencyCode.php b/library/Rules/CurrencyCode.php
@@ -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

diff --git a/library/Validator.php b/library/Validator.php
@@ -21,7 +21,7 @@
 
 /**
  * @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 @@
  * @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 @@
  * @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 @@
  * @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()

diff --git a/tests/unit/Rules/MimetypeTest.php b/tests/unit/Rules/MimetypeTest.php
@@ -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');