compatibility with nette/http 3.0

dg · dg · commit d957b5eadb67 · 2017-01-25T12:24:24.000+01:00
diff --git a/composer.json b/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"
diff --git a/tests/Bridges.Latte/TemplateFactory.nonce.phpt b/tests/Bridges.Latte/TemplateFactory.nonce.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);
diff --git a/tests/UI/Presenter.storeRequest().phpt b/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

Original file line number	Diff line number	Diff line change
`@@ -27,27 +27,31 @@ class MockSession extends Http\Session`
`27`	`27`
`28`	`28`	`public function __construct() {}`
`29`	`29`
`30`		`- public function getSection($section, $class = Nette\Http\SessionSection::class)`
	`30`	`+ public function getSection(string $section, string $class = Nette\Http\SessionSection::class): Nette\Http\SessionSection`
`31`	`31`	`{`
`32`	`32`	`return $this->testSection;`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`-class MockSessionSection implements \ArrayAccess`
	`36`	`+class MockSessionSection extends Nette\Http\SessionSection`
`37`	`37`	`{`
`38`	`38`	`public $testedKeyExistence;`
`39`	`39`	`public $storedKey;`
`40`	`40`	`public $storedValue;`
`41`	`41`	`public $testExpiration;`
`42`	`42`	`public $testExpirationVariables;`
`43`	`43`
`44`		`- public function __isset($name)`
	`44`	`+ public function __construct()`
	`45`	`+ {`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ public function __isset(string $name): bool`
`45`	`49`	`{`
`46`	`50`	`$this->testedKeyExistence = $name;`
`47`	`51`	`return FALSE;`
`48`	`52`	`}`
`49`	`53`
`50`		`- public function __set($name, $value)`
	`54`	`+ public function __set(string $name, $value): void`
`51`	`55`	`{`
`52`	`56`	`$this->storedKey = $name;`
`53`	`57`	`$this->storedValue = $value;`
`@@ -59,18 +63,18 @@ class MockSessionSection implements \ArrayAccess`
`59`	`63`	`$this->testExpirationVariables = $variables;`
`60`	`64`	`}`
`61`	`65`
`62`		`- public function offsetExists($name)`
	`66`	`+ public function offsetExists($name): bool`
`63`	`67`	`{`
`64`	`68`	`return $this->__isset($name);`
`65`	`69`	`}`
`66`	`70`
`67`		`- public function offsetSet($name, $value)`
	`71`	`+ public function offsetSet($name, $value): void`
`68`	`72`	`{`
`69`	`73`	`$this->__set($name, $value);`
`70`	`74`	`}`
`71`	`75`
`72`	`76`	`public function offsetGet($name) {}`
`73`		`- public function offsetUnset($name) {}`
	`77`	`+ public function offsetUnset($name): void {}`
`74`	`78`	`}`
`75`	`79`
`76`	`80`	`class MockUser extends Security\User`