removed PHP < 7 support

Author: dg

src/Utils/Html.php

@@ -559,9 +559,8 @@ public function __toString()
 		try {
 			return $this->render();
 		} catch (\Throwable $e) {
-		} catch (\Exception $e) {
+			trigger_error("Exception in " . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
 		}
-		trigger_error("Exception in " . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
 	}
 
 

src/Utils/Image.php

@@ -390,13 +390,7 @@ public function crop($left, $top, $width, $height)
 	{
 		list($r['x'], $r['y'], $r['width'], $r['height'])
 			= static::calculateCutout($this->getWidth(), $this->getHeight(), $left, $top, $width, $height);
-		if (PHP_VERSION_ID > 50611) { // PHP bug #67447
-			$this->image = imagecrop($this->image, $r);
-		} else {
-			$newImage = static::fromBlank($r['width'], $r['height'], self::RGB(0, 0, 0, 127))->getImageResource();
-			imagecopy($newImage, $this->image, 0, 0, $r['x'], $r['y'], $r['width'], $r['height']);
-			$this->image = $newImage;
-		}
+		$this->image = imagecrop($this->image, $r);
 		return $this;
 	}
 
@@ -574,9 +568,6 @@ public function __toString()
 		try {
 			return $this->toString();
 		} catch (\Throwable $e) {
-		} catch (\Exception $e) {
-		}
-		if (isset($e)) {
 			if (func_num_args()) {
 				throw $e;
 			}

src/Utils/Json.php

@@ -55,22 +55,7 @@ public static function encode($value, $options = 0)
 	public static function decode($json, $options = 0)
 	{
 		$forceArray = (bool) ($options & self::FORCE_ARRAY);
-		$flags = JSON_BIGINT_AS_STRING;
-
-		if (PHP_VERSION_ID < 70000) {
-			$json = (string) $json;
-			if ($json === '') {
-				throw new JsonException('Syntax error');
-			} elseif (!$forceArray && preg_match('#(?<=[^\\\\]")\\\\u0000(?:[^"\\\\]|\\\\.)*+"\s*+:#', $json)) {
-				throw new JsonException('The decoded property name is invalid'); // fatal error when object key starts with \u0000
-			} elseif (defined('JSON_C_VERSION') && !preg_match('##u', $json)) {
-				throw new JsonException('Invalid UTF-8 sequence', 5);
-			} elseif (defined('JSON_C_VERSION') && PHP_INT_SIZE === 8) {
-				$flags &= ~JSON_BIGINT_AS_STRING; // not implemented in PECL JSON-C 1.3.2 for 64bit systems
-			}
-		}
-
-		$value = json_decode($json, $forceArray, 512, $flags);
+		$value = json_decode($json, $forceArray, 512, JSON_BIGINT_AS_STRING);
 		if ($error = json_last_error()) {
 			throw new JsonException(json_last_error_msg(), $error);
 		}

src/Utils/Random.php

@@ -37,43 +37,8 @@ public static function generate($length = 10, $charlist = '0-9a-z')
 		}
 
 		$res = '';
-		if (PHP_VERSION_ID >= 70000) {
-			for ($i = 0; $i < $length; $i++) {
-				$res .= $charlist[random_int(0, $chLen - 1)];
-			}
-			return $res;
-		}
-
-		$bytes = '';
-		if (function_exists('openssl_random_pseudo_bytes')) {
-			$bytes = (string) openssl_random_pseudo_bytes($length, $secure);
-			if (!$secure) {
-				$bytes = '';
-			}
-		}
-		if (strlen($bytes) < $length && function_exists('mcrypt_create_iv')) {
-			$bytes = (string) mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
-		}
-		if (strlen($bytes) < $length && !defined('PHP_WINDOWS_VERSION_BUILD') && is_readable('/dev/urandom')) {
-			$bytes = (string) file_get_contents('/dev/urandom', FALSE, NULL, -1, $length);
-		}
-		if (strlen($bytes) < $length) {
-			$rand3 = md5(serialize($_SERVER), TRUE);
-			$charlist = str_shuffle($charlist);
-			for ($i = 0; $i < $length; $i++) {
-				if ($i % 5 === 0) {
-					list($rand1, $rand2) = explode(' ', microtime());
-					$rand1 += lcg_value();
-				}
-				$rand1 *= $chLen;
-				$res .= $charlist[($rand1 + $rand2 + ord($rand3[$i % strlen($rand3)])) % $chLen];
-				$rand1 -= (int) $rand1;
-			}
-			return $res;
-		}
-
 		for ($i = 0; $i < $length; $i++) {
-			$res .= $charlist[($i + ord($bytes[$i])) % $chLen];
+			$res .= $charlist[random_int(0, $chLen - 1)];
 		}
 		return $res;
 	}

src/Utils/Reflection.php

@@ -38,7 +38,7 @@ public static function isBuiltinType($type)
 	 */
 	public static function getReturnType(\ReflectionFunctionAbstract $func)
 	{
-		if (PHP_VERSION_ID >= 70000 && $func->hasReturnType()) {
+		if ($func->hasReturnType()) {
 			$type = (string) $func->getReturnType();
 			return strtolower($type) === 'self' ? $func->getDeclaringClass()->getName() : $type;
 		}
@@ -50,20 +50,9 @@ public static function getReturnType(\ReflectionFunctionAbstract $func)
 	 */
 	public static function getParameterType(\ReflectionParameter $param)
 	{
-		if (PHP_VERSION_ID >= 70000) {
-			$type = $param->hasType() ? (string) $param->getType() : NULL;
+		if ($param->hasType()) {
+			$type = (string) $param->getType();
 			return strtolower($type) === 'self' ? $param->getDeclaringClass()->getName() : $type;
-		} elseif ($param->isArray() || $param->isCallable()) {
-			return $param->isArray() ? 'array' : 'callable';
-		} else {
-			try {
-				return ($ref = $param->getClass()) ? $ref->getName() : NULL;
-			} catch (\ReflectionException $e) {
-				if (preg_match('#Class (.+) does not exist#', $e->getMessage(), $m)) {
-					return $m[1];
-				}
-				throw $e;
-			}
 		}
 	}
 

src/Utils/Strings.php

@@ -454,7 +454,7 @@ public static function after($haystack, $needle, $nth = 1)
 		$pos = self::pos($haystack, $needle, $nth);
 		return $pos === FALSE
 			? FALSE
-			: (string) substr($haystack, $pos + strlen($needle));
+			: substr($haystack, $pos + strlen($needle));
 	}
 
 

tests/Utils/Json.decode().phpt

@@ -37,7 +37,7 @@ Assert::exception(function () {
 
 Assert::exception(function () {
 	Json::decode('{}}');
-}, Nette\Utils\JsonException::class, PHP_VERSION_ID < 70000 ? 'State mismatch (invalid or malformed JSON)' : 'Syntax error');
+}, Nette\Utils\JsonException::class, 'Syntax error');
 
 
 Assert::exception(function () {

tests/Utils/Random.generate().no-mcrypt.phpt

@@ -2,7 +2,6 @@
 
 /**
  * Test: Nette\Utils\Reflection::getReturnType
- * @phpversion 7
  */
 
 namespace NS