strict type fixes

dg · dg · commit 6eea5a98b35e · 2017-01-19T14:26:47.000+01:00
diff --git a/src/Application/Application.php b/src/Application/Application.php
@@ -127,7 +127,7 @@ public function processRequest(Request $request)
 		$this->requests[] = $request;
 		$this->onRequest($this, $request);
 
-		if (!$request->isMethod($request::FORWARD) && !strcasecmp($request->getPresenterName(), $this->errorPresenter)) {
+		if (!$request->isMethod($request::FORWARD) && !strcasecmp($request->getPresenterName(), (string) $this->errorPresenter)) {
 			throw new BadRequestException('Invalid request. Presenter is not achievable.');
 		}
 
diff --git a/src/Application/LinkGenerator.php b/src/Application/LinkGenerator.php
@@ -79,7 +79,7 @@ public function link($dest, array $params = [])
 		$url = $this->router->constructUrl(new Request($presenter, NULL, $params), $this->refUrl);
 		if ($url === NULL) {
 			unset($params[UI\Presenter::ACTION_KEY]);
-			$params = urldecode(http_build_query($params, NULL, ', '));
+			$params = urldecode(http_build_query($params, '', ', '));
 			throw new UI\InvalidLinkException("No route for $dest($params)");
 		}
 		return $url . $frag;
diff --git a/src/Application/MicroPresenter.php b/src/Application/MicroPresenter.php
@@ -95,7 +95,7 @@ public function run(Application\Request $request)
 			if (!$templateSource instanceof \SplFileInfo) {
 				$response->getLatte()->setLoader(new Latte\Loaders\StringLoader);
 			}
-			$response->setFile($templateSource);
+			$response->setFile((string) $templateSource);
 		}
 		if ($response instanceof Application\UI\ITemplate) {
 			return new Responses\TextResponse($response);
diff --git a/src/Application/Responses/FileResponse.php b/src/Application/Responses/FileResponse.php
@@ -98,7 +98,7 @@ public function send(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $htt
 
 		if ($this->resuming) {
 			$httpResponse->setHeader('Accept-Ranges', 'bytes');
-			if (preg_match('#^bytes=(\d*)-(\d*)\z#', $httpRequest->getHeader('Range'), $matches)) {
+			if (preg_match('#^bytes=(\d*)-(\d*)\z#', (string) $httpRequest->getHeader('Range'), $matches)) {
 				list(, $start, $end) = $matches;
 				if ($start === '') {
 					$start = max(0, $filesize - $end);
@@ -115,7 +115,7 @@ public function send(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $htt
 				$httpResponse->setCode(206);
 				$httpResponse->setHeader('Content-Range', 'bytes ' . $start . '-' . $end . '/' . $filesize);
 				$length = $end - $start + 1;
-				fseek($handle, $start);
+				fseek($handle, (int) $start);
 
 			} else {
 				$httpResponse->setHeader('Content-Range', 'bytes 0-' . ($filesize - 1) . '/' . $filesize);
diff --git a/src/Application/Routers/Route.php b/src/Application/Routers/Route.php
@@ -288,7 +288,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 
 		if (isset($metadata[self::MODULE_KEY])) { // try split into module and [submodule:]presenter parts
 			$module = $metadata[self::MODULE_KEY];
-			if (isset($module['fixity']) && strncmp($presenter, $module[self::VALUE] . ':', strlen($module[self::VALUE]) + 1) === 0) {
+			if (isset($module['fixity'], $module[self::VALUE]) && strncmp($presenter, $module[self::VALUE] . ':', strlen($module[self::VALUE]) + 1) === 0) {
 				$a = strlen($module[self::VALUE]);
 			} else {
 				$a = strrpos($presenter, ':');
@@ -339,7 +339,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 				$params[$name] = $meta[self::FILTER_OUT]($params[$name]);
 			}
 
-			if (isset($meta[self::PATTERN]) && !preg_match($meta[self::PATTERN], rawurldecode($params[$name]))) {
+			if (isset($meta[self::PATTERN]) && !preg_match($meta[self::PATTERN], rawurldecode((string) $params[$name]))) {
 				return NULL; // pattern not match
 			}
 		}
@@ -576,7 +576,7 @@ private function setMask($mask, array $metadata)
 			}
 
 			$meta['filterTable2'] = empty($meta[self::FILTER_TABLE]) ? NULL : array_flip($meta[self::FILTER_TABLE]);
-			if (array_key_exists(self::VALUE, $meta)) {
+			if (isset($meta[self::VALUE])) {
 				if (isset($meta['filterTable2'][$meta[self::VALUE]])) {
 					$meta['defOut'] = $meta['filterTable2'][$meta[self::VALUE]];
 
diff --git a/src/Application/UI/Component.php b/src/Application/UI/Component.php
@@ -85,7 +85,7 @@ protected function validateParent(Nette\ComponentModel\IContainer $parent)
 	protected function tryCall($method, array $params)
 	{
 		$rc = $this->getReflection();
-		if ($rc->hasMethod($method)) {
+		if ($rc->hasMethod((string) $method)) {
 			$rm = $rc->getMethod($method);
 			if ($rm->isPublic() && !$rm->isAbstract() && !$rm->isStatic()) {
 				$this->checkRequirements($rm);
diff --git a/src/Application/UI/ComponentReflection.php b/src/Application/UI/ComponentReflection.php
@@ -196,7 +196,7 @@ public static function convertType(&$val, $type, $isClass = FALSE)
 	 */
 	public static function parseAnnotation(\Reflector $ref, $name)
 	{
-		if (!preg_match_all('#[\\s*]@' . preg_quote($name, '#') . '(?:\(\\s*([^)]*)\\s*\)|\\s|$)#', $ref->getDocComment(), $m)) {
+		if (!preg_match_all('#[\\s*]@' . preg_quote($name, '#') . '(?:\(\\s*([^)]*)\\s*\)|\\s|$)#', (string) $ref->getDocComment(), $m)) {
 			return FALSE;
 		}
 		static $tokens = ['true' => TRUE, 'false' => FALSE, 'null' => NULL];
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
@@ -498,7 +498,7 @@ public function findLayoutTemplateFile()
 	 */
 	public function formatLayoutTemplateFiles()
 	{
-		if (preg_match('#/|\\\\#', $this->layout)) {
+		if (preg_match('#/|\\\\#', (string) $this->layout)) {
 			return [$this->layout];
 		}
 		list($module, $presenter) = Helpers::splitName($this->getName());
@@ -891,7 +891,7 @@ protected function createRequest($component, $destination, array $args, $mode)
 				$action = self::DEFAULT_ACTION;
 			}
 
-			$current = ($action === '*' || strcasecmp($action, $this->action) === 0) && $presenterClass === get_class($this);
+			$current = ($action === '*' || strcasecmp($action, (string) $this->action) === 0) && $presenterClass === get_class($this);
 
 			$reflection = new ComponentReflection($presenterClass);
 
@@ -979,7 +979,7 @@ protected function createRequest($component, $destination, array $args, $mode)
 		$url = $this->router->constructUrl($this->lastCreatedRequest, $this->refUrlCache);
 		if ($url === NULL) {
 			unset($args[self::ACTION_KEY]);
-			$params = urldecode(http_build_query($args, NULL, ', '));
+			$params = urldecode(http_build_query($args, '', ', '));
 			throw new InvalidLinkException("No route for $presenter:$action($params)");
 		}
 
@@ -1231,7 +1231,7 @@ private function initGlobalParameters()
 		}
 
 		foreach ($params as $key => $value) {
-			if (!preg_match('#^((?:[a-z0-9_]+-)*)((?!\d+\z)[a-z0-9_]+)\z#i', $key, $matches)) {
+			if (!preg_match('#^((?:[a-z0-9_]+-)*)((?!\d+\z)[a-z0-9_]+)\z#i', (string) $key, $matches)) {
 				continue;
 			} elseif (!$matches[1]) {
 				$selfParams[$key] = $value;
diff --git a/src/Bridges/ApplicationDI/ApplicationExtension.php b/src/Bridges/ApplicationDI/ApplicationExtension.php
@@ -104,7 +104,7 @@ public function beforeCompile()
 		$counter = 0;
 		foreach ($this->findPresenters() as $class) {
 			if (empty($all[$class])) {
-				$all[$class] = $builder->addDefinition($this->prefix(++$counter))->setClass($class);
+				$all[$class] = $builder->addDefinition($this->prefix((string) ++$counter))->setClass($class);
 			}
 		}
 
diff --git a/src/Bridges/ApplicationLatte/TemplateFactory.php b/src/Bridges/ApplicationLatte/TemplateFactory.php
@@ -103,7 +103,7 @@ public function createTemplate(UI\Control $control = NULL)
 			$latte->addProvider('uiControl', $control);
 			$latte->addProvider('uiPresenter', $presenter);
 			$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($control));
-			$nonce = preg_match('#\s\'nonce-([\w+/]+=*)\'#', $presenter->getHttpResponse()->getHeader('Content-Security-Policy'), $m) ? $m[1] : NULL;
+			$nonce = preg_match('#\s\'nonce-([\w+/]+=*)\'#', (string) $presenter->getHttpResponse()->getHeader('Content-Security-Policy'), $m) ? $m[1] : NULL;
 			$latte->addProvider('uiNonce', $nonce);
 		}
 		$latte->addProvider('cacheStorage', $this->cacheStorage);
diff --git a/tests/Bridges.DI/ApplicationExtension.scan.phpt b/tests/Bridges.DI/ApplicationExtension.scan.phpt
@@ -81,5 +81,5 @@ test(function () {
 	Assert::count(1, array_keys($tags, 'Presenter2'));
 
 	$tmp = array_keys($tags, 'Presenter1');
-	Assert::same('test', $container->getService($tmp[0])->getView());
+	Assert::same('test', $container->getService((string) $tmp[0])->getView());
 });
diff --git a/tests/Routers/Route.php b/tests/Routers/Route.php
@@ -30,7 +30,7 @@ function testRouteIn(Nette\Application\IRouter $route, $url, $expectedPresenter
 		unset($params['extra']);
 		$request->setParameters($params);
 		$result = $route->constructUrl($request, $url);
-		$result = strncmp($result, 'http://example.com', 18) ? $result : substr($result, 18);
+		$result = $result && !strncmp($result, 'http://example.com', 18) ? substr($result, 18) : $result;
 		Assert::same($expectedUrl, $result);
 
 	} else { // not matched

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function processRequest(Request $request)`
`127`	`127`	`$this->requests[] = $request;`
`128`	`128`	`$this->onRequest($this, $request);`
`129`	`129`
`130`		`- if (!$request->isMethod($request::FORWARD) && !strcasecmp($request->getPresenterName(), $this->errorPresenter)) {`
	`130`	`+ if (!$request->isMethod($request::FORWARD) && !strcasecmp($request->getPresenterName(), (string) $this->errorPresenter)) {`
`131`	`131`	`throw new BadRequestException('Invalid request. Presenter is not achievable.');`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function link($dest, array $params = [])`
`79`	`79`	`$url = $this->router->constructUrl(new Request($presenter, NULL, $params), $this->refUrl);`
`80`	`80`	`if ($url === NULL) {`
`81`	`81`	`unset($params[UI\Presenter::ACTION_KEY]);`
`82`		`- $params = urldecode(http_build_query($params, NULL, ', '));`
	`82`	`+ $params = urldecode(http_build_query($params, '', ', '));`
`83`	`83`	`throw new UI\InvalidLinkException("No route for $dest($params)");`
`84`	`84`	`}`
`85`	`85`	`return $url . $frag;`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function run(Application\Request $request)`
`95`	`95`	`if (!$templateSource instanceof \SplFileInfo) {`
`96`	`96`	`$response->getLatte()->setLoader(new Latte\Loaders\StringLoader);`
`97`	`97`	`}`
`98`		`- $response->setFile($templateSource);`
	`98`	`+ $response->setFile((string) $templateSource);`
`99`	`99`	`}`
`100`	`100`	`if ($response instanceof Application\UI\ITemplate) {`
`101`	`101`	`return new Responses\TextResponse($response);`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re`
`288`	`288`
`289`	`289`	`if (isset($metadata[self::MODULE_KEY])) { // try split into module and [submodule:]presenter parts`
`290`	`290`	`$module = $metadata[self::MODULE_KEY];`
`291`		`- if (isset($module['fixity']) && strncmp($presenter, $module[self::VALUE] . ':', strlen($module[self::VALUE]) + 1) === 0) {`
	`291`	`+ if (isset($module['fixity'], $module[self::VALUE]) && strncmp($presenter, $module[self::VALUE] . ':', strlen($module[self::VALUE]) + 1) === 0) {`
`292`	`292`	`$a = strlen($module[self::VALUE]);`
`293`	`293`	`} else {`
`294`	`294`	`$a = strrpos($presenter, ':');`
`@@ -339,7 +339,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re`
`339`	`339`	`$params[$name] = $meta[self::FILTER_OUT]($params[$name]);`
`340`	`340`	`}`
`341`	`341`
`342`		`- if (isset($meta[self::PATTERN]) && !preg_match($meta[self::PATTERN], rawurldecode($params[$name]))) {`
	`342`	`+ if (isset($meta[self::PATTERN]) && !preg_match($meta[self::PATTERN], rawurldecode((string) $params[$name]))) {`
`343`	`343`	`return NULL; // pattern not match`
`344`	`344`	`}`
`345`	`345`	`}`
`@@ -576,7 +576,7 @@ private function setMask($mask, array $metadata)`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`$meta['filterTable2'] = empty($meta[self::FILTER_TABLE]) ? NULL : array_flip($meta[self::FILTER_TABLE]);`
`579`		`- if (array_key_exists(self::VALUE, $meta)) {`
	`579`	`+ if (isset($meta[self::VALUE])) {`
`580`	`580`	`if (isset($meta['filterTable2'][$meta[self::VALUE]])) {`
`581`	`581`	`$meta['defOut'] = $meta['filterTable2'][$meta[self::VALUE]];`
`582`	`582`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protected function validateParent(Nette\ComponentModel\IContainer $parent)`
`85`	`85`	`protected function tryCall($method, array $params)`
`86`	`86`	`{`
`87`	`87`	`$rc = $this->getReflection();`
`88`		`- if ($rc->hasMethod($method)) {`
	`88`	`+ if ($rc->hasMethod((string) $method)) {`
`89`	`89`	`$rm = $rc->getMethod($method);`
`90`	`90`	`if ($rm->isPublic() && !$rm->isAbstract() && !$rm->isStatic()) {`
`91`	`91`	`$this->checkRequirements($rm);`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public static function convertType(&$val, $type, $isClass = FALSE)`
`196`	`196`	`*/`
`197`	`197`	`public static function parseAnnotation(\Reflector $ref, $name)`
`198`	`198`	`{`
`199`		`- if (!preg_match_all('#[\\s]@' . preg_quote($name, '#') . '(?:\(\\s([^)])\\s\)\|\\s\|$)#', $ref->getDocComment(), $m)) {`
	`199`	`+ if (!preg_match_all('#[\\s]@' . preg_quote($name, '#') . '(?:\(\\s([^)])\\s\)\|\\s\|$)#', (string) $ref->getDocComment(), $m)) {`
`200`	`200`	`return FALSE;`
`201`	`201`	`}`
`202`	`202`	`static $tokens = ['true' => TRUE, 'false' => FALSE, 'null' => NULL];`
Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ public function findLayoutTemplateFile()`
`498`	`498`	`*/`
`499`	`499`	`public function formatLayoutTemplateFiles()`
`500`	`500`	`{`
`501`		`- if (preg_match('#/\|\\\\#', $this->layout)) {`
	`501`	`+ if (preg_match('#/\|\\\\#', (string) $this->layout)) {`
`502`	`502`	`return [$this->layout];`
`503`	`503`	`}`
`504`	`504`	`list($module, $presenter) = Helpers::splitName($this->getName());`
`@@ -891,7 +891,7 @@ protected function createRequest($component, $destination, array $args, $mode)`
`891`	`891`	`$action = self::DEFAULT_ACTION;`
`892`	`892`	`}`
`893`	`893`
`894`		`- $current = ($action === '*' \|\| strcasecmp($action, $this->action) === 0) && $presenterClass === get_class($this);`
	`894`	`+ $current = ($action === '*' \|\| strcasecmp($action, (string) $this->action) === 0) && $presenterClass === get_class($this);`
`895`	`895`
`896`	`896`	`$reflection = new ComponentReflection($presenterClass);`
`897`	`897`
`@@ -979,7 +979,7 @@ protected function createRequest($component, $destination, array $args, $mode)`
`979`	`979`	`$url = $this->router->constructUrl($this->lastCreatedRequest, $this->refUrlCache);`
`980`	`980`	`if ($url === NULL) {`
`981`	`981`	`unset($args[self::ACTION_KEY]);`
`982`		`- $params = urldecode(http_build_query($args, NULL, ', '));`
	`982`	`+ $params = urldecode(http_build_query($args, '', ', '));`
`983`	`983`	`throw new InvalidLinkException("No route for $presenter:$action($params)");`
`984`	`984`	`}`
`985`	`985`
`@@ -1231,7 +1231,7 @@ private function initGlobalParameters()`
`1231`	`1231`	`}`
`1232`	`1232`
`1233`	`1233`	`foreach ($params as $key => $value) {`
`1234`		`- if (!preg_match('#^((?:[a-z0-9_]+-)*)((?!\d+\z)[a-z0-9_]+)\z#i', $key, $matches)) {`
	`1234`	`+ if (!preg_match('#^((?:[a-z0-9_]+-)*)((?!\d+\z)[a-z0-9_]+)\z#i', (string) $key, $matches)) {`
`1235`	`1235`	`continue;`
`1236`	`1236`	`} elseif (!$matches[1]) {`
`1237`	`1237`	`$selfParams[$key] = $value;`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function beforeCompile()`
`104`	`104`	`$counter = 0;`
`105`	`105`	`foreach ($this->findPresenters() as $class) {`
`106`	`106`	`if (empty($all[$class])) {`
`107`		`- $all[$class] = $builder->addDefinition($this->prefix(++$counter))->setClass($class);`
	`107`	`+ $all[$class] = $builder->addDefinition($this->prefix((string) ++$counter))->setClass($class);`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function createTemplate(UI\Control $control = NULL)`
`103`	`103`	`$latte->addProvider('uiControl', $control);`
`104`	`104`	`$latte->addProvider('uiPresenter', $presenter);`
`105`	`105`	`$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($control));`
`106`		`- $nonce = preg_match('#\s\'nonce-([\w+/]+=*)\'#', $presenter->getHttpResponse()->getHeader('Content-Security-Policy'), $m) ? $m[1] : NULL;`
	`106`	`+ $nonce = preg_match('#\s\'nonce-([\w+/]+=*)\'#', (string) $presenter->getHttpResponse()->getHeader('Content-Security-Policy'), $m) ? $m[1] : NULL;`
`107`	`107`	`$latte->addProvider('uiNonce', $nonce);`
`108`	`108`	`}`
`109`	`109`	`$latte->addProvider('cacheStorage', $this->cacheStorage);`