Skip to content
Snippets Groups Projects
Unverified Commit c40fe8b8 authored by Roeland Jago Douma's avatar Roeland Jago Douma
Browse files

Do not enforce the parent constructor of response to be called


If there is no policy set we just take the default empty ones.
That way no obscure errors get thrown if the constructor is not called.

Signed-off-by: default avatarRoeland Jago Douma <roeland@famdouma.nl>
parent 0b0cdeb8
No related branches found
No related tags found
No related merge requests found
......@@ -93,13 +93,9 @@ class Response {
private $throttleMetadata = [];
/**
* Response constructor.
*
* @since 17.0.0
*/
public function __construct() {
$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
$this->setFeaturePolicy(new EmptyFeaturePolicy());
}
/**
......@@ -241,12 +237,8 @@ class Response {
$this->lastModified->format(\DateTime::RFC2822);
}
// Build Content-Security-Policy and use default if none has been specified
if(is_null($this->contentSecurityPolicy)) {
$this->setContentSecurityPolicy(new ContentSecurityPolicy());
}
$this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy();
$this->headers['Feature-Policy'] = $this->featurePolicy->buildPolicy();
$this->headers['Content-Security-Policy'] = $this->getContentSecurityPolicy()->buildPolicy();
$this->headers['Feature-Policy'] = $this->getFeaturePolicy()->buildPolicy();
if($this->ETag) {
$mergeWith['ETag'] = '"' . $this->ETag . '"';
......@@ -296,6 +288,9 @@ class Response {
* @since 8.1.0
*/
public function getContentSecurityPolicy() {
if ($this->contentSecurityPolicy === null) {
$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
}
return $this->contentSecurityPolicy;
}
......@@ -304,6 +299,9 @@ class Response {
* @since 17.0.0
*/
public function getFeaturePolicy(): EmptyFeaturePolicy {
if ($this->featurePolicy === null) {
$this->setFeaturePolicy(new EmptyFeaturePolicy());
}
return $this->featurePolicy;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment