nextcloud / server

lib/public/AppFramework/Http/IOutput.php

Indentation +39 added lines, -39 removed lines

@@ -32,48 +32,48 @@
  */
 interface IOutput {
 
-	/**
-	 * @param string $out
-	 * @since 8.1.0
-	 */
-	public function setOutput($out);
+    /**
+     * @param string $out
+     * @since 8.1.0
+     */
+    public function setOutput($out);
 
-	/**
-	 * @param string|resource $path or file handle
-	 *
-	 * @return bool false if an error occurred
-	 * @since 8.1.0
-	 */
-	public function setReadfile($path);
+    /**
+     * @param string|resource $path or file handle
+     *
+     * @return bool false if an error occurred
+     * @since 8.1.0
+     */
+    public function setReadfile($path);
 
-	/**
-	 * @param string $header
-	 * @since 8.1.0
-	 */
-	public function setHeader($header);
+    /**
+     * @param string $header
+     * @since 8.1.0
+     */
+    public function setHeader($header);
 
-	/**
-	 * @return int returns the current http response code
-	 * @since 8.1.0
-	 */
-	public function getHttpResponseCode();
+    /**
+     * @return int returns the current http response code
+     * @since 8.1.0
+     */
+    public function getHttpResponseCode();
 
-	/**
-	 * @param int $code sets the http status code
-	 * @since 8.1.0
-	 */
-	public function setHttpResponseCode($code);
+    /**
+     * @param int $code sets the http status code
+     * @since 8.1.0
+     */
+    public function setHttpResponseCode($code);
 
-	/**
-	 * @param string $name
-	 * @param string $value
-	 * @param int $expire
-	 * @param string $path
-	 * @param string $domain
-	 * @param bool $secure
-	 * @param bool $httpOnly
-	 * @param string $sameSite (added in 20)
-	 * @since 8.1.0
-	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax');
+    /**
+     * @param string $name
+     * @param string $value
+     * @param int $expire
+     * @param string $path
+     * @param string $domain
+     * @param bool $secure
+     * @param bool $httpOnly
+     * @param string $sameSite (added in 20)
+     * @since 8.1.0
+     */
+    public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax');
 }

lib/public/AppFramework/Http/Response.php

Indentation +355 added lines, -355 removed lines

