HttpExtension: sends headers via Http\Response

nette · Dec 19, 2016 · 0221544 · 0221544
1 parent 71602f2
commit 0221544
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/Bridges/HttpDI/HttpExtension.php b/src/Bridges/HttpDI/HttpExtension.php
@@ -79,12 +79,12 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 			} elseif (preg_match('#^https?:#', $frames)) {
 				$frames = "ALLOW-FROM $frames";
 			}
-			$initialize->addBody('header(?);', ["X-Frame-Options: $frames"]);
+			$initialize->addBody('$this->getService(?)->setHeader(?, ?);', [$this->prefix('response'), 'X-Frame-Options', $frames]);
 		}
 
 		foreach ($config['headers'] as $key => $value) {
 			if ($value != NULL) { // intentionally ==
-				$initialize->addBody('header(?);', ["$key: $value"]);
+				$initialize->addBody('$this->getService(?)->setHeader(?, ?);', [$this->prefix('response'), $key, $value]);
 			}
 		}
 	}

diff --git a/tests/Http.DI/HttpExtension.headers.phpt b/tests/Http.DI/HttpExtension.headers.phpt
@@ -44,11 +44,6 @@ echo ' '; @ob_flush(); flush();
 
 Assert::true(headers_sent());
 
-Assert::error(function () use ($container) {
+Assert::exception(function () use ($container) {
 	$container->initialize();
-}, [
-	[E_WARNING, 'Cannot modify header information - headers already sent %a%'],
-	[E_WARNING, 'Cannot modify header information - headers already sent %a%'],
-	[E_WARNING, 'Cannot modify header information - headers already sent %a%'],
-	[E_WARNING, 'Cannot modify header information - headers already sent %a%'],
-]);
+}, Nette\InvalidStateException::class, 'Cannot send header after %a%');