PHP7 scalar and return type hints support

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-    - 5.6
     - 7.0
     - hhvm
 
@@ -20,7 +19,7 @@ before_script:
     # Install Nette Tester & Code Checker
     - travis_retry composer install --no-interaction --prefer-dist
     - travis_retry composer create-project nette/code-checker temp/code-checker ~2.5 --no-interaction
-  
+
 sudo: false
 
 cache:

composer.json

@@ -14,7 +14,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.6.0"
+		"php": ">=7.0.0"
 	},
 	"require-dev": {
 		"nette/tester": "~1.0"

src/Iterators/CachingIterator.php

@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types = 1);
+
 namespace Nette\Iterators;
 
 use Nette;
@@ -56,7 +58,7 @@ public function __construct($iterator)
 	 * @param  int  grid width
 	 * @return bool
 	 */
-	public function isFirst($width = NULL)
+	public function isFirst(int $width = NULL): bool
 	{
 		return $this->counter === 1 || ($width && $this->counter !== 0 && (($this->counter - 1) % $width) === 0);
 	}
@@ -67,7 +69,7 @@ public function isFirst($width = NULL)
 	 * @param  int  grid width
 	 * @return bool
 	 */
-	public function isLast($width = NULL)
+	public function isLast(int $width = NULL): bool
 	{
 		return !$this->hasNext() || ($width && ($this->counter % $width) === 0);
 	}
@@ -77,7 +79,7 @@ public function isLast($width = NULL)
 	 * Is the iterator empty?
 	 * @return bool
 	 */
-	public function isEmpty()
+	public function isEmpty(): bool
 	{
 		return $this->counter === 0;
 	}
@@ -87,7 +89,7 @@ public function isEmpty()
 	 * Is the counter odd?
 	 * @return bool
 	 */
-	public function isOdd()
+	public function isOdd(): bool
 	{
 		return $this->counter % 2 === 1;
 	}
@@ -97,7 +99,7 @@ public function isOdd()
 	 * Is the counter even?
 	 * @return bool
 	 */
-	public function isEven()
+	public function isEven(): bool
 	{
 		return $this->counter % 2 === 0;
 	}
@@ -107,7 +109,7 @@ public function isEven()
 	 * Returns the counter.
 	 * @return int
 	 */
-	public function getCounter()
+	public function getCounter(): int
 	{
 		return $this->counter;
 	}
@@ -117,7 +119,7 @@ public function getCounter()
 	 * Returns the count of elements.
 	 * @return int
 	 */
-	public function count()
+	public function count(): int
 	{
 		$inner = $this->getInnerIterator();
 		if ($inner instanceof \Countable) {
@@ -195,7 +197,7 @@ public function __call($name, $args)
 	 * @return mixed   property value
 	 * @throws Nette\MemberAccessException if the property is not defined.
 	 */
-	public function &__get($name)
+	public function &__get(string $name)
 	{
 		return ObjectMixin::get($this, $name);
 	}
@@ -208,7 +210,7 @@ public function &__get($name)
 	 * @return void
 	 * @throws Nette\MemberAccessException if the property is not defined or is read-only
 	 */
-	public function __set($name, $value)
+	public function __set(string $name, $value)
 	{
 		ObjectMixin::set($this, $name, $value);
 	}
@@ -219,7 +221,7 @@ public function __set($name, $value)
 	 * @param  string  property name
 	 * @return bool
 	 */
-	public function __isset($name)
+	public function __isset(string $name): bool
 	{
 		return ObjectMixin::has($this, $name);
 	}
@@ -231,7 +233,7 @@ public function __isset($name)
 	 * @return void
 	 * @throws Nette\MemberAccessException
 	 */
-	public function __unset($name)
+	public function __unset(string $name)
 	{
 		ObjectMixin::remove($this, $name);
 	}

src/Iterators/Mapper.php

@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types = 1);
+
 namespace Nette\Iterators;
 
 use Nette;

src/Utils/ArrayHash.php

@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types = 1);
+
 namespace Nette\Utils;
 
 use Nette;
