compatibility with nette/http 3.0

Author: dg

composer.json

@@ -16,8 +16,8 @@
 	"require": {
 		"php": ">=7.1",
 		"nette/component-model": "^2.3",
-		"nette/http": "^2.2",
-		"nette/utils": "^2.4 || ~3.0.0"
+		"nette/http": "^3.0",
+		"nette/utils": "^2.4 || ^3.0"
 	},
 	"suggest": {
 		"nette/forms": "Allows to use Nette\\Application\\UI\\Form",
@@ -28,7 +28,7 @@
 		"nette/di": "^2.4 || ~3.0.0",
 		"nette/forms": "^2.4",
 		"nette/robot-loader": "^2.4.2 || ^3.0",
-		"nette/security": "^2.4",
+		"nette/security": "^3.0",
 		"latte/latte": "^2.4.3",
 		"tracy/tracy": "^2.4",
 		"mockery/mockery": "^1.0"

tests/Bridges.Latte/TemplateFactory.nonce.presenter.phpt

@@ -13,13 +13,12 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-
 $latte = new Latte\Engine;
 
 $latteFactory = Mockery::mock(ApplicationLatte\ILatteFactory::class);
 $latteFactory->shouldReceive('create')->andReturn($latte);
 
-$response = Mockery::mock(Nette\Http\Response::class);
+$response = Mockery::mock(Nette\Http\IResponse::class);
 $response->shouldReceive('getHeader')->with('Content-Security-Policy')->andReturn("hello 'nonce-abcd123==' world");
 
 $presenter = Mockery::mock(UI\Presenter::class);

tests/UI/Presenter.storeRequest().phpt

@@ -27,27 +27,31 @@ class MockSession extends Http\Session
 
 	public function __construct() {}
 
-	public function getSection($section, $class = Nette\Http\SessionSection::class)
+	public function getSection(string $section, string $class = Nette\Http\SessionSection::class): Nette\Http\SessionSection
 	{
 		return $this->testSection;
 	}
 }
 
-class MockSessionSection implements \ArrayAccess
+class MockSessionSection extends Nette\Http\SessionSection
 {
 	public $testedKeyExistence;
 	public $storedKey;
 	public $storedValue;
 	public $testExpiration;
 	public $testExpirationVariables;
 
-	public function __isset($name)
+	public function __construct()
+	{
+	}
+
+	public function __isset(string $name): bool
 	{
 		$this->testedKeyExistence = $name;
 		return FALSE;
 	}
 
-	public function __set($name, $value)
+	public function __set(string $name, $value): void
 	{
 		$this->storedKey = $name;
 		$this->storedValue = $value;
@@ -59,18 +63,18 @@ class MockSessionSection implements \ArrayAccess
 		$this->testExpirationVariables = $variables;
 	}
 
-	public function offsetExists($name)
+	public function offsetExists($name): bool
 	{
 		return $this->__isset($name);
 	}
 
-	public function offsetSet($name, $value)
+	public function offsetSet($name, $value): void
 	{
 		$this->__set($name, $value);
 	}
 
 	public function offsetGet($name) {}
-	public function offsetUnset($name) {}
+	public function offsetUnset($name): void {}
 }
 
 class MockUser extends Security\User