verify: obsolete all the methods with underscore

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3758 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
2017-06-13 12:51:46 +00:00
parent 19a73ad0d8
commit d2d6b6ba24

View File

@@ -13,66 +13,154 @@ class verify
* Return true or false
* @param string $val The IP to test
*/
public function is_ip ($val)
public function isIp ($val)
{
return \verify::staticIs_ip ($val);
return \verify::staticIsIp ($val);
}
/** Check if $val is a valid IPv4 in static mode
* Return true or false
* @param string $val The IP to test
*/
public static function staticIs_ip ($val)
public static function staticIsIp ($val)
{
if (filter_var ($val, FILTER_VALIDATE_IP))
return true;
return false;
}
/** Check if $val is a valid IPv4
* Return true or false
* @param string $val The IP to test
* @deprecated 0.39
*/
public function is_ip ($val)
{
return \verify::staticIsIp ($val);
}
/** Check if $val is a valid IPv4 in static mode
* Return true or false
* @param string $val The IP to test
* @deprecated 0.39
*/
public static function staticIs_ip ($val)
{
return \verify::staticIsIp ($val);
}
/** Check if $val is a valid IPv4
* Return true or false
* @param string $val The IPv4 to test
*/
public function is_ipv4 ($val)
public function isIpv4 ($val)
{
return \verify::staticIs_ipv4 ($val);
return \verify::staticIsIpv4 ($val);
}
/** Check if $val is a valid IPv4 in static mode
* Return true or false
* @param string $val The IPv4 to test
*/
public static function staticIs_ipv4 ($val)
public static function staticIsIpv4 ($val)
{
if (filter_var ($val, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
return true;
return false;
}
/** Check if $val is a valid IPv4
* Return true or false
* @param string $val The IPv4 to test
* @deprecated 0.39
*/
public function is_ipv4 ($val)
{
return \verify::staticIsIpv4 ($val);
}
/** Check if $val is a valid IPv4 in static mode
* Return true or false
* @param string $val The IPv4 to test
* @deprecated 0.39
*/
public static function staticIs_ipv4 ($val)
{
return \verify::staticIsIpv4 ($val);
}
/** Check if $val is a valid IPv6
* Return true or false
* @param string $val The IPv6 to test
*/
public function isIpv6 ($val)
{
return \verify::staticIsIpv6 ($val);
}
/** Check if $val is a valid IPv6 in static mode
* Return true or false
* @param string $val The IPv6 to test
*/
public static function staticIsIpv6 ($val)
{
if (filter_var ($val, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
return true;
return false;
}
/** Check if $val is a valid IPv6
* Return true or false
* @param string $val The IPv6 to test
* @deprecated 0.39
*/
public function is_ipv6 ($val)
{
return \verify::staticIs_ipv6 ($val);
return \verify::staticIsipv6 ($val);
}
/** Check if $val is a valid IPv6 in static mode
* Return true or false
* @param string $val The IPv6 to test
* @deprecated 0.39
*/
public static function staticIs_ipv6 ($val)
{
if (filter_var ($val, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
return true;
return false;
return \verify::staticIsipv6 ($val);
}
/** Check if $val is a valid hostname (without domain)
* Return true or false
* @param string $val The hostname to check
*/
public function isHostname ($val)
{
return \verify::staticIsHostname ($val);
}
/** Check if $val is a valid hostname (without domain)
* Return true or false
* @param string $val The hostname to check
*/
public static function staticIsHostname ($val)
{
if (strlen ($val) < 2 || strlen ($val) > 128)
return false;
if (strspn ($val, "abcdefghijklmnopqrstuvwxyz".
"ABCDEFGHIJKLMNOPQRSTUVWXYZ".
"0123456789-.") !==
strlen ($val))
return false;
// No end dot ?
if (substr ($val, -1) === ".")
return false;
return true;
}
/** Check if $val is a valid hostname (without domain)
* Return true or false
* @param string $val The hostname to check
* @deprecated 0.39
*/
public function is_hostname ($val)
{
return \verify::staticIs_hostname ($val);
@@ -81,8 +169,27 @@ class verify
/** Check if $val is a valid hostname (without domain)
* Return true or false
* @param string $val The hostname to check
* @deprecated 0.39
*/
public static function staticIs_hostname ($val)
{
return \verify::staticIsHostname ($val);
}
/** Check if $val is a valid domain (without hostname)
* Return true or false
* @param string $val The domain to check
*/
public function isDomain ($val)
{
return \verify::staticIsDomain ($val);
}
/** Check if $val is a valid domain (without hostname) in static mode
* Return true or false
* @param string $val The domain to check
*/
public static function staticIsDomain ($val)
{
if (strlen ($val) < 2 || strlen ($val) > 128)
return false;
@@ -100,45 +207,37 @@ class verify
/** Check if $val is a valid domain (without hostname)
* Return true or false
* @param string $val The domain to check
* @deprecated 0.39
*/
public function is_domain ($val)
{
return \verify::staticIs_domain ($val);
return \verify::staticIsDomain ($val);
}
/** Check if $val is a valid domain (without hostname) in static mode
* Return true or false
* @param string $val The domain to check
* @deprecated 0.39
*/
public static function staticIs_domain ($val)
{
if (strlen ($val) < 2 || strlen ($val) > 128)
return false;
if (strspn ($val, "abcdefghijklmnopqrstuvwxyz".
"ABCDEFGHIJKLMNOPQRSTUVWXYZ".
"0123456789-.") !==
strlen ($val))
return false;
// No end dot ?
if (substr ($val, -1) === ".")
return false;
return true;
return \verify::staticIsDomain ($val);
}
/** Check if $val is a valid FQDN
* Return true or false
* @param string $val The FQDN to check
*/
public function is_FQDN ($val)
public function isFQDN ($val)
{
return \verify::staticIs_FQDN ($val);
return \verify::staticIsFQDN ($val);
}
/** Check if $val is a valid FQDN in static mode
* Return true or false
* @param string $val The FQDN to check
*/
public static function staticIs_FQDN ($val)
public static function staticIsFQDN ($val)
{
if (strlen ($val) < 2 || strlen ($val) > 255)
return false;
@@ -155,23 +254,45 @@ class verify
return true;
}
/** Check if $val is a valid FQDN
* Return true or false
* @param string $val The FQDN to check
* @deprecated 0.39
*/
public function is_FQDN ($val)
{
return \verify::staticIsFQDN ($val);
}
/** Check if $val is a valid FQDN in static mode
* Return true or false
* @param string $val The FQDN to check
* @deprecated 0.39
*/
public static function staticIs_FQDN ($val)
{
return \verify::staticIsFQDN ($val);
}
///////////////
// DATES //
///////////////
/** Check if $val is a valid date and time in SQL
A valid date is 2014-03-20 12:27:34
Return true or false
@param string $val The date to check */
public function is_datetimeSQL ($val)
* A valid date is 2014-03-20 12:27:34
* Return true or false
* @param string $val The date to check
*/
public function isDatetimeSQL ($val)
{
return \verify::staticIs_datetimeSQL ($val);
return \verify::staticIsDatetimeSQL ($val);
}
/** Check if $val is a valid date and time in SQL in static mode
A valid date is 2014-03-20 12:27:34
Return true or false
@param string $val The date to check */
public static function staticIs_datetimeSQL ($val)
* A valid date is 2014-03-20 12:27:34
* Return true or false
* @param string $val The date to check
*/
public static function staticIsDatetimeSQL ($val)
{
if (strlen ($val) !== 19)
return false;
@@ -189,20 +310,44 @@ class verify
return true;
}
/** Check if $val is a valid date in SQL
A valid date is 2014-03-20
Return true or false
@param string $val The date to check */
public function is_dateSQL ($val)
/** Check if $val is a valid date and time in SQL
* A valid date is 2014-03-20 12:27:34
* Return true or false
* @param string $val The date to check
* @deprecated 0.39
*/
public function is_datetimeSQL ($val)
{
return \verify::staticIs_dateSQL ($val);
return \verify::staticIsDatetimeSQL ($val);
}
/** Check if $val is a valid date and time in SQL in static mode
* A valid date is 2014-03-20 12:27:34
* Return true or false
* @param string $val The date to check
* @deprecated 0.39
*/
public static function staticIs_datetimeSQL ($val)
{
return \verify::staticIsDatetimeSQL ($val);
}
/** Check if $val is a valid date in SQL
* A valid date is 2014-03-20
* Return true or false
* @param string $val The date to check
*/
public function isDateSQL ($val)
{
return \verify::staticIsDateSQL ($val);
}
/** Check if $val is a valid date in SQL in static mode
A valid date is 2014-03-20
Return true or false
@param string $val The date to check */
public static function staticIs_dateSQL ($val)
* A valid date is 2014-03-20
* Return true or false
* @param string $val The date to check
*/
public static function staticIsDateSQL ($val)
{
if (strlen ($val) !== 10)
return false;
@@ -220,6 +365,28 @@ class verify
return true;
}
/** Check if $val is a valid date in SQL
* A valid date is 2014-03-20
* Return true or false
* @param string $val The date to check
* @deprecated 0.39
*/
public function is_dateSQL ($val)
{
return \verify::staticIsDateSQL ($val);
}
/** Check if $val is a valid date in SQL in static mode
* A valid date is 2014-03-20
* Return true or false
* @param string $val The date to check
* @deprecated 0.39
*/
public static function staticIs_dateSQL ($val)
{
return \verify::staticIsDateSQL ($val);
}
/////////////////
// STRINGS //
@@ -255,16 +422,16 @@ class verify
/** Return true if the provided value is an integer in decimal (not octal)
* @param string $val The Integer val to check
*/
public function is_integer ($val)
public function isInteger ($val)
{
return \verify::staticIs_integer ($val);
return \verify::staticIsInteger ($val);
}
/** Return true if the provided value is an integer in decimal (not octal)
* In static mode
* @param string $val The Integer val to check
*/
public static function staticIs_integer ($val)
public static function staticIsInteger ($val)
{
if (! is_string ($val) && ! is_int ($val))
return false;
@@ -275,6 +442,25 @@ class verify
return true;
}
/** Return true if the provided value is an integer in decimal (not octal)
* @param string $val The Integer val to check
* @deprecated 0.39
*/
public function is_integer ($val)
{
return \verify::staticIsInteger ($val);
}
/** Return true if the provided value is an integer in decimal (not octal)
* In static mode
* @param string $val The Integer val to check
* @deprecated 0.39
*/
public static function staticIs_integer ($val)
{
return \verify::staticIsInteger ($val);
}
////////////////
// EMAILS //
////////////////
@@ -282,20 +468,40 @@ class verify
* @param string $val The value to check
* @return boolean
*/
public function is_email ($val)
public function isEmail ($val)
{
return \verify::staticIs_email ($val);
return \verify::staticIsEmail ($val);
}
/** Return true if the provided value is a valid email address in static mode
* @param string $val The value to check
* @return boolean
*/
public static function staticIs_email ($val)
public static function staticIsEmail ($val)
{
return !! filter_var ($val, FILTER_VALIDATE_EMAIL);
}
/** Return true if the provided value is a valid email address
* @param string $val The value to check
* @return boolean
* @deprecated 0.39
*/
public function is_email ($val)
{
return \verify::staticIsEmail ($val);
}
/** Return true if the provided value is a valid email address in static mode
* @param string $val The value to check
* @return boolean
* @deprecated 0.39
*/
public static function staticIs_email ($val)
{
return \verify::staticIsEmail ($val);
}
/////////////
// URL //
/////////////
@@ -303,20 +509,40 @@ class verify
* @param string $val The value to check
* @return boolean
*/
public function is_URL ($val)
public function isURL ($val)
{
return \verify::staticIs_URL ($val);
return \verify::staticIsURL ($val);
}
/** Return true if the provided value is a valid URL in static mode
* @param string $val The value to check
* @return boolean
*/
public static function staticIs_URL ($val)
public static function staticIsURL ($val)
{
return !! filter_var ($val, FILTER_VALIDATE_URL);
}
/** Return true if the provided value is a valid URL
* @param string $val The value to check
* @return boolean
* @deprecated 0.39
*/
public function is_URL ($val)
{
return \verify::staticIsURL ($val);
}
/** Return true if the provided value is a valid URL in static mode
* @param string $val The value to check
* @return boolean
* @deprecated 0.39
*/
public static function staticIs_URL ($val)
{
return \verify::staticIsURL ($val);
}
//////////////////
/// OTHERS ///
//////////////////
@@ -325,9 +551,9 @@ class verify
* @param string $val The value to check
* @return boolean
*/
public function is_UUID ($val)
public function isUUID ($val)
{
return \verify::staticIs_UUID ($val);
return \verify::staticIsUUID ($val);
}
/** Return true if the provided value is a valid UUID in static mode
@@ -335,7 +561,7 @@ class verify
* @param string $val The value to check
* @return boolean
*/
public static function staticIs_UUID ($val)
public static function staticIsUUID ($val)
{
if (! is_string ($val))
return false;
@@ -349,6 +575,28 @@ class verify
return true;
}
/** Return true if the provided value is a valid UUID
* %04x%04x-%04x-%04x-%04x-%04x%04x%04x
* @param string $val The value to check
* @return boolean
* @deprecated 0.39
*/
public function is_UUID ($val)
{
return \verify::staticIsUUID ($val);
}
/** Return true if the provided value is a valid UUID in static mode
* %04x%04x-%04x-%04x-%04x-%04x%04x%04x
* @param string $val The value to check
* @return boolean
* @deprecated 0.39
*/
public static function staticIs_UUID ($val)
{
return \verify::staticIsUUID ($val);
}
/** Return true if the provided string is a valid hash
* @param string $algo The hash algo to test
* @param string $val The value to test