Presenter: flash key has to be string (fix for "Array to string conversion" notice) (#147)

Author: kukulich

src/Application/UI/Presenter.php

@@ -945,7 +945,7 @@ protected function createRequest($component, $destination, array $args, $mode)
 			$current = $current && $args[self::SIGNAL_KEY] === $this->getParameter(self::SIGNAL_KEY);
 		}
 		if (($mode === 'redirect' || $mode === 'forward') && $this->hasFlashSession()) {
-			$args[self::FLASH_KEY] = $this->getParameter(self::FLASH_KEY);
+			$args[self::FLASH_KEY] = $this->getFlashKey();
 		}
 
 		$this->lastCreatedRequest = new Application\Request(
@@ -1103,7 +1103,7 @@ public function restoreRequest($key)
 		unset($session[$key]);
 		$request->setFlag(Application\Request::RESTORED, TRUE);
 		$params = $request->getParameters();
-		$params[self::FLASH_KEY] = $this->getParameter(self::FLASH_KEY);
+		$params[self::FLASH_KEY] = $this->getFlashKey();
 		$request->setParameters($params);
 		$this->sendResponse(new Responses\ForwardResponse($request));
 	}
@@ -1282,14 +1282,27 @@ public function popGlobalParameters($id)
 	/********************* flash session ****************d*g**/
 
 
+	/**
+	 * @return string|NULL
+	 */
+	private function getFlashKey()
+	{
+		$flashKey = $this->getParameter(self::FLASH_KEY);
+		return is_string($flashKey) && $flashKey !== ''
+			? $flashKey
+			: NULL;
+	}
+
+
 	/**
 	 * Checks if a flash session namespace exists.
 	 * @return bool
 	 */
 	public function hasFlashSession()
 	{
-		return !empty($this->params[self::FLASH_KEY])
-			&& $this->getSession()->hasSection('Nette.Application.Flash/' . $this->params[self::FLASH_KEY]);
+		$flashKey = $this->getFlashKey();
+		return $flashKey !== NULL
+			&& $this->getSession()->hasSection('Nette.Application.Flash/' . $flashKey);
 	}
 
 
@@ -1299,10 +1312,11 @@ public function hasFlashSession()
 	 */
 	public function getFlashSession()
 	{
-		if (empty($this->params[self::FLASH_KEY])) {
-			$this->params[self::FLASH_KEY] = Nette\Utils\Random::generate(4);
+		$flashKey = $this->getFlashKey();
+		if ($flashKey === NULL) {
+			$this->params[self::FLASH_KEY] = $flashKey = Nette\Utils\Random::generate(4);
 		}
-		return $this->getSession('Nette.Application.Flash/' . $this->params[self::FLASH_KEY]);
+		return $this->getSession('Nette.Application.Flash/' . $flashKey);
 	}