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: Roeland Jago Douma <roeland@famdouma.nl>

Author: rullzer

lib/public/AppFramework/Http/Response.php

@@ -92,16 +92,6 @@ class Response {
 	/** @var array */
 	private $throttleMetadata = [];
 
-	/**
-	 * Response constructor.
-	 *
-	 * @since 17.0.0
-	 */
-	public function __construct() {
-		$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
-		$this->setFeaturePolicy(new EmptyFeaturePolicy());
-	}
-
 	/**
 	 * Caches the response
 	 * @param int $cacheSeconds the amount of seconds that should be cached
@@ -241,12 +231,8 @@ public function getHeaders() {
 				$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 +282,9 @@ public function setContentSecurityPolicy(EmptyContentSecurityPolicy $csp) {
 	 * @since 8.1.0
 	 */
 	public function getContentSecurityPolicy() {
+		if ($this->contentSecurityPolicy === null) {
+			$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
+		}
 		return $this->contentSecurityPolicy;
 	}
 
@@ -304,6 +293,9 @@ public function getContentSecurityPolicy() {
 	 * @since 17.0.0
 	 */
 	public function getFeaturePolicy(): EmptyFeaturePolicy {
+		if ($this->featurePolicy === null) {
+			$this->setFeaturePolicy(new EmptyFeaturePolicy());
+		}
 		return $this->featurePolicy;
 	}