add IsCountable validator, to enforce type and count elements.

.travis.yml

@@ -9,7 +9,7 @@ branches:
 
 cache:
   directories:
-    - $HOME/.composer/cache
+    - $HOME/.composer/
 
 env:
   global:
@@ -50,17 +50,17 @@ matrix:
     - php: 7.1
       env:
         - DEPS=latest
-    - php: hhvm
+    - php: nightly
       env:
         - DEPS=lowest
-    - php: hhvm
+    - php: nightly
       env:
         - DEPS=locked
-    - php: hhvm
+    - php: nightly
       env:
         - DEPS=latest
   allow_failures:
-    - php: hhvm
+    - php: nightly
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
@@ -81,7 +81,7 @@ script:
   - if [[ $EXECUTE_HOSTNAME_CHECK == "true" && $TRAVIS_PULL_REQUEST == "false" ]]; then php bin/update_hostname_validator.php --check-only; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer upload-coverage ; fi
 
 notifications:
   email: false

CHANGELOG.md

@@ -2,6 +2,38 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.10.0 - TBD
+
+### Added
+
+- [#175](https://github.com/zendframework/zend-validator/pull/175) adds support
+  for PHP 7.2 (conditionally, as PHP 7.2 is currently in beta1).
+
+### Changed
+
+- [#169](https://github.com/zendframework/zend-validator/pull/169) modifies how
+  the various `File` validators check for readable files. Previously, they used
+  `stream_resolve_include_path`, which led to false negative checks when the
+  files did not exist within an `include_path` (which is often the case within a
+  web application). These now use `is_readable()` instead.
+
+- [#185](https://github.com/zendframework/zend-validator/pull/185) updates the
+  zend-session requirement (during development, and in the suggestions) to 2.8+,
+  to ensure compatibility with the upcoming PHP 7.2 release.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#175](https://github.com/zendframework/zend-validator/pull/175) removes
+  support for HHVM.
+
+### Fixed
+
+- Nothing.
+
 ## 2.9.2 - 2017-07-20
 
 ### Added

bin/update_hostname_validator.php

@@ -177,7 +177,9 @@ function getNewValidTlds($string)
 function getPunycodeDecoder()
 {
     if (function_exists('idn_to_utf8')) {
-        return 'idn_to_utf8';
+        return function ($domain) {
+            return idn_to_utf8($domain, 0, INTL_IDNA_VARIANT_UTS46);
+        };
     }
 
     $hostnameValidator = new Hostname();

composer.json

@@ -26,7 +26,7 @@
         "zendframework/zend-i18n": "^2.6",
         "zendframework/zend-math": "^2.6",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-session": "^2.6.2",
+        "zendframework/zend-session": "^2.8",
         "zendframework/zend-uri": "^2.5",
         "phpunit/PHPUnit": "^6.0.8 || ^5.7.15",
         "zendframework/zend-coding-standard": "~1.0.0"
@@ -38,7 +38,7 @@
         "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator",
         "zendframework/zend-i18n-resources": "Translations of validator messages",
         "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
-        "zendframework/zend-session": "Zend\\Session component, required by the Csrf validator",
+        "zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator",
         "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
     },
     "minimum-stability": "dev",

doc/book/validators/is-countable.md

@@ -0,0 +1,107 @@
+# IsCountable Validator
+
+- **Since 2.10.0**
+
+`Zend\Validator\IsCountable` allows you to validate that a value can be counted
+(i.e., it's an array or implements `Countable`), and, optionally:
+
+- the exact count of the value
+- the minimum count of the value
+- the maximum count of the value
+
+Specifying either of the latter two is inconsistent with the first, and, as
+such, the validator does not allow setting both a count and a minimum or maximum
+value. You may, however specify both minimum and maximum values, in which case
+the validator operates similar to the [Between validator](between.md).
+
+## Supported options
+
+The following options are supported for `Zend\Validator\IsCountable`:
+
+- `count`: Defines if the validation should look for a specific, exact count for
+  the value provided.
+- `max`: Sets the maximum value for the validation; if the count of the value is
+  greater than the maximum, validation fails..
+- `min`: Sets the minimum value for the validation; if the count of the value is
+  lower than the minimum, validation fails.
+
+## Default behaviour
+
+Given no options, the validator simply tests to see that the value may be
+counted (i.e., it's an array or `Countable` instance):
+
+```php
+$validator = new Zend\Validator\IsCountable();
+
+$validator->isValid(10);                    // false; not an array or Countable
+$validator->isValid([10]);                  // true; value is an array
+$validator->isValid(new ArrayObject([10])); // true; value is Countable
+$validator->isValid(new stdClass);          // false; value is not Countable
+```
+
+## Specifying an exact count
+
+You can also specify an exact count; if the value is countable, and its count
+matches, the the value is valid.
+
+```php
+$validator = new Zend\Validator\IsCountable(['count' => 3]);
+
+$validator->isValid([1, 2, 3]);                  // true; countable, and count is 3
+$validator->isValid(new ArrayObject([1, 2, 3])); // true; countable, and count is 3
+$validator->isValid([1]);                        // false; countable, but count is 1
+$validator->isValid(new ArrayObject([1]));       // false; countable, but count is 1
+```
+
+## Specifying a minimum count
+
+You may specify a minimum count. When you do, the value must be countable, and
+greater than or equal to the minimum count you specify in order to be valid.
+
+```php
+$validator = new Zend\Validator\IsCountable(['min' => 2]);
+
+$validator->isValid([1, 2, 3]);                  // true; countable, and count is 3
+$validator->isValid(new ArrayObject([1, 2, 3])); // true; countable, and count is 3
+$validator->isValid([1, 2]);                     // true; countable, and count is 2
+$validator->isValid(new ArrayObject([1, 2]));    // true; countable, and count is 2
+$validator->isValid([1]);                        // false; countable, but count is 1
+$validator->isValid(new ArrayObject([1]));       // false; countable, but count is 1
+```
+
+## Specifying a maximum count
+
+You may specify a maximum count. When you do, the value must be countable, and
+less than or equal to the maximum count you specify in order to be valid.
+
+```php
+$validator = new Zend\Validator\IsCountable(['max' => 2]);
+
+$validator->isValid([1, 2, 3]);                  // false; countable, but count is 3
+$validator->isValid(new ArrayObject([1, 2, 3])); // false; countable, but count is 3
+$validator->isValid([1, 2]);                     // true; countable, and count is 2
+$validator->isValid(new ArrayObject([1, 2]));    // true; countable, and count is 2
+$validator->isValid([1]);                        // true; countable, and count is 1
+$validator->isValid(new ArrayObject([1]));       // true; countable, and count is 1
+```
+
+## Specifying both minimum and maximum
+
+If you specify both a minimum and maximum, the count must be _between_ the two,
+inclusively (i.e., it may be the minimum or maximum, and any value between).
+
+```php
+$validator = new Zend\Validator\IsCountable([
+    'min' => 3,
+    'max' => 5,
+]);
+
+$validator->isValid([1, 2, 3]);                    // true; countable, and count is 3
+$validator->isValid(new ArrayObject([1, 2, 3]));   // true; countable, and count is 3
+$validator->isValid(range(1, 5));                  // true; countable, and count is 5
+$validator->isValid(new ArrayObject(range(1, 5))); // true; countable, and count is 5
+$validator->isValid([1, 2]);                       // false; countable, and count is 2
+$validator->isValid(new ArrayObject([1, 2]));      // false; countable, and count is 2
+$validator->isValid(range(1, 6));                  // false; countable, and count is 6
+$validator->isValid(new ArrayObject(range(1, 6))); // false; countable, and count is 6
+```

mkdocs.yml

@@ -25,6 +25,7 @@ pages:
             - InArray: validators/in-array.md
             - Ip: validators/ip.md
             - Isbn: validators/isbn.md
+            - IsCountable: validators/is-countable.md
             - IsInstanceOf: validators/isinstanceof.md
             - LessThan: validators/less-than.md
             - NotEmpty: validators/not-empty.md

src/EmailAddress.php

@@ -530,7 +530,7 @@ public function isValid($value)
     protected function idnToAscii($email)
     {
         if (extension_loaded('intl')) {
-            return (idn_to_ascii($email) ?: $email);
+            return (idn_to_ascii($email, 0, INTL_IDNA_VARIANT_UTS46) ?: $email);
         }
         return $email;
     }
@@ -553,7 +553,7 @@ protected function idnToUtf8($email)
             // the source string in those cases.
             // But not when the source string is long enough.
             // Thus we default to source string ourselves.
-            return idn_to_utf8($email) ?: $email;
+            return idn_to_utf8($email, 0, INTL_IDNA_VARIANT_UTS46) ?: $email;
         }
         return $email;
     }

src/File/Crc32.php

@@ -56,7 +56,7 @@ public function getCrc32()
      * Sets the crc32 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Crc32 Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function setCrc32($options)
     {
@@ -68,7 +68,7 @@ public function setCrc32($options)
      * Adds the crc32 hash for one or multiple files
      *
      * @param  string|array $options
-     * @return Crc32 Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function addCrc32($options)
     {
@@ -104,12 +104,12 @@ public function isValid($value, $file = null)
         $this->setValue($filename);
 
         // Is file readable ?
-        if (empty($file) || false === stream_resolve_include_path($file)) {
+        if (empty($file) || false === is_readable($file)) {
             $this->error(self::NOT_FOUND);
             return false;
         }
 
-        $hashes = array_unique(array_keys($this->getHash()));
+        $hashes   = array_unique(array_keys($this->getHash()));
         $filehash = hash_file('crc32', $file);
         if ($filehash === false) {
             $this->error(self::NOT_DETECTED);

src/File/ExcludeExtension.php

@@ -59,7 +59,7 @@ public function isValid($value, $file = null)
         $this->setValue($filename);
 
         // Is file readable ?
-        if (empty($file) || false === stream_resolve_include_path($file)) {
+        if (empty($file) || false === is_readable($file)) {
             $this->error(self::NOT_FOUND);
             return false;
         }

src/File/ExcludeMimeType.php

@@ -63,7 +63,7 @@ public function isValid($value, $file = null)
         $this->setValue($filename);
 
         // Is file readable ?
-        if (empty($file) || false === stream_resolve_include_path($file)) {
+        if (empty($file) || false === is_readable($file)) {
             $this->error(self::NOT_READABLE);
             return false;
         }

src/File/Extension.php

@@ -100,7 +100,7 @@ public function getCase()
      * Sets the case to use
      *
      * @param  bool $case
-     * @return Extension Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function setCase($case)
     {
@@ -124,7 +124,7 @@ public function getExtension()
      * Sets the file extensions
      *
      * @param  string|array $extension The extensions to validate
-     * @return Extension Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function setExtension($extension)
     {
@@ -137,7 +137,7 @@ public function setExtension($extension)
      * Adds the file extensions
      *
      * @param  string|array $extension The extensions to add for validation
-     * @return Extension Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function addExtension($extension)
     {
@@ -196,7 +196,7 @@ public function isValid($value, $file = null)
         $this->setValue($filename);
 
         // Is file readable ?
-        if (empty($file) || false === stream_resolve_include_path($file)) {
+        if (empty($file) || false === is_readable($file)) {
             $this->error(self::NOT_FOUND);
             return false;
         }