cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Laravel version update

Browse Source 
Laravel version update
This commit is contained in:
Manish Verma
2018-08-06 18:48:58 +05:30
parent d143048413
commit 126fbb0255
13678 changed files with 1031482 additions and 778530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
vendor/zendframework/zend-validator/src/EmailAddress.php vendored
View File

@@ -9,6 +9,8 @@
namespace Zend\Validator;
use UConverter;
class EmailAddress extends AbstractValidator
{
const INVALID = 'emailAddressInvalid';
@@ -89,14 +91,14 @@ class EmailAddress extends AbstractValidator
*/
public function __construct($options = [])
{
if (!is_array($options)) {
if (! is_array($options)) {
$options = func_get_args();
$temp['allow'] = array_shift($options);
if (!empty($options)) {
if (! empty($options)) {
$temp['useMxCheck'] = array_shift($options);
}
if (!empty($options)) {
if (! empty($options)) {
$temp['hostnameValidator'] = array_shift($options);
}
@@ -122,7 +124,7 @@ class EmailAddress extends AbstractValidator
return $this;
}
if (!isset($this->messageTemplates[$messageKey])) {
if (! isset($this->messageTemplates[$messageKey])) {
$this->getHostnameValidator()->setMessage($messageString, $messageKey);
} else {
parent::setMessage($messageString, $messageKey);
@@ -140,7 +142,7 @@ class EmailAddress extends AbstractValidator
*/
public function getHostnameValidator()
{
if (!isset($this->options['hostnameValidator'])) {
if (! isset($this->options['hostnameValidator'])) {
$this->options['hostnameValidator'] = new Hostname($this->getAllow());
}
@@ -291,7 +293,7 @@ class EmailAddress extends AbstractValidator
*/
protected function isReserved($host)
{
if (!preg_match('/^([0-9]{1,3}\.){3}[0-9]{1,3}$/', $host)) {
if (! preg_match('/^([0-9]{1,3}\.){3}[0-9]{1,3}$/', $host)) {
$host = gethostbynamel($host);
} else {
$host = [$host];
@@ -340,7 +342,9 @@ class EmailAddress extends AbstractValidator
// atext: ALPHA / DIGIT / and "!", "#", "$", "%", "&", "'", "*",
// "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~"
$atext = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d\x7e';
if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->idnToAscii($this->localPart))) {
if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->localPart)) {
$result = true;
} elseif ($this->validateInternationalizedLocalPart($this->localPart)) {
$result = true;
} else {
// Try quoted string format (RFC 5321 Chapter 4.1.2)
@@ -360,6 +364,26 @@ class EmailAddress extends AbstractValidator
return $result;
}
/**
* @param string $localPart Address local part to validate.
* @return bool
*/
protected function validateInternationalizedLocalPart($localPart)
{
if (extension_loaded('intl')
&& false === UConverter::transcode($localPart, 'UTF-8', 'UTF-8')
) {
// invalid utf?
return false;
}
$atext = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d\x7e';
// RFC 6532 extends atext to include non-ascii utf
// @see https://tools.ietf.org/html/rfc6532#section-3.1
$uatext = $atext . '\x{80}-\x{FFFF}';
return (bool) preg_match('/^[' . $uatext . ']+(\x2e+[' . $uatext . ']+)*$/u', $localPart);
}
/**
* Returns the found MX Record information after validation including weight for further processing
*
@@ -379,8 +403,8 @@ class EmailAddress extends AbstractValidator
{
$mxHosts = [];
$weight = [];
$result = getmxrr($this->idnToAscii($this->hostname), $mxHosts, $weight);
if (!empty($mxHosts) && !empty($weight)) {
$result = getmxrr($this->hostname, $mxHosts, $weight);
if (! empty($mxHosts) && ! empty($weight)) {
$this->mxRecord = array_combine($mxHosts, $weight) ?: [];
} else {
$this->mxRecord = [];
@@ -389,19 +413,19 @@ class EmailAddress extends AbstractValidator
arsort($this->mxRecord);
// Fallback to IPv4 hosts if no MX record found (RFC 2821 SS 5).
if (!$result) {
if (! $result) {
$result = gethostbynamel($this->hostname);
if (is_array($result)) {
$this->mxRecord = array_flip($result);
}
}
if (!$result) {
if (! $result) {
$this->error(self::INVALID_MX_RECORD);
return $result;
}
if (!$this->options['useDeepMxCheck']) {
if (! $this->options['useDeepMxCheck']) {
return $result;
}
@@ -409,11 +433,11 @@ class EmailAddress extends AbstractValidator
$reserved = true;
foreach ($this->mxRecord as $hostname => $weight) {
$res = $this->isReserved($hostname);
if (!$res) {
if (! $res) {
$reserved = false;
}
if (!$res
if (! $res
&& (checkdnsrr($hostname, "A")
|| checkdnsrr($hostname, "AAAA")
|| checkdnsrr($hostname, "A6"))
@@ -423,7 +447,7 @@ class EmailAddress extends AbstractValidator
}
}
if (!$validAddress) {
if (! $validAddress) {
$result = false;
$error = ($reserved) ? self::INVALID_SEGMENT : self::INVALID_MX_RECORD;
$this->error($error);
@@ -441,7 +465,7 @@ class EmailAddress extends AbstractValidator
{
$hostname = $this->getHostnameValidator()->setTranslator($this->getTranslator())
->isValid($this->hostname);
if (!$hostname) {
if (! $hostname) {
$this->error(self::INVALID_HOSTNAME);
// Get messages and errors from hostnameValidator
foreach ($this->getHostnameValidator()->getMessages() as $code => $message) {
@@ -473,7 +497,7 @@ class EmailAddress extends AbstractValidator
}
$this->localPart = $matches[1];
$this->hostname = $matches[2];
$this->hostname = $this->idnToAscii($matches[2]);
return true;
}
@@ -491,16 +515,16 @@ class EmailAddress extends AbstractValidator
*/
public function isValid($value)
{
if (!is_string($value)) {
if (! is_string($value)) {
$this->error(self::INVALID);
return false;
}
$length = true;
$this->setValue($this->idnToUtf8($value));
$this->setValue($value);
// Split email address up and disallow '..'
if (!$this->splitEmailParts($this->getValue())) {
if (! $this->splitEmailParts($this->getValue())) {
$this->error(self::INVALID_FORMAT);
return false;
}
@@ -511,6 +535,7 @@ class EmailAddress extends AbstractValidator
}
// Match hostname part
$hostname = false;
if ($this->options['useDomainCheck']) {
$hostname = $this->validateHostnamePart();
}
@@ -518,13 +543,7 @@ class EmailAddress extends AbstractValidator
$local = $this->validateLocalPart();
// If both parts valid, return true
if ($local && $length) {
if (($this->options['useDomainCheck'] && $hostname) || !$this->options['useDomainCheck']) {
return true;
}
}
return false;
return ($local && $length) && (! $this->options['useDomainCheck'] || $hostname);
}
/**
@@ -535,6 +554,9 @@ class EmailAddress extends AbstractValidator
protected function idnToAscii($email)
{
if (extension_loaded('intl')) {
if (defined('INTL_IDNA_VARIANT_UTS46')) {
return (idn_to_ascii($email, 0, INTL_IDNA_VARIANT_UTS46) ?: $email);
}
return (idn_to_ascii($email) ?: $email);
}
return $email;
@@ -547,6 +569,10 @@ class EmailAddress extends AbstractValidator
*/
protected function idnToUtf8($email)
{
if (strlen($email) == 0) {
return $email;
}
if (extension_loaded('intl')) {
// The documentation does not clarify what kind of failure
// can happen in idn_to_utf8. One can assume if the source
@@ -554,6 +580,9 @@ class EmailAddress extends AbstractValidator
// the source string in those cases.
// But not when the source string is long enough.
// Thus we default to source string ourselves.
if (defined('INTL_IDNA_VARIANT_UTS46')) {
return idn_to_utf8($email, 0, INTL_IDNA_VARIANT_UTS46) ?: $email;
}
return idn_to_utf8($email) ?: $email;
}
return $email;