Merge remote-tracking branch 'origin/7.0_Next'

# Conflicts:
#	lib/blobfolio/domain/data.php

Author: joshstoik1

.travis.yml

@@ -12,11 +12,10 @@ branches:
     - master
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
 
 install: travis_retry composer install --no-interaction
 
-script: lib/vendor/bin/phpunit --configuration phpunit.xml.dist
+script: lib/vendor/bin/phpunit --configuration phpunit.xml.dist

README.md

@@ -26,7 +26,7 @@ blob-domain is a simple PHP library for parsing and validating domain names. It
 
 ## Requirements
 
-blob-domain and its dependencies require PHP 5.6+ with the following modules:
+blob-domain and its dependencies require PHP 7.0+ with the following modules:
 
  * BCMath
  * DOM

composer.json

@@ -11,7 +11,7 @@
     "ICANN",
     "IDN"
   ],
-  "version": "0.4.2",
+  "version": "dev-7.0_Next",
   "type": "library",
   "homepage": "https:\/\/github.com\/Blobfolio\/blob-domain",
   "license": "WTFPL",
@@ -23,13 +23,13 @@
     }
   ],
   "require": {
-    "php": ">= 5.6",
+    "php": ">= 7.0",
     "ext-filter": "*",
     "ext-mbstring": "*",
     "ext-json": "*",
     "ext-intl": "*",
 
-    "blobfolio\/blob-common": "*"
+    "blobfolio\/blob-common": "dev-7.0_Next"
   },
   "require-dev": {
     "phpunit\/phpunit": "5.7.*"

lib/blobfolio/domain/data.php

@@ -3,7 +3,7 @@
  * Suffix Data
  *
  * This data was automatically generated by the build script on
- * 2018-06-01 14:15:32.
+ * 2018-06-01 14:14:21.
  *
  * @see {build/build.php}
  *

lib/blobfolio/domain/domain.php

@@ -10,7 +10,13 @@
 
 namespace blobfolio\domain;
 
-use \blobfolio\common;
+use \blobfolio\common\constants;
+use \blobfolio\common\data as c_data;
+use \blobfolio\common\mb as v_mb;
+use \blobfolio\common\ref\cast as r_cast;
+use \blobfolio\common\ref\file as r_file;
+use \blobfolio\common\ref\mb as r_mb;
+use \blobfolio\common\ref\sanitize as r_sanitize;
 
 class domain {
 
@@ -41,9 +47,7 @@ class domain {
 	 * @param bool $www Strip leading www.
 	 * @return bool True/false.
 	 */
-	public function __construct($host='', $www=false) {
-		common\ref\cast::to_bool($www, true);
-
+	public function __construct($host='', bool $www=false) {
 		// Parse the parts.
 		if (false === ($parsed = static::parse_host_parts($host))) {
 			return false;
@@ -73,44 +77,45 @@ public function __construct($host='', $www=false) {
 	 */
 	public static function parse_host($host) {
 		// Try to parse it the easy way.
-		$tmp = common\mb::parse_url($host, PHP_URL_HOST);
+		$tmp = v_mb::parse_url($host, PHP_URL_HOST);
 		if ($tmp) {
 			$host = $tmp;
 		}
 		// Or the hard way?
 		else {
-			common\ref\cast::to_string($host, true);
-			common\ref\mb::trim($host);
+			r_cast::string($host, true);
+
+			r_mb::trim($host, true);
 
 			// Cut off the path, if any.
-			if (false !== ($start = common\mb::strpos($host, '/'))) {
-				$host = common\mb::substr($host, 0, $start);
+			if (false !== ($start = v_mb::strpos($host, '/'))) {
+				$host = v_mb::substr($host, 0, $start, true);
 			}
 
 			// Cut off the query, if any.
-			if (false !== ($start = common\mb::strpos($host, '?'))) {
-				$host = common\mb::substr($host, 0, $start);
+			if (false !== ($start = v_mb::strpos($host, '?'))) {
+				$host = v_mb::substr($host, 0, $start, true);
 			}
 
 			// Cut off credentials, if any.
-			if (false !== ($start = common\mb::strpos($host, '@'))) {
-				$host = common\mb::substr($host, $start + 1);
+			if (false !== ($start = v_mb::strpos($host, '@'))) {
+				$host = v_mb::substr($host, $start + 1, null, true);
 			}
 
 			// Is this an IPv6 address?
 			if (filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-				common\ref\sanitize::ip($host, true);
+				r_sanitize::ip($host, true);
 			}
 			elseif (
-				0 === common\mb::strpos($host, '[') &&
-				false !== ($end = common\mb::strpos($host, ']'))
+				(0 === strpos($host, '[')) &&
+				false !== ($end = v_mb::strpos($host, ']'))
 			) {
-				$host = common\mb::substr($host, 1, $end - 1);
-				common\ref\sanitize::ip($host, true);
+				$host = v_mb::substr($host, 1, $end - 1, true);
+				r_sanitize::ip($host, true);
 			}
 			// Cut off port, if any.
-			elseif (false !== ($start = common\mb::strpos($host, ':'))) {
-				$host = common\mb::substr($host, 0, $start);
+			elseif (false !== ($start = v_mb::strpos($host, ':'))) {
+				$host = v_mb::substr($host, 0, $start, true);
 			}
 
 			// If it is empty or invalid, there is nothing we can do.
@@ -121,22 +126,22 @@ public static function parse_host($host) {
 			// Convert to ASCII if possible.
 			if (function_exists('idn_to_ascii')) {
 				$host = explode('.', $host);
-				common\ref\file::idn_to_ascii($host);
+				r_file::idn_to_ascii($host);
 				$host = implode('.', $host);
 			}
 
 			// Lowercase it.
-			common\ref\mb::strtolower($host);
+			r_mb::strtolower($host, false, true);
 
 			// Get rid of trailing periods.
 			$host = ltrim($host, '.');
 			$host = rtrim($host, '.');
 		}
 
 		// Liberate IPv6 from its walls.
-		if (0 === common\mb::strpos($host, '[')) {
+		if (0 === strpos($host, '[')) {
 			$host = str_replace(array('[', ']'), '', $host);
-			common\ref\sanitize::ip($host, true);
+			r_sanitize::ip($host, true);
 		}
 
 		// Is this an IP address? If so, we're done!
@@ -154,8 +159,8 @@ public static function parse_host($host) {
 			// Gotta have length, and can't start or end with a dash.
 			if (
 				!strlen($v) ||
-				'-' === substr($v, 0, 1) ||
-				'-' === substr($v, -1)
+				(0 === strpos($v, '-')) ||
+				('-' === substr($v, -1))
 			) {
 				return false;
 			}
@@ -197,7 +202,7 @@ public static function parse_host_parts($host) {
 
 		foreach ($parts as $k=>$part) {
 			// Override rule.
-			if (isset($suffixes[$part]) && isset($suffixes[$part]['!'])) {
+			if (isset($suffixes[$part], $suffixes[$part]['!'])) {
 				break;
 			}
 
@@ -259,8 +264,8 @@ public function strip_www() {
 		}
 
 		if (
-			'www' === $this->subdomain ||
-			'www.' === common\mb::substr($this->subdomain, 0, 4)
+			('www' === $this->subdomain) ||
+			(0 === strpos($this->subdomain, 'www.'))
 		) {
 			$this->subdomain = preg_replace('/^www\.?/u', '', $this->subdomain);
 			if (!strlen($this->subdomain)) {
@@ -288,8 +293,7 @@ public function strip_www() {
 	 * @param bool $dns Has DNS.
 	 * @return bool True/false.
 	 */
-	public function is_valid($dns=false) {
-		common\ref\cast::to_bool($dns, true);
+	public function is_valid(bool $dns=false) {
 		return !is_null($this->host) && (!$dns || $this->has_dns());
 	}
 
@@ -311,9 +315,7 @@ public function is_fqdn() {
 	 * @param bool $restricted Allow restricted.
 	 * @return bool True/false.
 	 */
-	public function is_ip($restricted=true) {
-		common\ref\cast::to_bool($restricted, true);
-
+	public function is_ip(bool $restricted=true) {
 		if (!$this->is_valid()) {
 			return false;
 		}
@@ -322,7 +324,11 @@ public function is_ip($restricted=true) {
 			return !!filter_var($this->host, FILTER_VALIDATE_IP);
 		}
 
-		return !!filter_var($this->host, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
+		return !!filter_var(
+			$this->host,
+			FILTER_VALIDATE_IP,
+			FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE
+		);
 	}
 
 	/**
@@ -339,7 +345,11 @@ public function has_dns() {
 				$this->dns = $this->is_ip(false);
 			}
 			else {
-				$this->dns = !!filter_var(gethostbyname("{$this->host}."), FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
+				$this->dns = !!filter_var(
+					gethostbyname("{$this->host}."),
+					FILTER_VALIDATE_IP,
+					FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE
+				);
 			}
 		}
 
@@ -401,14 +411,14 @@ public function __call($method, $args) {
 		preg_match_all('/^get_(.+)$/', $method, $matches);
 		if (
 			count($matches[0]) &&
-			'dns' !== $matches[1][0] &&
+			('dns' !== $matches[1][0]) &&
 			property_exists($this, $matches[1][0])
 		) {
 			$variable = $matches[1][0];
 
 			if (is_array($args) && count($args)) {
-				$args = common\data::array_pop_top($args);
-				common\ref\cast::to_bool($args);
+				$args = c_data::array_pop_top($args);
+				r_cast::bool($args);
 				if ($args) {
 					return $this->to_unicode($variable);
 				}
@@ -417,7 +427,13 @@ public function __call($method, $args) {
 			return $this->{$variable};
 		}
 
-		throw new \Exception(sprintf('The required method "%s" does not exist for %s', $method, get_called_class()));
+		throw new \Exception(
+			sprintf(
+				'The required method "%s" does not exist for %s',
+				$method,
+				get_called_class()
+			)
+		);
 	}
 
 	/**
@@ -430,7 +446,7 @@ protected function to_unicode($key) {
 		$value = $this->{$key};
 		if (function_exists('idn_to_utf8') && is_string($value)) {
 			$value = explode('.', $value);
-			common\ref\file::idn_to_utf8($value);
+			r_file::idn_to_utf8($value);
 			return implode('.', $value);
 		}
 
@@ -443,9 +459,7 @@ protected function to_unicode($key) {
 	 * @param bool $unicode Unicode.
 	 * @return array|bool Host data or false.
 	 */
-	public function get_data($unicode=false) {
-		common\ref\cast::to_bool($unicode, true);
-
+	public function get_data(bool $unicode=false) {
 		if (!$this->is_valid()) {
 			return false;
 		}