coding style: TRUE/FALSE/NULL -> true/false/null

Author: dg

src/Iterators/CachingIterator.php

@@ -57,7 +57,7 @@ public function __construct($iterator)
 	/**
 	 * Is the current element the first one?
 	 */
-	public function isFirst(int $gridWidth = NULL): bool
+	public function isFirst(int $gridWidth = null): bool
 	{
 		return $this->counter === 1 || ($gridWidth && $this->counter !== 0 && (($this->counter - 1) % $gridWidth) === 0);
 	}
@@ -66,7 +66,7 @@ public function isFirst(int $gridWidth = NULL): bool
 	/**
 	 * Is the current element the last one?
 	 */
-	public function isLast(int $gridWidth = NULL): bool
+	public function isLast(int $gridWidth = null): bool
 	{
 		return !$this->hasNext() || ($gridWidth && ($this->counter % $gridWidth) === 0);
 	}

src/Utils/ArrayHash.php

@@ -21,12 +21,12 @@ class ArrayHash extends \stdClass implements \ArrayAccess, \Countable, \Iterator
 	/**
 	 * @return static
 	 */
-	public static function from(array $arr, bool $recursive = TRUE)
+	public static function from(array $arr, bool $recursive = true)
 	{
 		$obj = new static;
 		foreach ($arr as $key => $value) {
 			if ($recursive && is_array($value)) {
-				$obj->$key = static::from($value, TRUE);
+				$obj->$key = static::from($value, true);
 			} else {
 				$obj->$key = $value;
 			}
@@ -59,7 +59,7 @@ public function count(): int
 	 */
 	public function offsetSet($key, $value)
 	{
-		if (!is_scalar($key)) { // prevents NULL
+		if (!is_scalar($key)) { // prevents null
 			throw new Nette\InvalidArgumentException(sprintf('Key must be either a string or an integer, %s given.', gettype($key)));
 		}
 		$this->$key = $value;

src/Utils/ArrayList.php

@@ -42,13 +42,13 @@ public function count(): int
 
 	/**
 	 * Replaces or appends a item.
-	 * @param  int|NULL
+	 * @param  int|null
 	 * @return void
 	 * @throws Nette\OutOfRangeException
 	 */
 	public function offsetSet($index, $value)
 	{
-		if ($index === NULL) {
+		if ($index === null) {
 			$this->list[] = $value;
 
 		} elseif ($index < 0 || $index >= count($this->list)) {

src/Utils/Arrays.php

@@ -26,7 +26,7 @@ class Arrays
 	 * @return mixed
 	 * @throws Nette\InvalidArgumentException if item does not exist and default value is not provided
 	 */
-	public static function get(array $arr, $key, $default = NULL)
+	public static function get(array $arr, $key, $default = null)
 	{
 		foreach (is_array($key) ? $key : [$key] as $k) {
 			if (is_array($arr) && array_key_exists($k, $arr)) {
@@ -51,7 +51,7 @@ public static function get(array $arr, $key, $default = NULL)
 	public static function &getRef(array &$arr, $key)
 	{
 		foreach (is_array($key) ? $key : [$key] as $k) {
-			if (is_array($arr) || $arr === NULL) {
+			if (is_array($arr) || $arr === null) {
 				$arr = &$arr[$k];
 			} else {
 				throw new Nette\InvalidArgumentException('Traversed item is not an array.');
@@ -78,12 +78,12 @@ public static function mergeTree(array $arr1, array $arr2): array
 
 	/**
 	 * Searches the array for a given key and returns the offset if successful.
-	 * @return int|NULL offset if it is found, NULL otherwise
+	 * @return int|null offset if it is found, null otherwise
 	 */
 	public static function searchKey(array $arr, $key)
 	{
-		$foo = [$key => NULL];
-		return ($tmp = array_search(key($foo), array_keys($arr), TRUE)) === FALSE ? NULL : $tmp;
+		$foo = [$key => null];
+		return ($tmp = array_search(key($foo), array_keys($arr), true)) === false ? null : $tmp;
 	}
 
 
@@ -94,7 +94,7 @@ public static function searchKey(array $arr, $key)
 	public static function insertBefore(array &$arr, $key, array $inserted)
 	{
 		$offset = (int) self::searchKey($arr, $key);
-		$arr = array_slice($arr, 0, $offset, TRUE) + $inserted + array_slice($arr, $offset, count($arr), TRUE);
+		$arr = array_slice($arr, 0, $offset, true) + $inserted + array_slice($arr, $offset, count($arr), true);
 	}
 
 
@@ -105,8 +105,8 @@ public static function insertBefore(array &$arr, $key, array $inserted)
 	public static function insertAfter(array &$arr, $key, array $inserted)
 	{
 		$offset = self::searchKey($arr, $key);
-		$offset = $offset === NULL ? count($arr) : $offset + 1;
-		$arr = array_slice($arr, 0, $offset, TRUE) + $inserted + array_slice($arr, $offset, count($arr), TRUE);
+		$offset = $offset === null ? count($arr) : $offset + 1;
+		$arr = array_slice($arr, 0, $offset, true) + $inserted + array_slice($arr, $offset, count($arr), true);
 	}
 
 
@@ -117,7 +117,7 @@ public static function insertAfter(array &$arr, $key, array $inserted)
 	public static function renameKey(array &$arr, $oldKey, $newKey)
 	{
 		$offset = self::searchKey($arr, $oldKey);
-		if ($offset !== NULL) {
+		if ($offset !== null) {
 			$keys = array_keys($arr);
 			$keys[$offset] = $newKey;
 			$arr = array_combine($keys, $arr);
@@ -137,7 +137,7 @@ public static function grep(array $arr, string $pattern, int $flags = 0): array
 	/**
 	 * Returns flattened array.
 	 */
-	public static function flatten(array $arr, bool $preserveKeys = FALSE): array
+	public static function flatten(array $arr, bool $preserveKeys = false): array
 	{
 		$res = [];
 		$cb = $preserveKeys
@@ -185,7 +185,7 @@ public static function associate(array $arr, $path)
 				} elseif ($part === '=') {
 					if (isset($parts[++$i])) {
 						$x = $row[$parts[$i]];
-						$row = NULL;
+						$row = null;
 					}
 
 				} elseif ($part === '->') {
@@ -200,7 +200,7 @@ public static function associate(array $arr, $path)
 				}
 			}
 
-			if ($x === NULL) {
+			if ($x === null) {
 				$x = $row;
 			}
 		}
@@ -212,7 +212,7 @@ public static function associate(array $arr, $path)
 	/**
 	 * Normalizes to associative array.
 	 */
-	public static function normalize(array $arr, $filling = NULL): array
+	public static function normalize(array $arr, $filling = null): array
 	{
 		$res = [];
 		foreach ($arr as $k => $v) {
@@ -228,7 +228,7 @@ public static function normalize(array $arr, $filling = NULL): array
 	 * @return mixed
 	 * @throws Nette\InvalidArgumentException if item does not exist and default value is not provided
 	 */
-	public static function pick(array &$arr, $key, $default = NULL)
+	public static function pick(array &$arr, $key, $default = null)
 	{
 		if (array_key_exists($key, $arr)) {
 			$value = $arr[$key];
@@ -251,10 +251,10 @@ public static function some(array $arr, callable $callback): bool
 	{
 		foreach ($arr as $k => $v) {
 			if ($callback($v, $k, $arr)) {
-				return TRUE;
+				return true;
 			}
 		}
-		return FALSE;
+		return false;
 	}
 
 
@@ -265,10 +265,10 @@ public static function every(array $arr, callable $callback): bool
 	{
 		foreach ($arr as $k => $v) {
 			if (!$callback($v, $k, $arr)) {
-				return FALSE;
+				return false;
 			}
 		}
-		return TRUE;
+		return true;
 	}
 
 

src/Utils/Callback.php

@@ -23,9 +23,9 @@ final class Callback
 	/**
 	 * @param  string|object|callable  class, object, callable
 	 */
-	public static function closure($callable, string $method = NULL): \Closure
+	public static function closure($callable, string $method = null): \Closure
 	{
-		if ($method !== NULL) {
+		if ($method !== null) {
 			$callable = [$callable, $method];
 		}
 
@@ -94,11 +94,11 @@ public static function invokeSafe(string $function, array $args, callable $onErr
 			}
 			if ($file === __FILE__) {
 				$msg = preg_replace("#^$function\(.*?\): #", '', $message);
-				if ($onError($msg, $severity) !== FALSE) {
+				if ($onError($msg, $severity) !== false) {
 					return;
 				}
 			}
-			return $prev ? $prev(...func_get_args()) : FALSE;
+			return $prev ? $prev(...func_get_args()) : false;
 		});
 
 		try {
@@ -112,7 +112,7 @@ public static function invokeSafe(string $function, array $args, callable $onErr
 	/**
 	 * @return callable
 	 */
-	public static function check($callable, bool $syntax = FALSE)
+	public static function check($callable, bool $syntax = false)
 	{
 		if (!is_callable($callable, $syntax)) {
 			throw new Nette\InvalidArgumentException($syntax
@@ -132,7 +132,7 @@ public static function toString($callable): string
 		} elseif (is_string($callable) && $callable[0] === "\0") {
 			return '{lambda}';
 		} else {
-			is_callable($callable, TRUE, $textual);
+			is_callable($callable, true, $textual);
 			return $textual;
 		}
 	}

src/Utils/DateTime.php

@@ -54,7 +54,7 @@ public static function from($time)
 			}
 			return (new static('@' . $time))->setTimeZone(new \DateTimeZone(date_default_timezone_get()));
 
-		} else { // textual or NULL
+		} else { // textual or null
 			return new static($time);
 		}
 	}
@@ -116,12 +116,12 @@ public function getTimestamp()
 	 * Returns new DateTime object formatted according to the specified format.
 	 * @param  string The format the $time parameter should be in
 	 * @param  string String representing the time
-	 * @param  string|\DateTimeZone desired timezone (default timezone is used if NULL is passed)
-	 * @return static|FALSE
+	 * @param  string|\DateTimeZone desired timezone (default timezone is used if null is passed)
+	 * @return static|false
 	 */
-	public static function createFromFormat($format, $time, $timezone = NULL)
+	public static function createFromFormat($format, $time, $timezone = null)
 	{
-		if ($timezone === NULL) {
+		if ($timezone === null) {
 			$timezone = new \DateTimeZone(date_default_timezone_get());
 
 		} elseif (is_string($timezone)) {
@@ -132,7 +132,7 @@ public static function createFromFormat($format, $time, $timezone = NULL)
 		}
 
 		$date = parent::createFromFormat($format, $time, $timezone);
-		return $date ? static::from($date) : FALSE;
+		return $date ? static::from($date) : false;
 	}
 
 

src/Utils/FileSystem.php

@@ -26,7 +26,7 @@ final class FileSystem
 	 */
 	public static function createDir(string $dir, int $mode = 0777)
 	{
-		if (!is_dir($dir) && !@mkdir($dir, $mode, TRUE) && !is_dir($dir)) { // @ - dir may already exist
+		if (!is_dir($dir) && !@mkdir($dir, $mode, true) && !is_dir($dir)) { // @ - dir may already exist
 			throw new Nette\IOException("Unable to create directory '$dir'. " . error_get_last()['message']);
 		}
 	}
@@ -37,7 +37,7 @@ public static function createDir(string $dir, int $mode = 0777)
 	 * @return void
 	 * @throws Nette\IOException
 	 */
-	public static function copy(string $source, string $dest, bool $overwrite = TRUE)
+	public static function copy(string $source, string $dest, bool $overwrite = true)
 	{
 		if (stream_is_local($source) && !file_exists($source)) {
 			throw new Nette\IOException("File or directory '$source' not found.");
@@ -60,7 +60,7 @@ public static function copy(string $source, string $dest, bool $overwrite = TRUE
 
 		} else {
 			static::createDir(dirname($dest));
-			if (@stream_copy_to_stream(fopen($source, 'r'), fopen($dest, 'w')) === FALSE) { // @ is escalated to exception
+			if (@stream_copy_to_stream(fopen($source, 'r'), fopen($dest, 'w')) === false) { // @ is escalated to exception
 				throw new Nette\IOException("Unable to copy file '$source' to '$dest'.");
 			}
 		}
@@ -97,7 +97,7 @@ public static function delete(string $path)
 	 * @throws Nette\IOException
 	 * @throws Nette\InvalidStateException if the target file or directory already exist
 	 */
-	public static function rename(string $name, string $newName, bool $overwrite = TRUE)
+	public static function rename(string $name, string $newName, bool $overwrite = true)
 	{
 		if (!$overwrite && file_exists($newName)) {
 			throw new Nette\InvalidStateException("File or directory '$newName' already exists.");
@@ -122,7 +122,7 @@ public static function rename(string $name, string $newName, bool $overwrite = T
 	public static function read(string $file): string
 	{
 		$content = @file_get_contents($file); // @ is escalated to exception
-		if ($content === FALSE) {
+		if ($content === false) {
 			throw new Nette\IOException("Unable to read file '$file'.");
 		}
 		return $content;
@@ -131,17 +131,17 @@ public static function read(string $file): string
 
 	/**
 	 * Writes a string to a file.
-	 * @param  int|NULL $mode
+	 * @param  int|null $mode
 	 * @return void
 	 * @throws Nette\IOException
 	 */
 	public static function write(string $file, string $content, $mode = 0666)
 	{
 		static::createDir(dirname($file));
-		if (@file_put_contents($file, $content) === FALSE) { // @ is escalated to exception
+		if (@file_put_contents($file, $content) === false) { // @ is escalated to exception
 			throw new Nette\IOException("Unable to write file '$file'.");
 		}
-		if ($mode !== NULL && !@chmod($file, $mode)) { // @ is escalated to exception
+		if ($mode !== null && !@chmod($file, $mode)) { // @ is escalated to exception
 			throw new Nette\IOException("Unable to chmod file '$file'.");
 		}
 	}