@@ -45,359 +45,359 @@
  */
 class Response {
 
-	/**
-	 * Headers - defaults to ['Cache-Control' => 'no-cache, no-store, must-revalidate']
-	 * @var array
-	 */
-	private $headers = [
-		'Cache-Control' => 'no-cache, no-store, must-revalidate'
-	];
-
-
-	/**
-	 * Cookies that will be need to be constructed as header
-	 * @var array
-	 */
-	private $cookies = [];
-
-
-	/**
-	 * HTTP status code - defaults to STATUS OK
-	 * @var int
-	 */
-	private $status = Http::STATUS_OK;
-
-
-	/**
-	 * Last modified date
-	 * @var \DateTime
-	 */
-	private $lastModified;
-
-
-	/**
-	 * ETag
-	 * @var string
-	 */
-	private $ETag;
-
-	/** @var ContentSecurityPolicy|null Used Content-Security-Policy */
-	private $contentSecurityPolicy = null;
-
-	/** @var FeaturePolicy */
-	private $featurePolicy;
-
-	/** @var bool */
-	private $throttled = false;
-	/** @var array */
-	private $throttleMetadata = [];
-
-	/**
-	 * @since 17.0.0
-	 */
-	public function __construct() {
-	}
-
-	/**
-	 * Caches the response
-	 * @param int $cacheSeconds the amount of seconds that should be cached
-	 * if 0 then caching will be disabled
-	 * @return $this
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function cacheFor(int $cacheSeconds, bool $public = false) {
-		if ($cacheSeconds > 0) {
-			$pragma = $public ? 'public' : 'private';
-			$this->addHeader('Cache-Control', $pragma . ', max-age=' . $cacheSeconds . ', must-revalidate');
-			$this->addHeader('Pragma', $pragma);
-
-			// Set expires header
-			$expires = new \DateTime();
-			/** @var ITimeFactory $time */
-			$time = \OC::$server->query(ITimeFactory::class);
-			$expires->setTimestamp($time->getTime());
-			$expires->add(new \DateInterval('PT'.$cacheSeconds.'S'));
-			$this->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-		} else {
-			$this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
-			unset($this->headers['Expires'], $this->headers['Pragma']);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new cookie to the response
-	 * @param string $name The name of the cookie
-	 * @param string $value The value of the cookie
-	 * @param \DateTime|null $expireDate Date on that the cookie should expire, if set
-	 * 									to null cookie will be considered as session
-	 * 									cookie.
-	 * @param string $sameSite The samesite value of the cookie. Defaults to Lax. Other possibilities are Strict or None
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function addCookie($name, $value, \DateTime $expireDate = null, $sameSite = 'Lax') {
-		$this->cookies[$name] = ['value' => $value, 'expireDate' => $expireDate, 'sameSite' => $sameSite];
-		return $this;
-	}
-
-
-	/**
-	 * Set the specified cookies
-	 * @param array $cookies array('foo' => array('value' => 'bar', 'expire' => null))
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function setCookies(array $cookies) {
-		$this->cookies = $cookies;
-		return $this;
-	}
-
-
-	/**
-	 * Invalidates the specified cookie
-	 * @param string $name
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function invalidateCookie($name) {
-		$this->addCookie($name, 'expired', new \DateTime('1971-01-01 00:00'));
-		return $this;
-	}
-
-	/**
-	 * Invalidates the specified cookies
-	 * @param array $cookieNames array('foo', 'bar')
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function invalidateCookies(array $cookieNames) {
-		foreach ($cookieNames as $cookieName) {
-			$this->invalidateCookie($cookieName);
-		}
-		return $this;
-	}
-
-	/**
-	 * Returns the cookies
-	 * @return array
-	 * @since 8.0.0
-	 */
-	public function getCookies() {
-		return $this->cookies;
-	}
-
-	/**
-	 * Adds a new header to the response that will be called before the render
-	 * function
-	 * @param string $name The name of the HTTP header
-	 * @param string $value The value, null will delete it
-	 * @return $this
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
-		// to be able to reliably check for security
-		// headers
-
-		if (is_null($value)) {
-			unset($this->headers[$name]);
-		} else {
-			$this->headers[$name] = $value;
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 * Set the headers
-	 * @param array $headers value header pairs
-	 * @return $this
-	 * @since 8.0.0
-	 */
-	public function setHeaders(array $headers) {
-		$this->headers = $headers;
-
-		return $this;
-	}
-
-
-	/**
-	 * Returns the set headers
-	 * @return array the headers
-	 * @since 6.0.0
-	 */
-	public function getHeaders() {
-		$mergeWith = [];
-
-		if ($this->lastModified) {
-			$mergeWith['Last-Modified'] =
-				$this->lastModified->format(\DateTime::RFC2822);
-		}
-
-		$this->headers['Content-Security-Policy'] = $this->getContentSecurityPolicy()->buildPolicy();
-		$this->headers['Feature-Policy'] = $this->getFeaturePolicy()->buildPolicy();
-
-		if ($this->ETag) {
-			$mergeWith['ETag'] = '"' . $this->ETag . '"';
-		}
-
-		return array_merge($mergeWith, $this->headers);
-	}
-
-
-	/**
-	 * By default renders no output
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function render() {
-		return '';
-	}
-
-
-	/**
-	 * Set response status
-	 * @param int $status a HTTP status code, see also the STATUS constants
-	 * @return Response Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setStatus($status) {
-		$this->status = $status;
-
-		return $this;
-	}
-
-	/**
-	 * Set a Content-Security-Policy
-	 * @param EmptyContentSecurityPolicy $csp Policy to set for the response object
-	 * @return $this
-	 * @since 8.1.0
-	 */
-	public function setContentSecurityPolicy(EmptyContentSecurityPolicy $csp) {
-		$this->contentSecurityPolicy = $csp;
-		return $this;
-	}
-
-	/**
-	 * Get the currently used Content-Security-Policy
-	 * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if
-	 *                                    none specified.
-	 * @since 8.1.0
-	 */
-	public function getContentSecurityPolicy() {
-		if ($this->contentSecurityPolicy === null) {
-			$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
-		}
-		return $this->contentSecurityPolicy;
-	}
-
-
-	/**
-	 * @since 17.0.0
-	 */
-	public function getFeaturePolicy(): EmptyFeaturePolicy {
-		if ($this->featurePolicy === null) {
-			$this->setFeaturePolicy(new EmptyFeaturePolicy());
-		}
-		return $this->featurePolicy;
-	}
-
-	/**
-	 * @since 17.0.0
-	 */
-	public function setFeaturePolicy(EmptyFeaturePolicy $featurePolicy): self {
-		$this->featurePolicy = $featurePolicy;
-
-		return $this;
-	}
-
-
-
-	/**
-	 * Get response status
-	 * @since 6.0.0
-	 */
-	public function getStatus() {
-		return $this->status;
-	}
-
-
-	/**
-	 * Get the ETag
-	 * @return string the etag
-	 * @since 6.0.0
-	 */
-	public function getETag() {
-		return $this->ETag;
-	}
-
-
-	/**
-	 * Get "last modified" date
-	 * @return \DateTime RFC2822 formatted last modified date
-	 * @since 6.0.0
-	 */
-	public function getLastModified() {
-		return $this->lastModified;
-	}
-
-
-	/**
-	 * Set the ETag
-	 * @param string $ETag
-	 * @return Response Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setETag($ETag) {
-		$this->ETag = $ETag;
-
-		return $this;
-	}
-
-
-	/**
-	 * Set "last modified" date
-	 * @param \DateTime $lastModified
-	 * @return Response Reference to this object
-	 * @since 6.0.0 - return value was added in 7.0.0
-	 */
-	public function setLastModified($lastModified) {
-		$this->lastModified = $lastModified;
-
-		return $this;
-	}
-
-	/**
-	 * Marks the response as to throttle. Will be throttled when the
-	 * @BruteForceProtection annotation is added.
-	 *
-	 * @param array $metadata
-	 * @since 12.0.0
-	 */
-	public function throttle(array $metadata = []) {
-		$this->throttled = true;
-		$this->throttleMetadata = $metadata;
-	}
-
-	/**
-	 * Returns the throttle metadata, defaults to empty array
-	 *
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function getThrottleMetadata() {
-		return $this->throttleMetadata;
-	}
-
-	/**
-	 * Whether the current response is throttled.
-	 *
-	 * @since 12.0.0
-	 */
-	public function isThrottled() {
-		return $this->throttled;
-	}
+    /**
+     * Headers - defaults to ['Cache-Control' => 'no-cache, no-store, must-revalidate']
+     * @var array
+     */
+    private $headers = [
+        'Cache-Control' => 'no-cache, no-store, must-revalidate'
+    ];
+
+
+    /**
+     * Cookies that will be need to be constructed as header
+     * @var array
+     */
+    private $cookies = [];
+
+
+    /**
+     * HTTP status code - defaults to STATUS OK
+     * @var int
+     */
+    private $status = Http::STATUS_OK;
+
+
+    /**
+     * Last modified date
+     * @var \DateTime
+     */
+    private $lastModified;
+
+
+    /**
+     * ETag
+     * @var string
+     */
+    private $ETag;
+
+    /** @var ContentSecurityPolicy|null Used Content-Security-Policy */
+    private $contentSecurityPolicy = null;
+
+    /** @var FeaturePolicy */
+    private $featurePolicy;
+
+    /** @var bool */
+    private $throttled = false;
+    /** @var array */
+    private $throttleMetadata = [];
+
+    /**
+     * @since 17.0.0
+     */
+    public function __construct() {
+    }
+
+    /**
+     * Caches the response
+     * @param int $cacheSeconds the amount of seconds that should be cached
+     * if 0 then caching will be disabled
+     * @return $this
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function cacheFor(int $cacheSeconds, bool $public = false) {
+        if ($cacheSeconds > 0) {
+            $pragma = $public ? 'public' : 'private';
+            $this->addHeader('Cache-Control', $pragma . ', max-age=' . $cacheSeconds . ', must-revalidate');
+            $this->addHeader('Pragma', $pragma);
+
+            // Set expires header
+            $expires = new \DateTime();
+            /** @var ITimeFactory $time */
+            $time = \OC::$server->query(ITimeFactory::class);
+            $expires->setTimestamp($time->getTime());
+            $expires->add(new \DateInterval('PT'.$cacheSeconds.'S'));
+            $this->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+        } else {
+            $this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
+            unset($this->headers['Expires'], $this->headers['Pragma']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds a new cookie to the response
+     * @param string $name The name of the cookie
+     * @param string $value The value of the cookie
+     * @param \DateTime|null $expireDate Date on that the cookie should expire, if set
+     * 									to null cookie will be considered as session
+     * 									cookie.
+     * @param string $sameSite The samesite value of the cookie. Defaults to Lax. Other possibilities are Strict or None
+     * @return $this
+     * @since 8.0.0
+     */
+    public function addCookie($name, $value, \DateTime $expireDate = null, $sameSite = 'Lax') {
+        $this->cookies[$name] = ['value' => $value, 'expireDate' => $expireDate, 'sameSite' => $sameSite];
+        return $this;
+    }
+
+
+    /**
+     * Set the specified cookies
+     * @param array $cookies array('foo' => array('value' => 'bar', 'expire' => null))
+     * @return $this
+     * @since 8.0.0
+     */
+    public function setCookies(array $cookies) {
+        $this->cookies = $cookies;
+        return $this;
+    }
+
+
+    /**
+     * Invalidates the specified cookie
+     * @param string $name
+     * @return $this
+     * @since 8.0.0
+     */
+    public function invalidateCookie($name) {
+        $this->addCookie($name, 'expired', new \DateTime('1971-01-01 00:00'));
+        return $this;
+    }
+
+    /**
+     * Invalidates the specified cookies
+     * @param array $cookieNames array('foo', 'bar')
+     * @return $this
+     * @since 8.0.0
+     */
+    public function invalidateCookies(array $cookieNames) {
+        foreach ($cookieNames as $cookieName) {
+            $this->invalidateCookie($cookieName);
+        }
+        return $this;
+    }
+
+    /**
+     * Returns the cookies
+     * @return array
+     * @since 8.0.0
+     */
+    public function getCookies() {
+        return $this->cookies;
+    }
+
+    /**
+     * Adds a new header to the response that will be called before the render
+     * function
+     * @param string $name The name of the HTTP header
+     * @param string $value The value, null will delete it
+     * @return $this
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function addHeader($name, $value) {
+        $name = trim($name);  // always remove leading and trailing whitespace
+        // to be able to reliably check for security
+        // headers
+
+        if (is_null($value)) {
+            unset($this->headers[$name]);
+        } else {
+            $this->headers[$name] = $value;
+        }
+
+        return $this;
+    }
+
+
+    /**
+     * Set the headers
+     * @param array $headers value header pairs
+     * @return $this
+     * @since 8.0.0
+     */
+    public function setHeaders(array $headers) {
+        $this->headers = $headers;
+
+        return $this;
+    }
+
+
+    /**
+     * Returns the set headers
+     * @return array the headers
+     * @since 6.0.0
+     */
+    public function getHeaders() {
+        $mergeWith = [];
+
+        if ($this->lastModified) {
+            $mergeWith['Last-Modified'] =
+                $this->lastModified->format(\DateTime::RFC2822);
+        }
+
+        $this->headers['Content-Security-Policy'] = $this->getContentSecurityPolicy()->buildPolicy();
+        $this->headers['Feature-Policy'] = $this->getFeaturePolicy()->buildPolicy();
+
+        if ($this->ETag) {
+            $mergeWith['ETag'] = '"' . $this->ETag . '"';
+        }
+
+        return array_merge($mergeWith, $this->headers);
+    }
+
+
+    /**
+     * By default renders no output
+     * @return string
+     * @since 6.0.0
+     */
+    public function render() {
+        return '';
+    }
+
+
+    /**
+     * Set response status
+     * @param int $status a HTTP status code, see also the STATUS constants
+     * @return Response Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setStatus($status) {
+        $this->status = $status;
+
+        return $this;
+    }
+
+    /**
+     * Set a Content-Security-Policy
+     * @param EmptyContentSecurityPolicy $csp Policy to set for the response object
+     * @return $this
+     * @since 8.1.0
+     */
+    public function setContentSecurityPolicy(EmptyContentSecurityPolicy $csp) {
+        $this->contentSecurityPolicy = $csp;
+        return $this;
+    }
+
+    /**
+     * Get the currently used Content-Security-Policy
+     * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if
+     *                                    none specified.
+     * @since 8.1.0
+     */
+    public function getContentSecurityPolicy() {
+        if ($this->contentSecurityPolicy === null) {
+            $this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
+        }
+        return $this->contentSecurityPolicy;
+    }
+
+
+    /**
+     * @since 17.0.0
+     */
+    public function getFeaturePolicy(): EmptyFeaturePolicy {
+        if ($this->featurePolicy === null) {
+            $this->setFeaturePolicy(new EmptyFeaturePolicy());
+        }
+        return $this->featurePolicy;
+    }
+
+    /**
+     * @since 17.0.0
+     */
+    public function setFeaturePolicy(EmptyFeaturePolicy $featurePolicy): self {
+        $this->featurePolicy = $featurePolicy;
+
+        return $this;
+    }
+
+
+
+    /**
+     * Get response status
+     * @since 6.0.0
+     */
+    public function getStatus() {
+        return $this->status;
+    }
+
+
+    /**
+     * Get the ETag
+     * @return string the etag
+     * @since 6.0.0
+     */
+    public function getETag() {
+        return $this->ETag;
+    }
+
+
+    /**
+     * Get "last modified" date
+     * @return \DateTime RFC2822 formatted last modified date
+     * @since 6.0.0
+     */
+    public function getLastModified() {
+        return $this->lastModified;
+    }
+
+
+    /**
+     * Set the ETag
+     * @param string $ETag
+     * @return Response Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setETag($ETag) {
+        $this->ETag = $ETag;
+
+        return $this;
+    }
+
+
+    /**
+     * Set "last modified" date
+     * @param \DateTime $lastModified
+     * @return Response Reference to this object
+     * @since 6.0.0 - return value was added in 7.0.0
+     */
+    public function setLastModified($lastModified) {
+        $this->lastModified = $lastModified;
+
+        return $this;
+    }
+
+    /**
+     * Marks the response as to throttle. Will be throttled when the
+     * @BruteForceProtection annotation is added.
+     *
+     * @param array $metadata
+     * @since 12.0.0
+     */
+    public function throttle(array $metadata = []) {
+        $this->throttled = true;
+        $this->throttleMetadata = $metadata;
+    }
+
+    /**
+     * Returns the throttle metadata, defaults to empty array
+     *
+     * @return array
+     * @since 13.0.0
+     */
+    public function getThrottleMetadata() {
+        return $this->throttleMetadata;
+    }
+
+    /**
+     * Whether the current response is throttled.
+     *
+     * @since 12.0.0
+     */
+    public function isThrottled() {
+        return $this->throttled;
+    }
 }

lib/private/AppFramework/Http/Output.php

Indentation +69 added lines, -69 removed lines

@@ -31,81 +31,81 @@
  * Very thin wrapper class to make output testable
  */
 class Output implements IOutput {
-	/** @var string */
-	private $webRoot;
+    /** @var string */
+    private $webRoot;
 
-	/**
-	 * @param $webRoot
-	 */
-	public function __construct($webRoot) {
-		$this->webRoot = $webRoot;
-	}
+    /**
+     * @param $webRoot
+     */
+    public function __construct($webRoot) {
+        $this->webRoot = $webRoot;
+    }
 
-	/**
-	 * @param string $out
-	 */
-	public function setOutput($out) {
-		print($out);
-	}
+    /**
+     * @param string $out
+     */
+    public function setOutput($out) {
+        print($out);
+    }
 
-	/**
-	 * @param string|resource $path or file handle
-	 *
-	 * @return bool false if an error occurred
-	 */
-	public function setReadfile($path) {
-		if (is_resource($path)) {
-			$output = fopen('php://output', 'w');
-			return stream_copy_to_stream($path, $output) > 0;
-		} else {
-			return @readfile($path);
-		}
-	}
+    /**
+     * @param string|resource $path or file handle
+     *
+     * @return bool false if an error occurred
+     */
+    public function setReadfile($path) {
+        if (is_resource($path)) {
+            $output = fopen('php://output', 'w');
+            return stream_copy_to_stream($path, $output) > 0;
+        } else {
+            return @readfile($path);
+        }
+    }
 
-	/**
-	 * @param string $header
-	 */
-	public function setHeader($header) {
-		header($header);
-	}
+    /**
+     * @param string $header
+     */
+    public function setHeader($header) {
+        header($header);
+    }
 
-	/**
-	 * @param int $code sets the http status code
-	 */
-	public function setHttpResponseCode($code) {
-		http_response_code($code);
-	}
+    /**
+     * @param int $code sets the http status code
+     */
+    public function setHttpResponseCode($code) {
+        http_response_code($code);
+    }
 
-	/**
-	 * @return int returns the current http response code
-	 */
-	public function getHttpResponseCode() {
-		return http_response_code();
-	}
+    /**
+     * @return int returns the current http response code
+     */
+    public function getHttpResponseCode() {
+        return http_response_code();
+    }
 
-	/**
-	 * @param string $name
-	 * @param string $value
-	 * @param int $expire
-	 * @param string $path
-	 * @param string $domain
-	 * @param bool $secure
-	 * @param bool $httpOnly
-	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
-		$path = $this->webRoot ? : '/';
+    /**
+     * @param string $name
+     * @param string $value
+     * @param int $expire
+     * @param string $path
+     * @param string $domain
+     * @param bool $secure
+     * @param bool $httpOnly
+     */
+    public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
+        $path = $this->webRoot ? : '/';
 
-		if (PHP_VERSION_ID < 70300) {
-			setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
-		} else {
-			setcookie($name, $value, [
-				'expires' => $expire,
-				'path' => $path,
-				'domain' => $domain,
-				'secure' => $secure,
-				'httponly' => $httpOnly,
-				'samesite' => $sameSite
-			]);
-		}
-	}
+        if (PHP_VERSION_ID < 70300) {
+            setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
+        } else {
+            setcookie($name, $value, [
+                'expires' => $expire,
+                'path' => $path,
+                'domain' => $domain,
+                'secure' => $secure,
+                'httponly' => $httpOnly,
+                'samesite' => $sameSite
+            ]);
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	 * @param bool $httpOnly
 	 */
 	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
-		$path = $this->webRoot ? : '/';
+		$path = $this->webRoot ?: '/';
 
 		if (PHP_VERSION_ID < 70300) {
 			setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);

lib/private/AppFramework/App.php

Indentation +158 added lines, -158 removed lines

@@ -48,167 +48,167 @@
  */
 class App {
 
-	/** @var string[] */
-	private static $nameSpaceCache = [];
-
-	/**
-	 * Turns an app id into a namespace by either reading the appinfo.xml's
-	 * namespace tag or uppercasing the appid's first letter
-	 * @param string $appId the app id
-	 * @param string $topNamespace the namespace which should be prepended to
-	 * the transformed app id, defaults to OCA\
-	 * @return string the starting namespace for the app
-	 */
-	public static function buildAppNamespace(string $appId, string $topNamespace='OCA\\'): string {
-		// Hit the cache!
-		if (isset(self::$nameSpaceCache[$appId])) {
-			return $topNamespace . self::$nameSpaceCache[$appId];
-		}
-
-		$appInfo = \OC_App::getAppInfo($appId);
-		if (isset($appInfo['namespace'])) {
-			self::$nameSpaceCache[$appId] = trim($appInfo['namespace']);
-		} else {
-			if ($appId !== 'spreed') {
-				// if the tag is not found, fall back to uppercasing the first letter
-				self::$nameSpaceCache[$appId] = ucfirst($appId);
-			} else {
-				// For the Talk app (appid spreed) the above fallback doesn't work.
-				// This leads to a problem when trying to install it freshly,
-				// because the apps namespace is already registered before the
-				// app is downloaded from the appstore, because of the hackish
-				// global route index.php/call/{token} which is registered via
-				// the core/routes.php so it does not have the app namespace.
-				// @ref https://github.com/nextcloud/server/pull/19433
-				self::$nameSpaceCache[$appId] = 'Talk';
-			}
-		}
-
-		return $topNamespace . self::$nameSpaceCache[$appId];
-	}
-
-
-	/**
-	 * Shortcut for calling a controller method and printing the result
-	 * @param string $controllerName the name of the controller under which it is
-	 *                               stored in the DI container
-	 * @param string $methodName the method that you want to call
-	 * @param DIContainer $container an instance of a pimple container.
-	 * @param array $urlParams list of URL parameters (optional)
-	 * @throws HintException
-	 */
-	public static function main(string $controllerName, string $methodName, DIContainer $container, array $urlParams = null) {
-		if (!is_null($urlParams)) {
-			$container->query(IRequest::class)->setUrlParameters($urlParams);
-		} elseif (isset($container['urlParams']) && !is_null($container['urlParams'])) {
-			$container->query(IRequest::class)->setUrlParameters($container['urlParams']);
-		}
-		$appName = $container['AppName'];
-
-		// first try $controllerName then go for \OCA\AppName\Controller\$controllerName
-		try {
-			$controller = $container->query($controllerName);
-		} catch (QueryException $e) {
-			if (strpos($controllerName, '\\Controller\\') !== false) {
-				// This is from a global registered app route that is not enabled.
-				[/*OC(A)*/, $app, /* Controller/Name*/] = explode('\\', $controllerName, 3);
-				throw new HintException('App ' . strtolower($app) . ' is not enabled');
-			}
-
-			if ($appName === 'core') {
-				$appNameSpace = 'OC\\Core';
-			} else {
-				$appNameSpace = self::buildAppNamespace($appName);
-			}
-			$controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
-			$controller = $container->query($controllerName);
-		}
-
-		// initialize the dispatcher and run all the middleware before the controller
-		/** @var Dispatcher $dispatcher */
-		$dispatcher = $container['Dispatcher'];
-
-		list(
-			$httpHeaders,
-			$responseHeaders,
-			$responseCookies,
-			$output,
-			$response
-		) = $dispatcher->dispatch($controller, $methodName);
-
-		$io = $container[IOutput::class];
-
-		if (!is_null($httpHeaders)) {
-			$io->setHeader($httpHeaders);
-		}
-
-		foreach ($responseHeaders as $name => $value) {
-			$io->setHeader($name . ': ' . $value);
-		}
-
-		foreach ($responseCookies as $name => $value) {
-			$expireDate = null;
-			if ($value['expireDate'] instanceof \DateTime) {
-				$expireDate = $value['expireDate']->getTimestamp();
-			}
-			$sameSite = $value['sameSite'] ?? 'Lax';
-
-			$io->setCookie(
-				$name,
-				$value['value'],
-				$expireDate,
-				$container->getServer()->getWebRoot(),
-				null,
-				$container->getServer()->getRequest()->getServerProtocol() === 'https',
-				true,
-				$sameSite
-			);
-		}
-
-		/*
+    /** @var string[] */
+    private static $nameSpaceCache = [];
+
+    /**
+     * Turns an app id into a namespace by either reading the appinfo.xml's
+     * namespace tag or uppercasing the appid's first letter
+     * @param string $appId the app id
+     * @param string $topNamespace the namespace which should be prepended to
+     * the transformed app id, defaults to OCA\
+     * @return string the starting namespace for the app
+     */
+    public static function buildAppNamespace(string $appId, string $topNamespace='OCA\\'): string {
+        // Hit the cache!
+        if (isset(self::$nameSpaceCache[$appId])) {
+            return $topNamespace . self::$nameSpaceCache[$appId];
+        }
+
+        $appInfo = \OC_App::getAppInfo($appId);
+        if (isset($appInfo['namespace'])) {
+            self::$nameSpaceCache[$appId] = trim($appInfo['namespace']);
+        } else {
+            if ($appId !== 'spreed') {
+                // if the tag is not found, fall back to uppercasing the first letter
+                self::$nameSpaceCache[$appId] = ucfirst($appId);
+            } else {
+                // For the Talk app (appid spreed) the above fallback doesn't work.
+                // This leads to a problem when trying to install it freshly,
+                // because the apps namespace is already registered before the
+                // app is downloaded from the appstore, because of the hackish
+                // global route index.php/call/{token} which is registered via
+                // the core/routes.php so it does not have the app namespace.
+                // @ref https://github.com/nextcloud/server/pull/19433
+                self::$nameSpaceCache[$appId] = 'Talk';
+            }
+        }
+
+        return $topNamespace . self::$nameSpaceCache[$appId];
+    }
+
+
+    /**
+     * Shortcut for calling a controller method and printing the result
+     * @param string $controllerName the name of the controller under which it is
+     *                               stored in the DI container
+     * @param string $methodName the method that you want to call
+     * @param DIContainer $container an instance of a pimple container.
+     * @param array $urlParams list of URL parameters (optional)
+     * @throws HintException
+     */
+    public static function main(string $controllerName, string $methodName, DIContainer $container, array $urlParams = null) {
+        if (!is_null($urlParams)) {
+            $container->query(IRequest::class)->setUrlParameters($urlParams);
+        } elseif (isset($container['urlParams']) && !is_null($container['urlParams'])) {
+            $container->query(IRequest::class)->setUrlParameters($container['urlParams']);
+        }
+        $appName = $container['AppName'];
+
+        // first try $controllerName then go for \OCA\AppName\Controller\$controllerName
+        try {
+            $controller = $container->query($controllerName);
+        } catch (QueryException $e) {
+            if (strpos($controllerName, '\\Controller\\') !== false) {
+                // This is from a global registered app route that is not enabled.
+                [/*OC(A)*/, $app, /* Controller/Name*/] = explode('\\', $controllerName, 3);
+                throw new HintException('App ' . strtolower($app) . ' is not enabled');
+            }
+
+            if ($appName === 'core') {
+                $appNameSpace = 'OC\\Core';
+            } else {
+                $appNameSpace = self::buildAppNamespace($appName);
+            }
+            $controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
+            $controller = $container->query($controllerName);
+        }
+
+        // initialize the dispatcher and run all the middleware before the controller
+        /** @var Dispatcher $dispatcher */
+        $dispatcher = $container['Dispatcher'];
+
+        list(
+            $httpHeaders,
+            $responseHeaders,
+            $responseCookies,
+            $output,
+            $response
+        ) = $dispatcher->dispatch($controller, $methodName);
+
+        $io = $container[IOutput::class];
+
+        if (!is_null($httpHeaders)) {
+            $io->setHeader($httpHeaders);
+        }
+
+        foreach ($responseHeaders as $name => $value) {
+            $io->setHeader($name . ': ' . $value);
+        }
+
+        foreach ($responseCookies as $name => $value) {
+            $expireDate = null;
+            if ($value['expireDate'] instanceof \DateTime) {
+                $expireDate = $value['expireDate']->getTimestamp();
+            }
+            $sameSite = $value['sameSite'] ?? 'Lax';
+
+            $io->setCookie(
+                $name,
+                $value['value'],
+                $expireDate,
+                $container->getServer()->getWebRoot(),
+                null,
+                $container->getServer()->getRequest()->getServerProtocol() === 'https',
+                true,
+                $sameSite
+            );
+        }
+
+        /*
 		 * Status 204 does not have a body and no Content Length
 		 * Status 304 does not have a body and does not need a Content Length
 		 * https://tools.ietf.org/html/rfc7230#section-3.3
 		 * https://tools.ietf.org/html/rfc7230#section-3.3.2
 		 */
-		$emptyResponse = false;
-		if (preg_match('/^HTTP\/\d\.\d (\d{3}) .*$/', $httpHeaders, $matches)) {
-			$status = (int)$matches[1];
-			if ($status === Http::STATUS_NO_CONTENT || $status === Http::STATUS_NOT_MODIFIED) {
-				$emptyResponse = true;
-			}
-		}
-
-		if (!$emptyResponse) {
-			if ($response instanceof ICallbackResponse) {
-				$response->callback($io);
-			} elseif (!is_null($output)) {
-				$io->setHeader('Content-Length: ' . strlen($output));
-				$io->setOutput($output);
-			}
-		}
-	}
-
-	/**
-	 * Shortcut for calling a controller method and printing the result.
-	 * Similar to App:main except that no headers will be sent.
-	 * This should be used for example when registering sections via
-	 * \OC\AppFramework\Core\API::registerAdmin()
-	 *
-	 * @param string $controllerName the name of the controller under which it is
-	 *                               stored in the DI container
-	 * @param string $methodName the method that you want to call
-	 * @param array $urlParams an array with variables extracted from the routes
-	 * @param DIContainer $container an instance of a pimple container.
-	 */
-	public static function part(string $controllerName, string $methodName, array $urlParams,
-								DIContainer $container) {
-		$container['urlParams'] = $urlParams;
-		$controller = $container[$controllerName];
-
-		$dispatcher = $container['Dispatcher'];
-
-		list(, , $output) =  $dispatcher->dispatch($controller, $methodName);
-		return $output;
-	}
+        $emptyResponse = false;
+        if (preg_match('/^HTTP\/\d\.\d (\d{3}) .*$/', $httpHeaders, $matches)) {
+            $status = (int)$matches[1];
+            if ($status === Http::STATUS_NO_CONTENT || $status === Http::STATUS_NOT_MODIFIED) {
+                $emptyResponse = true;
+            }
+        }
+
+        if (!$emptyResponse) {
+            if ($response instanceof ICallbackResponse) {
+                $response->callback($io);
+            } elseif (!is_null($output)) {
+                $io->setHeader('Content-Length: ' . strlen($output));
+                $io->setOutput($output);
+            }
+        }
+    }
+
+    /**
+     * Shortcut for calling a controller method and printing the result.
+     * Similar to App:main except that no headers will be sent.
+     * This should be used for example when registering sections via
+     * \OC\AppFramework\Core\API::registerAdmin()
+     *
+     * @param string $controllerName the name of the controller under which it is
+     *                               stored in the DI container
+     * @param string $methodName the method that you want to call
+     * @param array $urlParams an array with variables extracted from the routes
+     * @param DIContainer $container an instance of a pimple container.
+     */
+    public static function part(string $controllerName, string $methodName, array $urlParams,
+                                DIContainer $container) {
+        $container['urlParams'] = $urlParams;
+        $controller = $container[$controllerName];
+
+        $dispatcher = $container['Dispatcher'];
+
+        list(, , $output) =  $dispatcher->dispatch($controller, $methodName);
+        return $output;
+    }
 }