@@ -19,9 +21,9 @@ class ArrayHash extends \stdClass implements \ArrayAccess, \Countable, \Iterator
 	/**
 	 * @param  array to wrap
 	 * @param  bool
-	 * @return self
+	 * @return static
 	 */
-	public static function from($arr, $recursive = TRUE)
+	public static function from(array $arr, bool $recursive = TRUE): self
 	{
 		$obj = new static;
 		foreach ($arr as $key => $value) {
@@ -39,7 +41,7 @@ public static function from($arr, $recursive = TRUE)
 	 * Returns an iterator over all items.
 	 * @return \RecursiveArrayIterator
 	 */
-	public function getIterator()
+	public function getIterator(): \RecursiveArrayIterator
 	{
 		return new \RecursiveArrayIterator($this);
 	}
@@ -49,7 +51,7 @@ public function getIterator()
 	 * Returns items count.
 	 * @return int
 	 */
-	public function count()
+	public function count(): int
 	{
 		return count((array) $this);
 	}

src/Utils/ArrayList.php

@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types = 1);
+
 namespace Nette\Utils;
 
 use Nette;
@@ -22,7 +24,7 @@ class ArrayList extends Nette\Object implements \ArrayAccess, \Countable, \Itera
 	 * Returns an iterator over all items.
 	 * @return \ArrayIterator
 	 */
-	public function getIterator()
+	public function getIterator(): \ArrayIterator
 	{
 		return new \ArrayIterator($this->list);
 	}
@@ -32,7 +34,7 @@ public function getIterator()
 	 * Returns items count.
 	 * @return int
 	 */
-	public function count()
+	public function count(): int
 	{
 		return count($this->list);
 	}

src/Utils/Arrays.php

@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types = 1);
+
 namespace Nette\Utils;
 
 use Nette;
@@ -73,7 +75,7 @@ public static function & getRef(array & $arr, $key)
 	 * Recursively appends elements of remaining keys from the second array to the first.
 	 * @return array
 	 */
