composer: removed dependency on nette/security (#132)

Author: enumag

composer.json

@@ -18,7 +18,6 @@
 		"nette/component-model": "~2.3",
 		"nette/http": "~2.2",
 		"nette/reflection": "~2.2",
-		"nette/security": "~2.2",
 		"nette/utils": "~2.4"
 	},
 	"suggest": {
@@ -30,6 +29,7 @@
 		"nette/di": "~2.3",
 		"nette/forms": "~2.2",
 		"nette/robot-loader": "~2.2",
+		"nette/security": "~2.2",
 		"latte/latte": "~2.4",
 		"tracy/tracy": "^2.3"
 	},

src/Application/UI/Presenter.php

@@ -1080,7 +1080,7 @@ public function storeRequest($expiration = '+ 10 minutes')
 			$key = Nette\Utils\Random::generate(5);
 		} while (isset($session[$key]));
 
-		$session[$key] = [$this->getUser()->getId(), $this->request];
+		$session[$key] = [$this->user ? $this->user->getId() : null, $this->request];
 		$session->setExpiration($expiration, $key);
 		return $key;
 	}
@@ -1094,7 +1094,7 @@ public function storeRequest($expiration = '+ 10 minutes')
 	public function restoreRequest($key)
 	{
 		$session = $this->getSession('Nette.Application/requests');
-		if (!isset($session[$key]) || ($session[$key][0] !== NULL && $session[$key][0] !== $this->getUser()->getId())) {
+		if (!isset($session[$key]) || ($this->user && $session[$key][0] !== NULL && $session[$key][0] !== $this->user->getId())) {
 			return;
 		}
 		$request = clone $session[$key][1];

tests/UI/Presenter.storeRequest().phpt

@@ -81,28 +81,55 @@ class MockUser extends Security\User
 	}
 }
 
-
-$presenter = new TestPresenter();
-$presenter->injectPrimary(
-	NULL,
-	NULL,
-	new Application\Routers\SimpleRouter,
-	new Http\Request(new Http\UrlScript),
-	new Http\Response,
-	$session = new MockSession,
-	$user = new MockUser
-);
-
-$section = $session->testSection = new MockSessionSection($session);
-
-$applicationRequest = new Application\Request('', '', []);
-$presenter->run($applicationRequest);
-
-$expiration = '+1 year';
-$key = $presenter->storeRequest($expiration);
-
-Assert::same($expiration, $section->testExpiration);
-Assert::same($key, $section->testExpirationVariables);
-Assert::same($key, $section->testedKeyExistence);
-Assert::same($key, $section->storedKey);
-Assert::same([$user->getId(), $applicationRequest], $section->storedValue);
+test(function () {
+	$presenter = new TestPresenter();
+	$presenter->injectPrimary(
+		NULL,
+		NULL,
+		new Application\Routers\SimpleRouter,
+		new Http\Request(new Http\UrlScript),
+		new Http\Response,
+		$session = new MockSession,
+		$user = new MockUser
+	);
+
+	$section = $session->testSection = new MockSessionSection($session);
+
+	$applicationRequest = new Application\Request('', '', []);
+	$presenter->run($applicationRequest);
+
+	$expiration = '+1 year';
+	$key = $presenter->storeRequest($expiration);
+
+	Assert::same($expiration, $section->testExpiration);
+	Assert::same($key, $section->testExpirationVariables);
+	Assert::same($key, $section->testedKeyExistence);
+	Assert::same($key, $section->storedKey);
+	Assert::same([$user->getId(), $applicationRequest], $section->storedValue);
+});
+
+test(function () {
+	$presenter = new TestPresenter();
+	$presenter->injectPrimary(
+		NULL,
+		NULL,
+		new Application\Routers\SimpleRouter,
+		new Http\Request(new Http\UrlScript),
+		new Http\Response,
+		$session = new MockSession
+	);
+
+	$section = $session->testSection = new MockSessionSection($session);
+
+	$applicationRequest = new Application\Request('', '', []);
+	$presenter->run($applicationRequest);
+
+	$expiration = '+1 year';
+	$key = $presenter->storeRequest($expiration);
+
+	Assert::same($expiration, $section->testExpiration);
+	Assert::same($key, $section->testExpirationVariables);
+	Assert::same($key, $section->testedKeyExistence);
+	Assert::same($key, $section->storedKey);
+	Assert::same([null, $applicationRequest], $section->storedValue);
+});