cs nullable typehints

dg · dg · commit dc3f9127bb0a · 2021-12-12T17:29:06.000+01:00
diff --git a/src/Application/ErrorPresenter.php b/src/Application/ErrorPresenter.php
@@ -26,7 +26,7 @@ final class ErrorPresenter implements Application\IPresenter
 	private $logger;
 
 
-	public function __construct(ILogger $logger = null)
+	public function __construct(?ILogger $logger = null)
 	{
 		$this->logger = $logger;
 	}
diff --git a/src/Application/LinkGenerator.php b/src/Application/LinkGenerator.php
@@ -31,7 +31,7 @@ final class LinkGenerator
 	private $presenterFactory;
 
 
-	public function __construct(Router $router, UrlScript $refUrl, IPresenterFactory $presenterFactory = null)
+	public function __construct(Router $router, UrlScript $refUrl, ?IPresenterFactory $presenterFactory = null)
 	{
 		$this->router = $router;
 		$this->refUrl = $refUrl;
diff --git a/src/Application/MicroPresenter.php b/src/Application/MicroPresenter.php
@@ -38,9 +38,9 @@ final class MicroPresenter implements Application\IPresenter
 
 
 	public function __construct(
-		Nette\DI\Container $context = null,
-		Http\IRequest $httpRequest = null,
-		Router $router = null
+		?Nette\DI\Container $context = null,
+		?Http\IRequest $httpRequest = null,
+		?Router $router = null
 	) {
 		$this->context = $context;
 		$this->httpRequest = $httpRequest;
@@ -124,7 +124,7 @@ public function run(Application\Request $request): Application\Response
 	/**
 	 * Template factory.
 	 */
-	public function createTemplate(string $class = null, callable $latteFactory = null): Application\UI\Template
+	public function createTemplate(?string $class = null, ?callable $latteFactory = null): Application\UI\Template
 	{
 		$latte = $latteFactory
 			? $latteFactory()
diff --git a/src/Application/PresenterFactory.php b/src/Application/PresenterFactory.php
@@ -35,7 +35,7 @@ class PresenterFactory implements IPresenterFactory
 	/**
 	 * @param  callable(string): IPresenter  $factory
 	 */
-	public function __construct(callable $factory = null)
+	public function __construct(?callable $factory = null)
 	{
 		$this->factory = $factory ?: function (string $class): IPresenter { return new $class; };
 	}
diff --git a/src/Application/Request.php b/src/Application/Request.php
@@ -61,7 +61,7 @@ final class Request
 	 */
 	public function __construct(
 		string $name,
-		string $method = null,
+		?string $method = null,
 		array $params = [],
 		array $post = [],
 		array $files = [],
@@ -142,7 +142,7 @@ public function setPost(array $params)
 	 * If no key is passed, returns the entire array.
 	 * @return mixed
 	 */
-	public function getPost(string $key = null)
+	public function getPost(?string $key = null)
 	{
 		return func_num_args() === 0
 			? $this->post
diff --git a/src/Application/Responses/FileResponse.php b/src/Application/Responses/FileResponse.php
@@ -37,8 +37,8 @@ final class FileResponse implements Nette\Application\Response
 
 	public function __construct(
 		string $file,
-		string $name = null,
-		string $contentType = null,
+		?string $name = null,
+		?string $contentType = null,
 		bool $forceDownload = true
 	) {
 		if (!is_file($file) || !is_readable($file)) {
diff --git a/src/Application/Responses/JsonResponse.php b/src/Application/Responses/JsonResponse.php
@@ -26,7 +26,7 @@ final class JsonResponse implements Nette\Application\Response
 	private $contentType;
 
 
-	public function __construct($payload, string $contentType = null)
+	public function __construct($payload, ?string $contentType = null)
 	{
 		$this->payload = $payload;
 		$this->contentType = $contentType ?: 'application/json';
diff --git a/src/Application/Routers/RouteList.php b/src/Application/Routers/RouteList.php
@@ -23,7 +23,7 @@ class RouteList extends Nette\Routing\RouteList implements Nette\Routing\Router,
 	private $module;
 
 
-	public function __construct(string $module = null)
+	public function __construct(?string $module = null)
 	{
 		parent::__construct();
 		$this->module = $module ? $module . ':' : null;
diff --git a/src/Application/UI/Component.php b/src/Application/UI/Component.php
@@ -289,7 +289,7 @@ public function lazyLink(string $destination, $args = []): Link
 	 * @param  array|mixed  $args
 	 * @throws InvalidLinkException
 	 */
-	public function isLinkCurrent(string $destination = null, $args = []): bool
+	public function isLinkCurrent(?string $destination = null, $args = []): bool
 	{
 		if ($destination !== null) {
 			$args = func_num_args() < 3 && is_array($args)
diff --git a/src/Application/UI/ComponentReflection.php b/src/Application/UI/ComponentReflection.php
@@ -36,7 +36,7 @@ final class ComponentReflection extends \ReflectionClass
 	 * Returns array of classes persistent parameters. They have public visibility,
 	 * are non-static and have annotation @persistent.
 	 */
-	public function getPersistentParams(string $class = null): array
+	public function getPersistentParams(?string $class = null): array
 	{
 		$class = $class ?? $this->getName();
 		$params = &self::$ppCache[$class];
@@ -75,7 +75,7 @@ public function getPersistentParams(string $class = null): array
 	}
 
 
-	public function getPersistentComponents(string $class = null): array
+	public function getPersistentComponents(?string $class = null): array
 	{
 		$class = $class ?? $this->getName();
 		$components = &self::$pcCache[$class];
diff --git a/src/Application/UI/Control.php b/src/Application/UI/Control.php
@@ -123,7 +123,7 @@ public function flashMessage($message, string $type = 'info'): \stdClass
 	/**
 	 * Forces control or its snippet to repaint.
 	 */
-	public function redrawControl(string $snippet = null, bool $redraw = true): void
+	public function redrawControl(?string $snippet = null, bool $redraw = true): void
 	{
 		if ($redraw) {
 			$this->invalidSnippets[$snippet ?? "\0"] = true;
@@ -140,7 +140,7 @@ public function redrawControl(string $snippet = null, bool $redraw = true): void
 	/**
 	 * Is required to repaint the control or its snippet?
 	 */
-	public function isControlInvalid(string $snippet = null): bool
+	public function isControlInvalid(?string $snippet = null): bool
 	{
 		if ($snippet !== null) {
 			return $this->invalidSnippets[$snippet] ?? isset($this->invalidSnippets["\0"]);
diff --git a/src/Application/UI/Form.php b/src/Application/UI/Form.php
@@ -27,7 +27,7 @@ class Form extends Nette\Forms\Form implements SignalReceiver
 	/**
 	 * Application form constructor.
 	 */
-	public function __construct(Nette\ComponentModel\IContainer $parent = null, string $name = null)
+	public function __construct(?Nette\ComponentModel\IContainer $parent = null, ?string $name = null)
 	{
 		parent::__construct();
 		if ($parent !== null) {
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
@@ -451,7 +451,7 @@ public function setLayout($layout)
 	 * @throws Nette\Application\AbortException
 	 * @return never
 	 */
-	public function sendTemplate(Template $template = null): void
+	public function sendTemplate(?Template $template = null): void
 	{
 		$template = $template ?? $this->getTemplate();
 		if (!$template->getFile()) {
@@ -675,7 +675,7 @@ public function forward($destination, $args = []): void
 	 * @throws Nette\Application\AbortException
 	 * @return never
 	 */
-	public function redirectUrl(string $url, int $httpCode = null): void
+	public function redirectUrl(string $url, ?int $httpCode = null): void
 	{
 		if ($this->isAjax()) {
 			$this->payload->redirect = $url;
@@ -716,7 +716,7 @@ final public function getLastCreatedRequestFlag(string $flag): bool
 	 * @param  mixed  ...$args
 	 * @throws Nette\Application\AbortException
 	 */
-	public function canonicalize(string $destination = null, ...$args): void
+	public function canonicalize(?string $destination = null, ...$args): void
 	{
 		$request = $this->request;
 		if ($this->isAjax() || (!$request->isMethod('get') && !$request->isMethod('head'))) {
@@ -754,7 +754,7 @@ public function canonicalize(string $destination = null, ...$args): void
 	 * @param  string  $expire  like '20 minutes'
 	 * @throws Nette\Application\AbortException
 	 */
-	public function lastModified($lastModified, string $etag = null, string $expire = null): void
+	public function lastModified($lastModified, ?string $etag = null, ?string $expire = null): void
 	{
 		if ($expire !== null) {
 			$this->httpResponse->setExpiration($expire);
@@ -992,7 +992,7 @@ public static function parseDestination(string $destination): array
 	 * Converts Request to URL.
 	 * @internal
 	 */
-	protected function requestToUrl(Application\Request $request, bool $relative = null): string
+	protected function requestToUrl(Application\Request $request, ?bool $relative = null): string
 	{
 		if ($this->refUrlCache === null) {
 			$url = $this->httpRequest->getUrl();
@@ -1033,7 +1033,7 @@ public static function argsToParams(
 		string $method,
 		array &$args,
 		array $supplemental = [],
-		array &$missing = null
+		?array &$missing = null
 	): void {
 		$i = 0;
 		$rm = new \ReflectionMethod($class, $method);
@@ -1176,7 +1176,7 @@ public static function getPersistentComponents(): array
 	/**
 	 * Saves state information for all subcomponents to $this->globalState.
 	 */
-	protected function getGlobalState(string $forClass = null): array
+	protected function getGlobalState(?string $forClass = null): array
 	{
 		$sinces = &$this->globalStateSinces;
 
@@ -1251,7 +1251,7 @@ protected function getGlobalState(string $forClass = null): array
 	/**
 	 * Saves state informations for next request.
 	 */
-	public function saveState(array &$params, ComponentReflection $reflection = null): void
+	public function saveState(array &$params, ?ComponentReflection $reflection = null): void
 	{
 		($reflection ?: static::getReflection())->saveState($this, $params);
 	}
@@ -1438,7 +1438,7 @@ final public function getHttpResponse(): Http\IResponse
 	/**
 	 * @return Http\Session|Http\SessionSection
 	 */
-	final public function getSession(string $namespace = null)
+	final public function getSession(?string $namespace = null)
 	{
 		if (!$this->session) {
 			throw new Nette\InvalidStateException('Service Session has not been set.');
diff --git a/src/Application/UI/TemplateFactory.php b/src/Application/UI/TemplateFactory.php
@@ -15,7 +15,7 @@
  */
 interface TemplateFactory
 {
-	function createTemplate(Control $control = null): Template;
+	function createTemplate(?Control $control = null): Template;
 }
 
 
diff --git a/src/Application/exceptions.php b/src/Application/exceptions.php
@@ -46,7 +46,7 @@ class BadRequestException extends \Exception
 	protected $code = Http\IResponse::S404_NOT_FOUND;
 
 
-	public function __construct(string $message = '', int $httpCode = 0, \Throwable $previous = null)
+	public function __construct(string $message = '', int $httpCode = 0, ?\Throwable $previous = null)
 	{
 		parent::__construct($message, $httpCode ?: $this->code, $previous);
 	}
diff --git a/src/Bridges/ApplicationDI/ApplicationExtension.php b/src/Bridges/ApplicationDI/ApplicationExtension.php
@@ -40,9 +40,9 @@ final class ApplicationExtension extends Nette\DI\CompilerExtension
 
 	public function __construct(
 		bool $debugMode = false,
-		array $scanDirs = null,
-		string $tempDir = null,
-		Nette\Loaders\RobotLoader $robotLoader = null
+		?array $scanDirs = null,
+		?string $tempDir = null,
+		?Nette\Loaders\RobotLoader $robotLoader = null
 	) {
 		$this->debugMode = $debugMode;
 		$this->scanDirs = (array) $scanDirs;
diff --git a/src/Bridges/ApplicationLatte/Template.php b/src/Bridges/ApplicationLatte/Template.php
@@ -40,7 +40,7 @@ final public function getLatte(): Latte\Engine
 	/**
 	 * Renders template to output.
 	 */
-	public function render(string $file = null, array $params = []): void
+	public function render(?string $file = null, array $params = []): void
 	{
 		Nette\Utils\Arrays::toObject($params, $this);
 		$this->latte->render($file ?: $this->file, $this);
@@ -50,7 +50,7 @@ public function render(string $file = null, array $params = []): void
 	/**
 	 * Renders template to output.
 	 */
-	public function renderToString(string $file = null, array $params = []): string
+	public function renderToString(?string $file = null, array $params = []): string
 	{
 		Nette\Utils\Arrays::toObject($params, $this);
 		return $this->latte->renderToString($file ?: $this->file, $this);
diff --git a/src/Bridges/ApplicationLatte/TemplateFactory.php b/src/Bridges/ApplicationLatte/TemplateFactory.php
@@ -42,9 +42,9 @@ class TemplateFactory implements UI\TemplateFactory
 
 	public function __construct(
 		LatteFactory $latteFactory,
-		Nette\Http\IRequest $httpRequest = null,
-		Nette\Security\User $user = null,
-		Nette\Caching\Storage $cacheStorage = null,
+		?Nette\Http\IRequest $httpRequest = null,
+		?Nette\Security\User $user = null,
+		?Nette\Caching\Storage $cacheStorage = null,
 		$templateClass = null
 	) {
 		$this->latteFactory = $latteFactory;
@@ -60,7 +60,7 @@ public function __construct(
 
 
 	/** @return Template */
-	public function createTemplate(UI\Control $control = null, string $class = null): UI\Template
+	public function createTemplate(?UI\Control $control = null, ?string $class = null): UI\Template
 	{
 		$class = $class ?? $this->templateClass;
 		if (!is_a($class, Template::class, true)) {
diff --git a/src/Bridges/ApplicationLatte/UIRuntime.php b/src/Bridges/ApplicationLatte/UIRuntime.php
@@ -38,7 +38,7 @@ public static function initialize(Latte\Runtime\Template $template, &$parentName
 	}
 
 
-	public static function printClass(Latte\Runtime\Template $template, string $parent = null): void
+	public static function printClass(Latte\Runtime\Template $template, ?string $parent = null): void
 	{
 		$blueprint = new Latte\Runtime\Blueprint;
 		$name = 'Template';
diff --git a/src/Bridges/ApplicationTracy/RoutingPanel.php b/src/Bridges/ApplicationTracy/RoutingPanel.php
@@ -89,7 +89,7 @@ private function analyse(
 		Routing\Router $router,
 		Nette\Http\IRequest $httpRequest,
 		string $module = '',
-		string $path = null,
+		?string $path = null,
 		bool $parentMatches = true,
 		int $level = -1,
 		int $flag = 0
diff --git a/tests/Application/Presenter.twoDomains.phpt b/tests/Application/Presenter.twoDomains.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class TestPresenter extends Application\UI\Presenter
 {
-	protected function createTemplate(string $class = null): Application\UI\Template
+	protected function createTemplate(?string $class = null): Application\UI\Template
 	{
 	}
 }
diff --git a/tests/Bridges.Latte/TemplateFactory.customTemplate.phpt b/tests/Bridges.Latte/TemplateFactory.customTemplate.phpt
@@ -23,7 +23,7 @@ class TemplateMock extends Template
 	private $file = 'ko';
 
 
-	public function render(string $file = null, array $params = []): void
+	public function render(?string $file = null, array $params = []): void
 	{
 		echo strrev($this->file);
 	}
diff --git a/tests/Routers/Route.php b/tests/Routers/Route.php
@@ -9,7 +9,7 @@
 use Tester\Assert;
 
 
-function testRouteIn(Nette\Routing\Router $route, string $url, array $expectedParams = null, string $expectedUrl = null): void
+function testRouteIn(Nette\Routing\Router $route, string $url, ?array $expectedParams = null, ?string $expectedUrl = null): void
 {
 	$urlBuilder = new Nette\Http\Url("http://example.com$url");
 	$urlBuilder->appendQuery([
diff --git a/tests/UI/ComponentReflection.combineArgs.phpt b/tests/UI/ComponentReflection.combineArgs.phpt
@@ -25,11 +25,11 @@ class MyPresenter
 
 
 	public function hintsNulls(
-		int $int = null,
-		bool $bool = null,
-		string $str = null,
-		array $arr = null,
-		iterable $iter = null
+		?int $int = null,
+		?bool $bool = null,
+		?string $str = null,
+		?array $arr = null,
+		?iterable $iter = null
 	) {
 	}
 
@@ -54,7 +54,7 @@ class MyPresenter
 	}
 
 
-	public function objects(stdClass $req, ?stdClass $nullable, stdClass $opt = null)
+	public function objects(stdClass $req, ?stdClass $nullable, ?stdClass $opt = null)
 	{
 	}
 }
diff --git a/tests/UI/Presenter.link().php74.phpt b/tests/UI/Presenter.link().php74.phpt
@@ -253,7 +253,7 @@ class TestPresenter extends Application\UI\Presenter
 	}
 
 
-	public function actionHintsNulls(int $int = null, bool $bool = null, string $str = null, array $arr = null)
+	public function actionHintsNulls(?int $int = null, ?bool $bool = null, ?string $str = null, ?array $arr = null)
 	{
 	}
 
@@ -273,7 +273,7 @@ class TestPresenter extends Application\UI\Presenter
 	}
 
 
-	public function actionObjects(stdClass $req, ?stdClass $nullable, stdClass $opt = null)
+	public function actionObjects(stdClass $req, ?stdClass $nullable, ?stdClass $opt = null)
 	{
 	}
 
diff --git a/tests/UI/Presenter.link().phpt b/tests/UI/Presenter.link().phpt

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ final class ErrorPresenter implements Application\IPresenter`
`26`	`26`	`private $logger;`
`27`	`27`
`28`	`28`
`29`		`- public function __construct(ILogger $logger = null)`
	`29`	`+ public function __construct(?ILogger $logger = null)`
`30`	`30`	`{`
`31`	`31`	`$this->logger = $logger;`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ final class LinkGenerator`
`31`	`31`	`private $presenterFactory;`
`32`	`32`
`33`	`33`
`34`		`- public function __construct(Router $router, UrlScript $refUrl, IPresenterFactory $presenterFactory = null)`
	`34`	`+ public function __construct(Router $router, UrlScript $refUrl, ?IPresenterFactory $presenterFactory = null)`
`35`	`35`	`{`
`36`	`36`	`$this->router = $router;`
`37`	`37`	`$this->refUrl = $refUrl;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class PresenterFactory implements IPresenterFactory`
`35`	`35`	`/**`
`36`	`36`	`* @param callable(string): IPresenter $factory`
`37`	`37`	`*/`
`38`		`- public function __construct(callable $factory = null)`
	`38`	`+ public function __construct(?callable $factory = null)`
`39`	`39`	`{`
`40`	`40`	`$this->factory = $factory ?: function (string $class): IPresenter { return new $class; };`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ final class JsonResponse implements Nette\Application\Response`
`26`	`26`	`private $contentType;`
`27`	`27`
`28`	`28`
`29`		`- public function __construct($payload, string $contentType = null)`
	`29`	`+ public function __construct($payload, ?string $contentType = null)`
`30`	`30`	`{`
`31`	`31`	`$this->payload = $payload;`
`32`	`32`	`$this->contentType = $contentType ?: 'application/json';`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class RouteList extends Nette\Routing\RouteList implements Nette\Routing\Router,`
`23`	`23`	`private $module;`
`24`	`24`
`25`	`25`
`26`		`- public function __construct(string $module = null)`
	`26`	`+ public function __construct(?string $module = null)`
`27`	`27`	`{`
`28`	`28`	`parent::__construct();`
`29`	`29`	`$this->module = $module ? $module . ':' : null;`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public function lazyLink(string $destination, $args = []): Link`
`289`	`289`	`* @param array\|mixed $args`
`290`	`290`	`* @throws InvalidLinkException`
`291`	`291`	`*/`
`292`		`- public function isLinkCurrent(string $destination = null, $args = []): bool`
	`292`	`+ public function isLinkCurrent(?string $destination = null, $args = []): bool`
`293`	`293`	`{`
`294`	`294`	`if ($destination !== null) {`
`295`	`295`	`$args = func_num_args() < 3 && is_array($args)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ final class ComponentReflection extends \ReflectionClass`
`36`	`36`	`* Returns array of classes persistent parameters. They have public visibility,`
`37`	`37`	`* are non-static and have annotation @persistent.`
`38`	`38`	`*/`
`39`		`- public function getPersistentParams(string $class = null): array`
	`39`	`+ public function getPersistentParams(?string $class = null): array`
`40`	`40`	`{`
`41`	`41`	`$class = $class ?? $this->getName();`
`42`	`42`	`$params = &self::$ppCache[$class];`
`@@ -75,7 +75,7 @@ public function getPersistentParams(string $class = null): array`
`75`	`75`	`}`
`76`	`76`
`77`	`77`
`78`		`- public function getPersistentComponents(string $class = null): array`
	`78`	`+ public function getPersistentComponents(?string $class = null): array`
`79`	`79`	`{`
`80`	`80`	`$class = $class ?? $this->getName();`
`81`	`81`	`$components = &self::$pcCache[$class];`