-	public static function mergeTree(array $arr1, array $arr2)
+	public static function mergeTree(array $arr1, array $arr2): array
 	{
 		$res = $arr1 + $arr2;
 		foreach (array_intersect_key($arr1, $arr2) as $k => $v) {
@@ -138,7 +140,7 @@ public static function renameKey(array & $arr, $oldKey, $newKey)
 	 * Returns array entries that match the pattern.
 	 * @return array
 	 */
-	public static function grep(array $arr, $pattern, $flags = 0)
+	public static function grep(array $arr, string $pattern, int $flags = 0): array
 	{
 		return Strings::pcre('preg_grep', [$pattern, $arr, $flags]);
 	}
@@ -148,7 +150,7 @@ public static function grep(array $arr, $pattern, $flags = 0)
 	 * Returns flattened array.
 	 * @return array
 	 */
-	public static function flatten(array $arr, $preserveKeys = FALSE)
+	public static function flatten(array $arr, bool $preserveKeys = FALSE): array
 	{
 		$res = [];
 		$cb = $preserveKeys
@@ -163,7 +165,7 @@ public static function flatten(array $arr, $preserveKeys = FALSE)
 	 * Finds whether a variable is a zero-based integer indexed array.
 	 * @return bool
 	 */
-	public static function isList($value)
+	public static function isList($value): bool
 	{
 		return is_array($value) && (!$value || array_keys($value) === range(0, count($value) - 1));
 	}
@@ -225,7 +227,7 @@ public static function associate(array $arr, $path)
 	 * Normalizes to associative array.
 	 * @return array
 	 */
-	public static function normalize(array $arr, $filling = NULL)
+	public static function normalize(array $arr, $filling = NULL): array
 	{
 		$res = [];
 		foreach ($arr as $k => $v) {

src/Utils/Callback.php

@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types = 1);
+
 namespace Nette\Utils;
 
 use Nette;
@@ -21,7 +23,7 @@ class Callback
 	 * @param  string  method
 	 * @return \Closure
 	 */
-	public static function closure($callable, $m = NULL)
+	public static function closure($callable, string $m = NULL): \Closure
 	{
 		if ($m !== NULL) {
 			$callable = [$callable, $m];
@@ -78,9 +80,9 @@ public static function invokeArgs($callable, array $args = [])
 	 * @param  string
 	 * @return mixed
 	 */
-	public static function invokeSafe($function, array $args, $onError)
+	public static function invokeSafe(string $function, array $args, $onError)
 	{
-		$prev = set_error_handler(function ($severity, $message, $file) use ($onError, & $prev, $function) {
+		$prev = set_error_handler(function (int $severity, string $message, string $file) use ($onError, & $prev, $function) {
 			if ($file === '' && defined('HHVM_VERSION')) { // https://github.com/facebook/hhvm/issues/4625
 				$file = func_get_arg(5)[1]['file'];
 			}
@@ -108,7 +110,7 @@ public static function invokeSafe($function, array $args, $onError)
 	/**
 	 * @return callable
 	 */
-	public static function check($callable, $syntax = FALSE)
+	public static function check($callable, bool $syntax = FALSE)
 	{
 		if (!is_callable($callable, $syntax)) {
 			throw new Nette\InvalidArgumentException($syntax
@@ -123,7 +125,7 @@ public static function check($callable, $syntax = FALSE)
 	/**
 	 * @return string
 	 */
-	public static function toString($callable)
+	public static function toString($callable): string
 	{
 		if ($callable instanceof \Closure) {
 			$inner = self::unwrap($callable);
@@ -166,7 +168,7 @@ public static function toReflection($callable)
 	/**
 	 * @return bool
 	 */
-	public static function isStatic($callable)
+	public static function isStatic($callable): bool
 	{
 		return is_array($callable) ? is_string($callable[0]) : is_string($callable);
 	}
@@ -177,7 +179,7 @@ public static function isStatic($callable)
 	 * @internal
 	 * @return callable
 	 */
-	public static function unwrap(\Closure $closure)
+	public static function unwrap(\Closure $closure): callable
 	{
 		$r = new \ReflectionFunction($closure);
 		if (substr($r->getName(), -1) === '}') {

src/Utils/DateTime.php

@@ -5,6 +5,8 @@
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types = 1);
+
 namespace Nette\Utils;
 
 use Nette;
@@ -39,7 +41,7 @@ class DateTime extends \DateTime implements \JsonSerializable
 	 * @param  string|int|\DateTimeInterface
 	 * @return self
 	 */
-	public static function from($time)
+	public static function from($time): self
 	{
 		if ($time instanceof \DateTimeInterface) {
 			return new static($time->format('Y-m-d H:i:s'), $time->getTimezone());
@@ -59,7 +61,7 @@ public static function from($time)
 	/**
 	 * @return string
 	 */
-	public function __toString()
+	public function __toString(): string
 	{
 		return $this->format('Y-m-d H:i:s');
 	}
@@ -69,7 +71,7 @@ public function __toString()
 	 * @param  string
 	 * @return self
 	 */
-	public function modifyClone($modify = '')
+	public function modifyClone(string $modify = ''): self
 	{
 		$dolly = clone $this;
 		return $modify ? $dolly->modify($modify) : $dolly;
@@ -80,7 +82,7 @@ public function modifyClone($modify = '')
 	 * @param  int
 	 * @return self
 	 */
-	public function setTimestamp($timestamp)
+	public function setTimestamp($timestamp): self
 	{
 		$zone = $this->getTimezone();
 		$this->__construct('@' . $timestamp);
@@ -126,7 +128,7 @@ public static function createFromFormat($format, $time, $timezone = NULL)
 	 * Returns JSON representation in ISO 8601 (used by JavaScript).
 	 * @return string
 	 */
-	public function jsonSerialize()
+	public function jsonSerialize(): string
 	{
 		return $this->format('c');
 	}