coding style: fixes in code

Author: dg

src/Utils/DateTime.php

@@ -66,7 +66,7 @@ public static function from($time)
 	 */
 	public static function fromParts(int $year, int $month, int $day, int $hour = 0, int $minute = 0, float $second = 0)
 	{
-		$s = sprintf("%04d-%02d-%02d %02d:%02d:%02.5f", $year, $month, $day, $hour, $minute, $second);
+		$s = sprintf('%04d-%02d-%02d %02d:%02d:%02.5f', $year, $month, $day, $hour, $minute, $second);
 		if (!checkdate($month, $day, $year) || $hour < 0 || $hour > 23 || $minute < 0 || $minute > 59 || $second < 0 || $second >= 60) {
 			throw new Nette\InvalidArgumentException("Invalid date '$s'");
 		}

src/Utils/Html.php

@@ -28,18 +28,9 @@ class Html implements \ArrayAccess, \Countable, \IteratorAggregate, IHtmlString
 {
 	use Nette\SmartObject;
 
-	/** @var string  element's name */
-	private $name;
-
-	/** @var bool  is element empty? */
-	private $isEmpty;
-
 	/** @var array  element's attributes */
 	public $attrs = [];
 
-	/** @var array  of Html | string nodes */
-	protected $children = [];
-
 	/** @var bool  use XHTML syntax? */
 	public static $xhtml = false;
 
@@ -50,6 +41,15 @@ class Html implements \ArrayAccess, \Countable, \IteratorAggregate, IHtmlString
 		'isindex' => 1, 'wbr' => 1, 'command' => 1, 'track' => 1,
 	];
 
+	/** @var array  of Html | string nodes */
+	protected $children = [];
+
+	/** @var string  element's name */
+	private $name;
+
+	/** @var bool  is element empty? */
+	private $isEmpty;
+
 
 	/**
 	 * Static factory.
@@ -511,7 +511,7 @@ final public function __toString(): string
 		try {
 			return $this->render();
 		} catch (\Throwable $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

@@ -549,7 +549,7 @@ public function __toString(): string
 			if (func_num_args()) {
 				throw $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/Reflection.php

@@ -21,7 +21,7 @@ final class Reflection
 
 	private static $builtinTypes = [
 		'string' => 1, 'int' => 1, 'float' => 1, 'bool' => 1, 'array' => 1,
-		'callable' => 1, 'iterable' => 1, 'void' => 1
+		'callable' => 1, 'iterable' => 1, 'void' => 1,
 	];
 
 

src/Utils/Strings.php

@@ -192,7 +192,7 @@ public static function truncate(string $s, int $maxLen, string $append = "\u{202
 			if ($maxLen < 1) {
 				return $append;
 
-			} elseif ($matches = self::match($s, '#^.{1,'.$maxLen.'}(?=[\s\x00-/:-@\[-`{-~])#us')) {
+			} elseif ($matches = self::match($s, '#^.{1,' . $maxLen . '}(?=[\s\x00-/:-@\[-`{-~])#us')) {
 				return $matches[0] . $append;
 
 			} else {
@@ -316,7 +316,7 @@ public static function length(string $s): int
 	public static function trim(string $s, string $charlist = self::TRIM_CHARACTERS): string
 	{
 		$charlist = preg_quote($charlist, '#');
-		return self::replace($s, '#^['.$charlist.']+|['.$charlist.']+\z#u', '');
+		return self::replace($s, '#^[' . $charlist . ']+|[' . $charlist . ']+\z#u', '');
 	}
 
 
@@ -403,7 +403,7 @@ private static function pos(string $haystack, string $needle, int $nth = 1)
 				return 0;
 			}
 			$pos = 0;
-			while (false !== ($pos = strpos($haystack, $needle, $pos)) && --$nth) {
+			while (($pos = strpos($haystack, $needle, $pos)) !== false && --$nth) {
 				$pos++;
 			}
 		} else {
@@ -412,7 +412,7 @@ private static function pos(string $haystack, string $needle, int $nth = 1)
 				return $len;
 			}
 			$pos = $len - 1;
-			while (false !== ($pos = strrpos($haystack, $needle, $pos - $len)) && ++$nth) {
+			while (($pos = strrpos($haystack, $needle, $pos - $len)) !== false && ++$nth) {
 				$pos--;
 			}
 		}
@@ -501,7 +501,7 @@ public static function pcre(string $func, array $args)
 		});
 
 		if (($code = preg_last_error()) // run-time error, but preg_last_error & return code are liars
-			&& ($res === null || !in_array($func, ['preg_filter', 'preg_replace_callback', 'preg_replace']))
+			&& ($res === null || !in_array($func, ['preg_filter', 'preg_replace_callback', 'preg_replace'], true))
 		) {
 			throw new RegexpException(($messages[$code] ?? 'Unknown error')
 				. ' (pattern: ' . implode(' or ', (array) $args[0]) . ')', $code);

tests/Utils/Callback.closure.phpt

@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Test
 {
-	function __invoke($a)
+	public function __invoke($a)
 	{
 		return __METHOD__ . $a;
 	}

tests/Utils/Html.data.phpt

@@ -49,7 +49,7 @@ test(function () { // special values
 test(function () { // setter
 	$el = Html::el('div');
 	$el->setAttribute('data-x', 'x');
-	$el->setAttribute('data-list', [1,2,3]);
+	$el->setAttribute('data-list', [1, 2, 3]);
 	$el->setAttribute('data-arr', ['a' => 1]);
 	$el->setAttribute('top', null);
 	$el->setAttribute('active', false);

tests/Utils/Object.closureProperty.phpt

@@ -19,7 +19,7 @@ class TestClass extends Nette\Object
 	private $private;
 
 
-	function __construct($func)
+	public function __construct($func)
 	{
 		$this->public = $this->onPublic = $this->protected = $this->private = $func;
 	}

tests/Utils/Object.events.phpt

@@ -31,7 +31,7 @@ function handler($obj)
 
 class Handler
 {
-	function __invoke($obj)
+	public function __invoke($obj)
 	{
 		$obj->counter++;
 	}

tests/Utils/Object.extensionMethod.phpt

@@ -13,7 +13,8 @@ require __DIR__ . '/../bootstrap.php';
 
 class TestClass extends Nette\Object
 {
-	public $foo = 'Hello', $bar = 'World';
+	public $foo = 'Hello';
+	public $bar = 'World';
 }