added type hints

dg · dg · commit 832f223acd76 · 2018-03-22T15:05:29.000+01:00
diff --git a/src/Application/Routers/RouteList.php b/src/Application/Routers/RouteList.php
@@ -24,7 +24,7 @@ class RouteList extends Nette\Utils\ArrayList implements Nette\Application\IRout
 	private $module;
 
 
-	public function __construct($module = null)
+	public function __construct(string $module = null)
 	{
 		$this->module = $module ? $module . ':' : '';
 	}
diff --git a/src/Application/UI/ComponentReflection.php b/src/Application/UI/ComponentReflection.php
@@ -144,7 +144,7 @@ public function hasCallableMethod(string $method): bool
 	}
 
 
-	public static function combineArgs(\ReflectionFunctionAbstract $method, $args): array
+	public static function combineArgs(\ReflectionFunctionAbstract $method, array $args): array
 	{
 		$res = [];
 		foreach ($method->getParameters() as $i => $param) {
diff --git a/src/Application/UI/Control.php b/src/Application/UI/Control.php
@@ -89,7 +89,7 @@ public function flashMessage($message, string $type = 'info'): \stdClass
 	/**
 	 * Forces control or its snippet to repaint.
 	 */
-	public function redrawControl($snippet = null, bool $redraw = true): void
+	public function redrawControl(string $snippet = null, bool $redraw = true): void
 	{
 		if ($redraw) {
 			$this->invalidSnippets[$snippet === null ? "\0" : $snippet] = true;
diff --git a/src/Application/UI/Form.php b/src/Application/UI/Form.php
@@ -24,7 +24,7 @@ class Form extends Nette\Forms\Form implements ISignalReceiver
 	/**
 	 * Application form constructor.
 	 */
-	public function __construct(Nette\ComponentModel\IContainer $parent = null, $name = null)
+	public function __construct(Nette\ComponentModel\IContainer $parent = null, string $name = null)
 	{
 		parent::__construct();
 		if ($parent !== null) {
diff --git a/src/Application/UI/Link.php b/src/Application/UI/Link.php
@@ -33,7 +33,7 @@ final class Link
 	/**
 	 * Link specification.
 	 */
-	public function __construct(Component $component, $destination, array $params = [])
+	public function __construct(Component $component, string $destination, array $params = [])
 	{
 		$this->component = $component;
 		$this->destination = $destination;
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
@@ -899,7 +899,7 @@ public static function parseDestination(string $destination): array
 	 * Converts Request to URL.
 	 * @internal
 	 */
-	protected function requestToUrl(Application\Request $request, $relative = null): string
+	protected function requestToUrl(Application\Request $request, bool $relative = null): string
 	{
 		if ($this->refUrlCache === null) {
 			$this->refUrlCache = new Http\Url($this->httpRequest->getUrl());
@@ -1056,7 +1056,7 @@ public static function getPersistentComponents(): array
 	/**
 	 * Saves state information for all subcomponents to $this->globalState.
 	 */
-	protected function getGlobalState($forClass = null): array
+	protected function getGlobalState(string $forClass = null): array
 	{
 		$sinces = &$this->globalStateSinces;
 
diff --git a/src/Bridges/ApplicationDI/ApplicationExtension.php b/src/Bridges/ApplicationDI/ApplicationExtension.php
@@ -41,7 +41,7 @@ final class ApplicationExtension extends Nette\DI\CompilerExtension
 	private $tempFile;
 
 
-	public function __construct(bool $debugMode = false, array $scanDirs = null, $tempDir = null)
+	public function __construct(bool $debugMode = false, array $scanDirs = null, string $tempDir = null)
 	{
 		$this->defaults['debugger'] = interface_exists(Tracy\IBarPanel::class);
 		$this->defaults['scanDirs'] = (array) $scanDirs;
diff --git a/src/Bridges/ApplicationDI/LatteExtension.php b/src/Bridges/ApplicationDI/LatteExtension.php
@@ -32,7 +32,7 @@ final class LatteExtension extends Nette\DI\CompilerExtension
 	private $tempDir;
 
 
-	public function __construct($tempDir, bool $debugMode = false)
+	public function __construct(string $tempDir, bool $debugMode = false)
 	{
 		$this->tempDir = $tempDir;
 		$this->debugMode = $debugMode;
diff --git a/src/Bridges/ApplicationDI/PresenterFactoryCallback.php b/src/Bridges/ApplicationDI/PresenterFactoryCallback.php
@@ -28,15 +28,15 @@ final class PresenterFactoryCallback
 	private $touchToRefresh;
 
 
-	public function __construct(Nette\DI\Container $container, $invalidLinkMode, $touchToRefresh)
+	public function __construct(Nette\DI\Container $container, int $invalidLinkMode, ?string $touchToRefresh)
 	{
 		$this->container = $container;
 		$this->invalidLinkMode = $invalidLinkMode;
 		$this->touchToRefresh = $touchToRefresh;
 	}
 
 
-	public function __invoke($class): Nette\Application\IPresenter
+	public function __invoke(string $class): Nette\Application\IPresenter
 	{
 		$services = array_keys($this->container->findByTag('nette.presenter'), $class, true);
 		if (count($services) > 1) {
diff --git a/src/Bridges/ApplicationLatte/Template.php b/src/Bridges/ApplicationLatte/Template.php
@@ -45,7 +45,7 @@ final public function getLatte(): Latte\Engine
 	/**
 	 * Renders template to output.
 	 */
-	public function render($file = null, array $params = []): void
+	public function render(string $file = null, array $params = []): void
 	{
 		$this->latte->render($file ?: $this->file, $params + $this->params);
 	}
@@ -54,7 +54,7 @@ public function render($file = null, array $params = []): void
 	/**
 	 * Renders template to output.
 	 */
-	public function renderToString($file = null, array $params = []): string
+	public function renderToString(string $file = null, array $params = []): string
 	{
 		return $this->latte->renderToString($file ?: $this->file, $params + $this->params);
 	}
@@ -128,7 +128,7 @@ final public function getFile(): ?string
 	 * Adds new template parameter.
 	 * @return static
 	 */
-	public function add($name, $value)
+	public function add(string $name, $value)
 	{
 		if (array_key_exists($name, $this->params)) {
 			throw new Nette\InvalidStateException("The variable '$name' already exists.");
diff --git a/src/Bridges/ApplicationLatte/UIMacros.php b/src/Bridges/ApplicationLatte/UIMacros.php
@@ -30,7 +30,7 @@ final class UIMacros extends Latte\Macros\MacroSet
 	private $extends;
 
 
-	public static function install(Latte\Compiler $compiler)
+	public static function install(Latte\Compiler $compiler): void
 	{
 		$me = new static($compiler);
 		$me->addMacro('control', [$me, 'macroControl']);
diff --git a/tests/Bridges.DI/ApplicationExtension.invalidLink.phpt b/tests/Bridges.DI/ApplicationExtension.invalidLink.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 require __DIR__ . '/files/MyPresenter.php';
 
 
-function createCompiler($config)
+function createCompiler(string $config): DI\Compiler
 {
 	$compiler = new DI\Compiler;
 	$compiler->loadConfig(Tester\FileMock::create($config, 'neon'));
diff --git a/tests/Bridges.DI/LatteExtension.basic.phpt b/tests/Bridges.DI/LatteExtension.basic.phpt
@@ -100,7 +100,7 @@ services:
 ', 'neon'));
 
 $compiler = new DI\Compiler;
-$compiler->addExtension('latte', new Nette\Bridges\ApplicationDI\LatteExtension(null, false));
+$compiler->addExtension('latte', new Nette\Bridges\ApplicationDI\LatteExtension('', false));
 $compiler->addExtension('another', new AnotherExtension);
 $code = $compiler->addConfig($config)->compile();
 eval($code);
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($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\Application\IRouter $route, $url, $expectedPresenter = null, $expectedParams = [], $expectedUrl = null)
+function testRouteIn(Nette\Application\IRouter $route, string $url, string $expectedPresenter = null, array $expectedParams = [], string $expectedUrl = null): void
 {
 	$url = new Nette\Http\UrlScript("http://example.com$url");
 	$url->setScriptPath('/');
@@ -41,7 +41,7 @@ function testRouteIn(Nette\Application\IRouter $route, $url, $expectedPresenter
 }
 
 
-function testRouteOut(Nette\Application\IRouter $route, $presenter, $params = [])
+function testRouteOut(Nette\Application\IRouter $route, string $presenter, array $params = []): ?string
 {
 	$url = new Nette\Http\Url('http://example.com');
 	$request = new Nette\Application\Request($presenter, 'GET', $params);
diff --git a/tests/UI/Component.isLinkCurrent().asserts.php b/tests/UI/Component.isLinkCurrent().asserts.php
@@ -11,7 +11,7 @@
 use Tester\Assert;
 
 
-function callIsLinkCurrent(Application\Request $request, $destination, array $args)
+function callIsLinkCurrent(Application\Request $request, string $destination, array $args): bool
 {
 	$presenter = new TestPresenter;
 	return callIsComponentLinkCurrent($presenter, $presenter, $request, $destination, $args);
@@ -24,7 +24,7 @@ function callIsComponentLinkCurrent(
 	Application\Request $request,
 	$destination,
 	array $args
-) {
+): bool {
 	$url = new Http\UrlScript('http://localhost/index.php');
 	$url->setScriptPath('/index.php');
 	$presenterFactory = Mockery::mock(Nette\Application\IPresenterFactory::class);
diff --git a/tests/UI/ComponentReflection.convertType.phpt b/tests/UI/ComponentReflection.convertType.phpt
@@ -21,7 +21,7 @@ require __DIR__ . '/../bootstrap.php';
 //   object               pass   deny       deny   pass/deny  deny
 
 
-function testIt($type, $val, $res = null)
+function testIt(string $type, $val, $res = null)
 {
 	$isClass = class_exists($type);
 	if (func_num_args() === 3) {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -21,7 +21,7 @@
 }, ob_get_level());
 
 
-function test(\Closure $function)
+function test(\Closure $function): void
 {
 	$function();
 	Mockery::close();
@@ -33,13 +33,13 @@ class Notes
 	public static $notes = [];
 
 
-	public static function add($message)
+	public static function add($message): void
 	{
 		self::$notes[] = $message;
 	}
 
 
-	public static function fetch()
+	public static function fetch(): array
 	{
 		$res = self::$notes;
 		self::$notes = [];

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class RouteList extends Nette\Utils\ArrayList implements Nette\Application\IRout`
`24`	`24`	`private $module;`
`25`	`25`
`26`	`26`
`27`		`- public function __construct($module = null)`
	`27`	`+ public function __construct(string $module = null)`
`28`	`28`	`{`
`29`	`29`	`$this->module = $module ? $module . ':' : '';`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function hasCallableMethod(string $method): bool`
`144`	`144`	`}`
`145`	`145`
`146`	`146`
`147`		`- public static function combineArgs(\ReflectionFunctionAbstract $method, $args): array`
	`147`	`+ public static function combineArgs(\ReflectionFunctionAbstract $method, array $args): array`
`148`	`148`	`{`
`149`	`149`	`$res = [];`
`150`	`150`	`foreach ($method->getParameters() as $i => $param) {`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function flashMessage($message, string $type = 'info'): \stdClass`
`89`	`89`	`/**`
`90`	`90`	`* Forces control or its snippet to repaint.`
`91`	`91`	`*/`
`92`		`- public function redrawControl($snippet = null, bool $redraw = true): void`
	`92`	`+ public function redrawControl(string $snippet = null, bool $redraw = true): void`
`93`	`93`	`{`
`94`	`94`	`if ($redraw) {`
`95`	`95`	`$this->invalidSnippets[$snippet === null ? "\0" : $snippet] = true;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class Form extends Nette\Forms\Form implements ISignalReceiver`
`24`	`24`	`/**`
`25`	`25`	`* Application form constructor.`
`26`	`26`	`*/`
`27`		`- public function __construct(Nette\ComponentModel\IContainer $parent = null, $name = null)`
	`27`	`+ public function __construct(Nette\ComponentModel\IContainer $parent = null, string $name = null)`
`28`	`28`	`{`
`29`	`29`	`parent::__construct();`
`30`	`30`	`if ($parent !== null) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ final class Link`
`33`	`33`	`/**`
`34`	`34`	`* Link specification.`
`35`	`35`	`*/`
`36`		`- public function __construct(Component $component, $destination, array $params = [])`
	`36`	`+ public function __construct(Component $component, string $destination, array $params = [])`
`37`	`37`	`{`
`38`	`38`	`$this->component = $component;`
`39`	`39`	`$this->destination = $destination;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ final class ApplicationExtension extends Nette\DI\CompilerExtension`
`41`	`41`	`private $tempFile;`
`42`	`42`
`43`	`43`
`44`		`- public function __construct(bool $debugMode = false, array $scanDirs = null, $tempDir = null)`
	`44`	`+ public function __construct(bool $debugMode = false, array $scanDirs = null, string $tempDir = null)`
`45`	`45`	`{`
`46`	`46`	`$this->defaults['debugger'] = interface_exists(Tracy\IBarPanel::class);`
`47`	`47`	`$this->defaults['scanDirs'] = (array) $scanDirs;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ final class LatteExtension extends Nette\DI\CompilerExtension`
`32`	`32`	`private $tempDir;`
`33`	`33`
`34`	`34`
`35`		`- public function __construct($tempDir, bool $debugMode = false)`
	`35`	`+ public function __construct(string $tempDir, bool $debugMode = false)`
`36`	`36`	`{`
`37`	`37`	`$this->tempDir = $tempDir;`
`38`	`38`	`$this->debugMode = $debugMode;`
Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,15 @@ final class PresenterFactoryCallback`
`28`	`28`	`private $touchToRefresh;`
`29`	`29`
`30`	`30`
`31`		`- public function __construct(Nette\DI\Container $container, $invalidLinkMode, $touchToRefresh)`
	`31`	`+ public function __construct(Nette\DI\Container $container, int $invalidLinkMode, ?string $touchToRefresh)`
`32`	`32`	`{`
`33`	`33`	`$this->container = $container;`
`34`	`34`	`$this->invalidLinkMode = $invalidLinkMode;`
`35`	`35`	`$this->touchToRefresh = $touchToRefresh;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`
`39`		`- public function __invoke($class): Nette\Application\IPresenter`
	`39`	`+ public function __invoke(string $class): Nette\Application\IPresenter`
`40`	`40`	`{`
`41`	`41`	`$services = array_keys($this->container->findByTag('nette.presenter'), $class, true);`
`42`	`42`	`if (count($services) > 1) {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ final public function getLatte(): Latte\Engine`
`45`	`45`	`/**`
`46`	`46`	`* Renders template to output.`
`47`	`47`	`*/`
`48`		`- public function render($file = null, array $params = []): void`
	`48`	`+ public function render(string $file = null, array $params = []): void`
`49`	`49`	`{`
`50`	`50`	`$this->latte->render($file ?: $this->file, $params + $this->params);`
`51`	`51`	`}`
`@@ -54,7 +54,7 @@ public function render($file = null, array $params = []): void`
`54`	`54`	`/**`
`55`	`55`	`* Renders template to output.`
`56`	`56`	`*/`
`57`		`- public function renderToString($file = null, array $params = []): string`
	`57`	`+ public function renderToString(string $file = null, array $params = []): string`
`58`	`58`	`{`
`59`	`59`	`return $this->latte->renderToString($file ?: $this->file, $params + $this->params);`
`60`	`60`	`}`
`@@ -128,7 +128,7 @@ final public function getFile(): ?string`
`128`	`128`	`* Adds new template parameter.`
`129`	`129`	`* @return static`
`130`	`130`	`*/`
`131`		`- public function add($name, $value)`
	`131`	`+ public function add(string $name, $value)`
`132`	`132`	`{`
`133`	`133`	`if (array_key_exists($name, $this->params)) {`
`134`	`134`	`throw new Nette\InvalidStateException("The variable '$name' already exists.");`