nextcloud / server

lib/private/User/Backend.php

Spacing +9 added lines, -9 removed lines

@@ -39,14 +39,14 @@ 
 	/**
 	 * actions that user backends can define
 	 */
-	public const CREATE_USER = 1;			// 1 << 0
-	public const SET_PASSWORD = 16;			// 1 << 4
-	public const CHECK_PASSWORD = 256;			// 1 << 8
-	public const GET_HOME = 4096;			// 1 << 12
-	public const GET_DISPLAYNAME = 65536;		// 1 << 16
-	public const SET_DISPLAYNAME = 1048576;		// 1 << 20
-	public const PROVIDE_AVATAR = 16777216;		// 1 << 24
-	public const COUNT_USERS = 268435456;	// 1 << 28
+	public const CREATE_USER = 1; // 1 << 0
+	public const SET_PASSWORD = 16; // 1 << 4
+	public const CHECK_PASSWORD = 256; // 1 << 8
+	public const GET_HOME = 4096; // 1 << 12
+	public const GET_DISPLAYNAME = 65536; // 1 << 16
+	public const SET_DISPLAYNAME = 1048576; // 1 << 20
+	public const PROVIDE_AVATAR = 16777216; // 1 << 24
+	public const COUNT_USERS = 268435456; // 1 << 28
 
 	protected $possibleActions = [
 		self::CREATE_USER => 'createUser',
@@ -86,7 +86,7 @@ 
 	 * compared with self::CREATE_USER etc.
 	 */
 	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
+		return (bool) ($this->getSupportedActions() & $actions);
 	}
 
 	/**

Indentation +120 added lines, -120 removed lines

@@ -14,136 +14,136 @@
  * capabilities.
  */
 abstract class Backend implements UserInterface {
-	/**
-	 * error code for functions not provided by the user backend
-	 */
-	public const NOT_IMPLEMENTED = -501;
+    /**
+     * error code for functions not provided by the user backend
+     */
+    public const NOT_IMPLEMENTED = -501;
 
-	/**
-	 * actions that user backends can define
-	 */
-	public const CREATE_USER = 1;			// 1 << 0
-	public const SET_PASSWORD = 16;			// 1 << 4
-	public const CHECK_PASSWORD = 256;			// 1 << 8
-	public const GET_HOME = 4096;			// 1 << 12
-	public const GET_DISPLAYNAME = 65536;		// 1 << 16
-	public const SET_DISPLAYNAME = 1048576;		// 1 << 20
-	public const PROVIDE_AVATAR = 16777216;		// 1 << 24
-	public const COUNT_USERS = 268435456;	// 1 << 28
+    /**
+     * actions that user backends can define
+     */
+    public const CREATE_USER = 1;			// 1 << 0
+    public const SET_PASSWORD = 16;			// 1 << 4
+    public const CHECK_PASSWORD = 256;			// 1 << 8
+    public const GET_HOME = 4096;			// 1 << 12
+    public const GET_DISPLAYNAME = 65536;		// 1 << 16
+    public const SET_DISPLAYNAME = 1048576;		// 1 << 20
+    public const PROVIDE_AVATAR = 16777216;		// 1 << 24
+    public const COUNT_USERS = 268435456;	// 1 << 28
 
-	protected $possibleActions = [
-		self::CREATE_USER => 'createUser',
-		self::SET_PASSWORD => 'setPassword',
-		self::CHECK_PASSWORD => 'checkPassword',
-		self::GET_HOME => 'getHome',
-		self::GET_DISPLAYNAME => 'getDisplayName',
-		self::SET_DISPLAYNAME => 'setDisplayName',
-		self::PROVIDE_AVATAR => 'canChangeAvatar',
-		self::COUNT_USERS => 'countUsers',
-	];
+    protected $possibleActions = [
+        self::CREATE_USER => 'createUser',
+        self::SET_PASSWORD => 'setPassword',
+        self::CHECK_PASSWORD => 'checkPassword',
+        self::GET_HOME => 'getHome',
+        self::GET_DISPLAYNAME => 'getDisplayName',
+        self::SET_DISPLAYNAME => 'setDisplayName',
+        self::PROVIDE_AVATAR => 'canChangeAvatar',
+        self::COUNT_USERS => 'countUsers',
+    ];
 
-	/**
-	 * Get all supported actions
-	 * @return int bitwise-or'ed actions
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with self::CREATE_USER etc.
-	 */
-	public function getSupportedActions() {
-		$actions = 0;
-		foreach ($this->possibleActions as $action => $methodName) {
-			if (method_exists($this, $methodName)) {
-				$actions |= $action;
-			}
-		}
+    /**
+     * Get all supported actions
+     * @return int bitwise-or'ed actions
+     *
+     * Returns the supported actions as int to be
+     * compared with self::CREATE_USER etc.
+     */
+    public function getSupportedActions() {
+        $actions = 0;
+        foreach ($this->possibleActions as $action => $methodName) {
+            if (method_exists($this, $methodName)) {
+                $actions |= $action;
+            }
+        }
 
-		return $actions;
-	}
+        return $actions;
+    }
 
-	/**
-	 * Check if backend implements actions
-	 * @param int $actions bitwise-or'ed actions
-	 * @return boolean
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with self::CREATE_USER etc.
-	 */
-	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
-	}
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return boolean
+     *
+     * Returns the supported actions as int to be
+     * compared with self::CREATE_USER etc.
+     */
+    public function implementsActions($actions) {
+        return (bool)($this->getSupportedActions() & $actions);
+    }
 
-	/**
-	 * delete a user
-	 * @param string $uid The username of the user to delete
-	 * @return bool
-	 *
-	 * Deletes a user
-	 */
-	public function deleteUser($uid) {
-		return false;
-	}
+    /**
+     * delete a user
+     * @param string $uid The username of the user to delete
+     * @return bool
+     *
+     * Deletes a user
+     */
+    public function deleteUser($uid) {
+        return false;
+    }
 
-	/**
-	 * Get a list of all users
-	 *
-	 * @param string $search
-	 * @param null|int $limit
-	 * @param null|int $offset
-	 * @return string[] an array of all uids
-	 */
-	public function getUsers($search = '', $limit = null, $offset = null) {
-		return [];
-	}
+    /**
+     * Get a list of all users
+     *
+     * @param string $search
+     * @param null|int $limit
+     * @param null|int $offset
+     * @return string[] an array of all uids
+     */
+    public function getUsers($search = '', $limit = null, $offset = null) {
+        return [];
+    }
 
-	/**
-	 * check if a user exists
-	 * @param string $uid the username
-	 * @return boolean
-	 */
-	public function userExists($uid) {
-		return false;
-	}
+    /**
+     * check if a user exists
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function userExists($uid) {
+        return false;
+    }
 
-	/**
-	 * get the user's home directory
-	 * @param string $uid the username
-	 * @return string|boolean
-	 */
-	public function getHome(string $uid) {
-		return false;
-	}
+    /**
+     * get the user's home directory
+     * @param string $uid the username
+     * @return string|boolean
+     */
+    public function getHome(string $uid) {
+        return false;
+    }
 
-	/**
-	 * get display name of the user
-	 * @param string $uid user ID of the user
-	 * @return string display name
-	 */
-	public function getDisplayName($uid) {
-		return $uid;
-	}
+    /**
+     * get display name of the user
+     * @param string $uid user ID of the user
+     * @return string display name
+     */
+    public function getDisplayName($uid) {
+        return $uid;
+    }
 
-	/**
-	 * Get a list of all display names and user ids.
-	 *
-	 * @param string $search
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array an array of all displayNames (value) and the corresponding uids (key)
-	 */
-	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$displayNames = [];
-		$users = $this->getUsers($search, $limit, $offset);
-		foreach ($users as $user) {
-			$displayNames[$user] = $user;
-		}
-		return $displayNames;
-	}
+    /**
+     * Get a list of all display names and user ids.
+     *
+     * @param string $search
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array an array of all displayNames (value) and the corresponding uids (key)
+     */
+    public function getDisplayNames($search = '', $limit = null, $offset = null) {
+        $displayNames = [];
+        $users = $this->getUsers($search, $limit, $offset);
+        foreach ($users as $user) {
+            $displayNames[$user] = $user;
+        }
+        return $displayNames;
+    }
 
-	/**
-	 * Check if a user list is available or not
-	 * @return boolean if users can be listed or not
-	 */
-	public function hasUserListings() {
-		return false;
-	}
+    /**
+     * Check if a user list is available or not
+     * @return boolean if users can be listed or not
+     */
+    public function hasUserListings() {
+        return false;
+    }
 }

lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 		foreach ($policies as $policy) {
 			header(
 				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;'.$secureCookie.'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
 					$cookiePrefix,
 					$policy,
 					$cookieParams['path'],

Indentation +59 added lines, -59 removed lines

@@ -13,76 +13,76 @@
 use OCP\AppFramework\Middleware;
 
 class SameSiteCookieMiddleware extends Middleware {
-	/** @var Request */
-	private $request;
+    /** @var Request */
+    private $request;
 
-	/** @var ControllerMethodReflector */
-	private $reflector;
+    /** @var ControllerMethodReflector */
+    private $reflector;
 
-	public function __construct(Request $request,
-		ControllerMethodReflector $reflector) {
-		$this->request = $request;
-		$this->reflector = $reflector;
-	}
+    public function __construct(Request $request,
+        ControllerMethodReflector $reflector) {
+        $this->request = $request;
+        $this->reflector = $reflector;
+    }
 
-	public function beforeController($controller, $methodName) {
-		$requestUri = $this->request->getScriptName();
-		$processingScript = explode('/', $requestUri);
-		$processingScript = $processingScript[count($processingScript) - 1];
+    public function beforeController($controller, $methodName) {
+        $requestUri = $this->request->getScriptName();
+        $processingScript = explode('/', $requestUri);
+        $processingScript = $processingScript[count($processingScript) - 1];
 
-		if ($processingScript !== 'index.php') {
-			return;
-		}
+        if ($processingScript !== 'index.php') {
+            return;
+        }
 
-		$noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
-		if ($noSSC) {
-			return;
-		}
+        $noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
+        if ($noSSC) {
+            return;
+        }
 
-		if (!$this->request->passesLaxCookieCheck()) {
-			throw new LaxSameSiteCookieFailedException();
-		}
-	}
+        if (!$this->request->passesLaxCookieCheck()) {
+            throw new LaxSameSiteCookieFailedException();
+        }
+    }
 
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof LaxSameSiteCookieFailedException) {
-			$response = new Response();
-			$response->setStatus(Http::STATUS_FOUND);
-			$response->addHeader('Location', $this->request->getRequestUri());
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof LaxSameSiteCookieFailedException) {
+            $response = new Response();
+            $response->setStatus(Http::STATUS_FOUND);
+            $response->addHeader('Location', $this->request->getRequestUri());
 
-			$this->setSameSiteCookie();
+            $this->setSameSiteCookie();
 
-			return $response;
-		}
+            return $response;
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 
-	protected function setSameSiteCookie() {
-		$cookieParams = $this->request->getCookieParams();
-		$secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
-		$policies = [
-			'lax',
-			'strict',
-		];
+    protected function setSameSiteCookie() {
+        $cookieParams = $this->request->getCookieParams();
+        $secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
+        $policies = [
+            'lax',
+            'strict',
+        ];
 
-		// Append __Host to the cookie if it meets the requirements
-		$cookiePrefix = '';
-		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
-			$cookiePrefix = '__Host-';
-		}
+        // Append __Host to the cookie if it meets the requirements
+        $cookiePrefix = '';
+        if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+            $cookiePrefix = '__Host-';
+        }
 
-		foreach ($policies as $policy) {
-			header(
-				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
-					$cookiePrefix,
-					$policy,
-					$cookieParams['path'],
-					$policy
-				),
-				false
-			);
-		}
-	}
+        foreach ($policies as $policy) {
+            header(
+                sprintf(
+                    'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+                    $cookiePrefix,
+                    $policy,
+                    $cookieParams['path'],
+                    $policy
+                ),
+                false
+            );
+        }
+    }
 }

lib/private/AppFramework/Http.php

Indentation +90 added lines, -90 removed lines

@@ -33,99 +33,99 @@
 use OCP\AppFramework\Http as BaseHttp;
 
 class Http extends BaseHttp {
-	private $server;
-	private $protocolVersion;
-	protected $headers;
+    private $server;
+    private $protocolVersion;
+    protected $headers;
 
-	/**
-	 * @param array $server $_SERVER
-	 * @param string $protocolVersion the http version to use defaults to HTTP/1.1
-	 */
-	public function __construct($server, $protocolVersion = 'HTTP/1.1') {
-		$this->server = $server;
-		$this->protocolVersion = $protocolVersion;
+    /**
+     * @param array $server $_SERVER
+     * @param string $protocolVersion the http version to use defaults to HTTP/1.1
+     */
+    public function __construct($server, $protocolVersion = 'HTTP/1.1') {
+        $this->server = $server;
+        $this->protocolVersion = $protocolVersion;
 
-		$this->headers = [
-			self::STATUS_CONTINUE => 'Continue',
-			self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
-			self::STATUS_PROCESSING => 'Processing',
-			self::STATUS_OK => 'OK',
-			self::STATUS_CREATED => 'Created',
-			self::STATUS_ACCEPTED => 'Accepted',
-			self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
-			self::STATUS_NO_CONTENT => 'No Content',
-			self::STATUS_RESET_CONTENT => 'Reset Content',
-			self::STATUS_PARTIAL_CONTENT => 'Partial Content',
-			self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
-			self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
-			self::STATUS_IM_USED => 'IM Used', // RFC 3229
-			self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
-			self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
-			self::STATUS_FOUND => 'Found',
-			self::STATUS_SEE_OTHER => 'See Other',
-			self::STATUS_NOT_MODIFIED => 'Not Modified',
-			self::STATUS_USE_PROXY => 'Use Proxy',
-			self::STATUS_RESERVED => 'Reserved',
-			self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
-			self::STATUS_BAD_REQUEST => 'Bad request',
-			self::STATUS_UNAUTHORIZED => 'Unauthorized',
-			self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
-			self::STATUS_FORBIDDEN => 'Forbidden',
-			self::STATUS_NOT_FOUND => 'Not Found',
-			self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
-			self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
-			self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
-			self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
-			self::STATUS_CONFLICT => 'Conflict',
-			self::STATUS_GONE => 'Gone',
-			self::STATUS_LENGTH_REQUIRED => 'Length Required',
-			self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
-			self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
-			self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
-			self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
-			self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
-			self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
-			self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
-			self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
-			self::STATUS_LOCKED => 'Locked', // RFC 4918
-			self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
-			self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
-			self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
-			self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
-			self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
-			self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
-			self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
-			self::STATUS_BAD_GATEWAY => 'Bad Gateway',
-			self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
-			self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
-			self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
-			self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
-			self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
-			self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
-			self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
-			self::STATUS_NOT_EXTENDED => 'Not extended',
-			self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
-		];
-	}
+        $this->headers = [
+            self::STATUS_CONTINUE => 'Continue',
+            self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
+            self::STATUS_PROCESSING => 'Processing',
+            self::STATUS_OK => 'OK',
+            self::STATUS_CREATED => 'Created',
+            self::STATUS_ACCEPTED => 'Accepted',
+            self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
+            self::STATUS_NO_CONTENT => 'No Content',
+            self::STATUS_RESET_CONTENT => 'Reset Content',
+            self::STATUS_PARTIAL_CONTENT => 'Partial Content',
+            self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
+            self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
+            self::STATUS_IM_USED => 'IM Used', // RFC 3229
+            self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
+            self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
+            self::STATUS_FOUND => 'Found',
+            self::STATUS_SEE_OTHER => 'See Other',
+            self::STATUS_NOT_MODIFIED => 'Not Modified',
+            self::STATUS_USE_PROXY => 'Use Proxy',
+            self::STATUS_RESERVED => 'Reserved',
+            self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
+            self::STATUS_BAD_REQUEST => 'Bad request',
+            self::STATUS_UNAUTHORIZED => 'Unauthorized',
+            self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
+            self::STATUS_FORBIDDEN => 'Forbidden',
+            self::STATUS_NOT_FOUND => 'Not Found',
+            self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
+            self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
+            self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
+            self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
+            self::STATUS_CONFLICT => 'Conflict',
+            self::STATUS_GONE => 'Gone',
+            self::STATUS_LENGTH_REQUIRED => 'Length Required',
+            self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
+            self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
+            self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
+            self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
+            self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
+            self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
+            self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
+            self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
+            self::STATUS_LOCKED => 'Locked', // RFC 4918
+            self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
+            self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
+            self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
+            self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
+            self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+            self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
+            self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
+            self::STATUS_BAD_GATEWAY => 'Bad Gateway',
+            self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
+            self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
+            self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
+            self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
+            self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
+            self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
+            self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
+            self::STATUS_NOT_EXTENDED => 'Not extended',
+            self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
+        ];
+    }
 
 
-	/**
-	 * Gets the correct header
-	 * @param int Http::CONSTANT $status the constant from the Http class
-	 * @param \DateTime $lastModified formatted last modified date
-	 * @param string $ETag the etag
-	 * @return string
-	 */
-	public function getStatusHeader($status) {
-		// we have one change currently for the http 1.0 header that differs
-		// from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
-		// if this differs any more, we want to create childclasses for this
-		if ($status === self::STATUS_TEMPORARY_REDIRECT
-			&& $this->protocolVersion === 'HTTP/1.0') {
-			$status = self::STATUS_FOUND;
-		}
+    /**
+     * Gets the correct header
+     * @param int Http::CONSTANT $status the constant from the Http class
+     * @param \DateTime $lastModified formatted last modified date
+     * @param string $ETag the etag
+     * @return string
+     */
+    public function getStatusHeader($status) {
+        // we have one change currently for the http 1.0 header that differs
+        // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
+        // if this differs any more, we want to create childclasses for this
+        if ($status === self::STATUS_TEMPORARY_REDIRECT
+            && $this->protocolVersion === 'HTTP/1.0') {
+            $status = self::STATUS_FOUND;
+        }
 
-		return $this->protocolVersion . ' ' . $status . ' ' .
-			$this->headers[$status];
-	}
+        return $this->protocolVersion . ' ' . $status . ' ' .
+            $this->headers[$status];
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 			$status = self::STATUS_FOUND;
 		}
 
-		return $this->protocolVersion . ' ' . $status . ' ' .
+		return $this->protocolVersion.' '.$status.' '.
 			$this->headers[$status];
 	}
 }

lib/private/Collaboration/Collaborators/GroupPlugin.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 		$result = ['wide' => [], 'exact' => []];
 
 		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groupIds = array_map(function (IGroup $group) {
+		$groupIds = array_map(function(IGroup $group) {
 			return $group->getGID();
 		}, $groups);
 
@@ -75,7 +75,7 @@ 
 		if (!empty($groups) && ($this->shareWithGroupOnly || $this->shareeEnumerationInGroupOnly)) {
 			// Intersect all the groups that match with the groups this user is a member of
 			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) {
+			$userGroups = array_map(function(IGroup $group) {
 				return $group->getGID();
 			}, $userGroups);
 			$groupIds = array_intersect($groupIds, $userGroups);

Indentation +111 added lines, -111 removed lines

@@ -15,115 +15,115 @@
 use OCP\Share\IShare;
 
 class GroupPlugin implements ISearchPlugin {
-	protected bool $shareeEnumeration;
-
-	protected bool $shareWithGroupOnly;
-
-	protected bool $shareeEnumerationInGroupOnly;
-
-	protected bool $groupSharingDisabled;
-
-	public function __construct(
-		private IConfig $config,
-		private IGroupManager $groupManager,
-		private IUserSession $userSession,
-		private mixed $shareWithGroupOnlyExcludeGroupsList = [],
-	) {
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-		$this->groupSharingDisabled = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'no';
-
-		if ($this->shareWithGroupOnly) {
-			$this->shareWithGroupOnlyExcludeGroupsList = json_decode($this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', ''), true) ?? [];
-		}
-	}
-
-	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
-		if ($this->groupSharingDisabled) {
-			return false;
-		}
-
-		$hasMoreResults = false;
-		$result = ['wide' => [], 'exact' => []];
-
-		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groupIds = array_map(function (IGroup $group) {
-			return $group->getGID();
-		}, $groups);
-
-		if (!$this->shareeEnumeration || count($groups) < $limit) {
-			$hasMoreResults = true;
-		}
-
-		$userGroups = [];
-		if (!empty($groups) && ($this->shareWithGroupOnly || $this->shareeEnumerationInGroupOnly)) {
-			// Intersect all the groups that match with the groups this user is a member of
-			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) {
-				return $group->getGID();
-			}, $userGroups);
-			$groupIds = array_intersect($groupIds, $userGroups);
-
-			// ShareWithGroupOnly filtering
-			$groupIds = array_diff($groupIds, $this->shareWithGroupOnlyExcludeGroupsList);
-		}
-
-		$lowerSearch = strtolower($search);
-		foreach ($groups as $group) {
-			if ($group->hideFromCollaboration()) {
-				continue;
-			}
-
-			// FIXME: use a more efficient approach
-			$gid = $group->getGID();
-			if (!in_array($gid, $groupIds)) {
-				continue;
-			}
-			if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
-				$result['exact'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => IShare::TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			} else {
-				if ($this->shareeEnumerationInGroupOnly && !in_array($group->getGID(), $userGroups, true)) {
-					continue;
-				}
-				$result['wide'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => IShare::TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			}
-		}
-
-		if ($offset === 0 && empty($result['exact'])) {
-			// On page one we try if the search result has a direct hit on the
-			// user id and if so, we add that to the exact match list
-			$group = $this->groupManager->get($search);
-			if ($group instanceof IGroup && !$group->hideFromCollaboration() && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
-				$result['exact'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => IShare::TYPE_GROUP,
-						'shareWith' => $group->getGID(),
-					],
-				];
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		}
-
-		$type = new SearchResultType('groups');
-		$searchResult->addResultSet($type, $result['wide'], $result['exact']);
-
-		return $hasMoreResults;
-	}
+    protected bool $shareeEnumeration;
+
+    protected bool $shareWithGroupOnly;
+
+    protected bool $shareeEnumerationInGroupOnly;
+
+    protected bool $groupSharingDisabled;
+
+    public function __construct(
+        private IConfig $config,
+        private IGroupManager $groupManager,
+        private IUserSession $userSession,
+        private mixed $shareWithGroupOnlyExcludeGroupsList = [],
+    ) {
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+        $this->groupSharingDisabled = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'no';
+
+        if ($this->shareWithGroupOnly) {
+            $this->shareWithGroupOnlyExcludeGroupsList = json_decode($this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', ''), true) ?? [];
+        }
+    }
+
+    public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
+        if ($this->groupSharingDisabled) {
+            return false;
+        }
+
+        $hasMoreResults = false;
+        $result = ['wide' => [], 'exact' => []];
+
+        $groups = $this->groupManager->search($search, $limit, $offset);
+        $groupIds = array_map(function (IGroup $group) {
+            return $group->getGID();
+        }, $groups);
+
+        if (!$this->shareeEnumeration || count($groups) < $limit) {
+            $hasMoreResults = true;
+        }
+
+        $userGroups = [];
+        if (!empty($groups) && ($this->shareWithGroupOnly || $this->shareeEnumerationInGroupOnly)) {
+            // Intersect all the groups that match with the groups this user is a member of
+            $userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+            $userGroups = array_map(function (IGroup $group) {
+                return $group->getGID();
+            }, $userGroups);
+            $groupIds = array_intersect($groupIds, $userGroups);
+
+            // ShareWithGroupOnly filtering
+            $groupIds = array_diff($groupIds, $this->shareWithGroupOnlyExcludeGroupsList);
+        }
+
+        $lowerSearch = strtolower($search);
+        foreach ($groups as $group) {
+            if ($group->hideFromCollaboration()) {
+                continue;
+            }
+
+            // FIXME: use a more efficient approach
+            $gid = $group->getGID();
+            if (!in_array($gid, $groupIds)) {
+                continue;
+            }
+            if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
+                $result['exact'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => IShare::TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            } else {
+                if ($this->shareeEnumerationInGroupOnly && !in_array($group->getGID(), $userGroups, true)) {
+                    continue;
+                }
+                $result['wide'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => IShare::TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            }
+        }
+
+        if ($offset === 0 && empty($result['exact'])) {
+            // On page one we try if the search result has a direct hit on the
+            // user id and if so, we add that to the exact match list
+            $group = $this->groupManager->get($search);
+            if ($group instanceof IGroup && !$group->hideFromCollaboration() && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
+                $result['exact'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => IShare::TYPE_GROUP,
+                        'shareWith' => $group->getGID(),
+                    ],
+                ];
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        }
+
+        $type = new SearchResultType('groups');
+        $searchResult->addResultSet($type, $result['wide'], $result['exact']);
+
+        return $hasMoreResults;
+    }
 }

lib/public/Log/IFileBased.php

Indentation +8 added lines, -8 removed lines

@@ -30,13 +30,13 @@
  * @since 14.0.0
  */
 interface IFileBased {
-	/**
-	 * @since 14.0.0
-	 */
-	public function getLogFilePath():string;
+    /**
+     * @since 14.0.0
+     */
+    public function getLogFilePath():string;
 
-	/**
-	 * @since 14.0.0
-	 */
-	public function getEntries(int $limit = 50, int $offset = 0): array;
+    /**
+     * @since 14.0.0
+     */
+    public function getEntries(int $limit = 50, int $offset = 0): array;
 }

lib/public/AppFramework/ApiController.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 		$response = new Response();
 		$response->addHeader('Access-Control-Allow-Origin', $origin);
 		$response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
-		$response->addHeader('Access-Control-Max-Age', (string)$this->corsMaxAge);
+		$response->addHeader('Access-Control-Max-Age', (string) $this->corsMaxAge);
 		$response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
 		$response->addHeader('Access-Control-Allow-Credentials', 'false');
 		return $response;

Indentation +50 added lines, -50 removed lines

@@ -18,58 +18,58 @@
  * @since 7.0.0
  */
 abstract class ApiController extends Controller {
-	private $corsMethods;
-	private $corsAllowedHeaders;
-	private $corsMaxAge;
+    private $corsMethods;
+    private $corsAllowedHeaders;
+    private $corsMaxAge;
 
-	/**
-	 * constructor of the controller
-	 * @param string $appName the name of the app
-	 * @param IRequest $request an instance of the request
-	 * @param string $corsMethods comma separated string of HTTP verbs which
-	 *                            should be allowed for websites or webapps when calling your API, defaults to
-	 *                            'PUT, POST, GET, DELETE, PATCH'
-	 * @param string $corsAllowedHeaders comma separated string of HTTP headers
-	 *                                   which should be allowed for websites or webapps when calling your API,
-	 *                                   defaults to 'Authorization, Content-Type, Accept'
-	 * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
-	 *                        request should be cached, defaults to 1728000 seconds
-	 * @since 7.0.0
-	 */
-	public function __construct($appName,
-		IRequest $request,
-		$corsMethods = 'PUT, POST, GET, DELETE, PATCH',
-		$corsAllowedHeaders = 'Authorization, Content-Type, Accept',
-		$corsMaxAge = 1728000) {
-		parent::__construct($appName, $request);
-		$this->corsMethods = $corsMethods;
-		$this->corsAllowedHeaders = $corsAllowedHeaders;
-		$this->corsMaxAge = $corsMaxAge;
-	}
+    /**
+     * constructor of the controller
+     * @param string $appName the name of the app
+     * @param IRequest $request an instance of the request
+     * @param string $corsMethods comma separated string of HTTP verbs which
+     *                            should be allowed for websites or webapps when calling your API, defaults to
+     *                            'PUT, POST, GET, DELETE, PATCH'
+     * @param string $corsAllowedHeaders comma separated string of HTTP headers
+     *                                   which should be allowed for websites or webapps when calling your API,
+     *                                   defaults to 'Authorization, Content-Type, Accept'
+     * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
+     *                        request should be cached, defaults to 1728000 seconds
+     * @since 7.0.0
+     */
+    public function __construct($appName,
+        IRequest $request,
+        $corsMethods = 'PUT, POST, GET, DELETE, PATCH',
+        $corsAllowedHeaders = 'Authorization, Content-Type, Accept',
+        $corsMaxAge = 1728000) {
+        parent::__construct($appName, $request);
+        $this->corsMethods = $corsMethods;
+        $this->corsAllowedHeaders = $corsAllowedHeaders;
+        $this->corsMaxAge = $corsMaxAge;
+    }
 
 
-	/**
-	 * This method implements a preflighted cors response for you that you can
-	 * link to for the options request
-	 *
-	 * @since 7.0.0
-	 */
-	#[NoCSRFRequired]
-	#[PublicPage]
-	#[NoAdminRequired]
-	public function preflightedCors() {
-		if (isset($this->request->server['HTTP_ORIGIN'])) {
-			$origin = $this->request->server['HTTP_ORIGIN'];
-		} else {
-			$origin = '*';
-		}
+    /**
+     * This method implements a preflighted cors response for you that you can
+     * link to for the options request
+     *
+     * @since 7.0.0
+     */
+    #[NoCSRFRequired]
+    #[PublicPage]
+    #[NoAdminRequired]
+    public function preflightedCors() {
+        if (isset($this->request->server['HTTP_ORIGIN'])) {
+            $origin = $this->request->server['HTTP_ORIGIN'];
+        } else {
+            $origin = '*';
+        }
 
-		$response = new Response();
-		$response->addHeader('Access-Control-Allow-Origin', $origin);
-		$response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
-		$response->addHeader('Access-Control-Max-Age', (string)$this->corsMaxAge);
-		$response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
-		$response->addHeader('Access-Control-Allow-Credentials', 'false');
-		return $response;
-	}
+        $response = new Response();
+        $response->addHeader('Access-Control-Allow-Origin', $origin);
+        $response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
+        $response->addHeader('Access-Control-Max-Age', (string)$this->corsMaxAge);
+        $response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
+        $response->addHeader('Access-Control-Allow-Credentials', 'false');
+        return $response;
+    }
 }

lib/public/AppFramework/App.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 
 		if ($runIsSetupDirectly) {
 			$applicationClassName = get_class($this);
-			$e = new \RuntimeException('App class ' . $applicationClassName . ' is not setup via query() but directly');
+			$e = new \RuntimeException('App class '.$applicationClassName.' is not setup via query() but directly');
 			$setUpViaQuery = false;
 
 			$classNameParts = explode('\\', trim($applicationClassName, '\\'));

Indentation +136 added lines, -136 removed lines

@@ -23,140 +23,140 @@
  * @since 6.0.0
  */
 class App {
-	/** @var IAppContainer */
-	private $container;
-
-	/**
-	 * Turns an app id into a namespace by convention. The id is split at the
-	 * underscores, all parts are CamelCased and reassembled. e.g.:
-	 * some_app_id -> OCA\SomeAppId
-	 * @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
-	 * @since 8.0.0
-	 */
-	public static function buildAppNamespace(string $appId, string $topNamespace = 'OCA\\'): string {
-		return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace);
-	}
-
-
-	/**
-	 * @param string $appName
-	 * @param array $urlParams an array with variables extracted from the routes
-	 * @since 6.0.0
-	 */
-	public function __construct(string $appName, array $urlParams = []) {
-		$runIsSetupDirectly = \OC::$server->getConfig()->getSystemValueBool('debug')
-			&& !ini_get('zend.exception_ignore_args');
-
-		if ($runIsSetupDirectly) {
-			$applicationClassName = get_class($this);
-			$e = new \RuntimeException('App class ' . $applicationClassName . ' is not setup via query() but directly');
-			$setUpViaQuery = false;
-
-			$classNameParts = explode('\\', trim($applicationClassName, '\\'));
-
-			foreach ($e->getTrace() as $step) {
-				if (isset($step['class'], $step['function'], $step['args'][0]) &&
-					$step['class'] === ServerContainer::class &&
-					$step['function'] === 'query' &&
-					$step['args'][0] === $applicationClassName) {
-					$setUpViaQuery = true;
-					break;
-				} elseif (isset($step['class'], $step['function'], $step['args'][0]) &&
-					$step['class'] === ServerContainer::class &&
-					$step['function'] === 'getAppContainer' &&
-					$step['args'][1] === $classNameParts[1]) {
-					$setUpViaQuery = true;
-					break;
-				}
-			}
-
-			if (!$setUpViaQuery && $applicationClassName !== \OCP\AppFramework\App::class) {
-				\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), [
-					'app' => $appName,
-					'exception' => $e,
-				]);
-			}
-		}
-
-		try {
-			$this->container = \OC::$server->getRegisteredAppContainer($appName);
-		} catch (QueryException $e) {
-			$this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams);
-		}
-	}
-
-	/**
-	 * @return IAppContainer
-	 * @since 6.0.0
-	 */
-	public function getContainer(): IAppContainer {
-		return $this->container;
-	}
-
-	/**
-	 * This function is to be called to create single routes and restful routes based on the given $routes array.
-	 *
-	 * Example code in routes.php of tasks app (it will register two restful resources):
-	 * $routes = array(
-	 *		'resources' => array(
-	 *		'lists' => array('url' => '/tasklists'),
-	 *		'tasks' => array('url' => '/tasklists/{listId}/tasks')
-	 *	)
-	 *	);
-	 *
-	 * $a = new TasksApp();
-	 * $a->registerRoutes($this, $routes);
-	 *
-	 * @param \OCP\Route\IRouter $router
-	 * @param array $routes
-	 * @since 6.0.0
-	 * @suppress PhanAccessMethodInternal
-	 * @deprecated 20.0.0 Just return an array from your routes.php
-	 */
-	public function registerRoutes(IRouter $router, array $routes) {
-		if (!($router instanceof Router)) {
-			throw new \RuntimeException('Can only setup routes with real router');
-		}
-
-		$routeConfig = new RouteConfig($this->container, $router, $routes);
-		$routeConfig->register();
-	}
-
-	/**
-	 * This function is called by the routing component to fire up the frameworks dispatch mechanism.
-	 *
-	 * Example code in routes.php of the task app:
-	 * $this->create('tasks_index', '/')->get()->action(
-	 *		function($params){
-	 *			$app = new TaskApp($params);
-	 *			$app->dispatch('PageController', 'index');
-	 *		}
-	 *	);
-	 *
-	 *
-	 * Example for for TaskApp implementation:
-	 * class TaskApp extends \OCP\AppFramework\App {
-	 *
-	 *		public function __construct($params){
-	 *			parent::__construct('tasks', $params);
-	 *
-	 *			$this->getContainer()->registerService('PageController', function(IAppContainer $c){
-	 *				$a = $c->query('API');
-	 *				$r = $c->query('Request');
-	 *				return new PageController($a, $r);
-	 *			});
-	 *		}
-	 *	}
-	 *
-	 * @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
-	 * @since 6.0.0
-	 */
-	public function dispatch(string $controllerName, string $methodName) {
-		\OC\AppFramework\App::main($controllerName, $methodName, $this->container);
-	}
+    /** @var IAppContainer */
+    private $container;
+
+    /**
+     * Turns an app id into a namespace by convention. The id is split at the
+     * underscores, all parts are CamelCased and reassembled. e.g.:
+     * some_app_id -> OCA\SomeAppId
+     * @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
+     * @since 8.0.0
+     */
+    public static function buildAppNamespace(string $appId, string $topNamespace = 'OCA\\'): string {
+        return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace);
+    }
+
+
+    /**
+     * @param string $appName
+     * @param array $urlParams an array with variables extracted from the routes
+     * @since 6.0.0
+     */
+    public function __construct(string $appName, array $urlParams = []) {
+        $runIsSetupDirectly = \OC::$server->getConfig()->getSystemValueBool('debug')
+            && !ini_get('zend.exception_ignore_args');
+
+        if ($runIsSetupDirectly) {
+            $applicationClassName = get_class($this);
+            $e = new \RuntimeException('App class ' . $applicationClassName . ' is not setup via query() but directly');
+            $setUpViaQuery = false;
+
+            $classNameParts = explode('\\', trim($applicationClassName, '\\'));
+
+            foreach ($e->getTrace() as $step) {
+                if (isset($step['class'], $step['function'], $step['args'][0]) &&
+                    $step['class'] === ServerContainer::class &&
+                    $step['function'] === 'query' &&
+                    $step['args'][0] === $applicationClassName) {
+                    $setUpViaQuery = true;
+                    break;
+                } elseif (isset($step['class'], $step['function'], $step['args'][0]) &&
+                    $step['class'] === ServerContainer::class &&
+                    $step['function'] === 'getAppContainer' &&
+                    $step['args'][1] === $classNameParts[1]) {
+                    $setUpViaQuery = true;
+                    break;
+                }
+            }
+
+            if (!$setUpViaQuery && $applicationClassName !== \OCP\AppFramework\App::class) {
+                \OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), [
+                    'app' => $appName,
+                    'exception' => $e,
+                ]);
+            }
+        }
+
+        try {
+            $this->container = \OC::$server->getRegisteredAppContainer($appName);
+        } catch (QueryException $e) {
+            $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams);
+        }
+    }
+
+    /**
+     * @return IAppContainer
+     * @since 6.0.0
+     */
+    public function getContainer(): IAppContainer {
+        return $this->container;
+    }
+
+    /**
+     * This function is to be called to create single routes and restful routes based on the given $routes array.
+     *
+     * Example code in routes.php of tasks app (it will register two restful resources):
+     * $routes = array(
+     *		'resources' => array(
+     *		'lists' => array('url' => '/tasklists'),
+     *		'tasks' => array('url' => '/tasklists/{listId}/tasks')
+     *	)
+     *	);
+     *
+     * $a = new TasksApp();
+     * $a->registerRoutes($this, $routes);
+     *
+     * @param \OCP\Route\IRouter $router
+     * @param array $routes
+     * @since 6.0.0
+     * @suppress PhanAccessMethodInternal
+     * @deprecated 20.0.0 Just return an array from your routes.php
+     */
+    public function registerRoutes(IRouter $router, array $routes) {
+        if (!($router instanceof Router)) {
+            throw new \RuntimeException('Can only setup routes with real router');
+        }
+
+        $routeConfig = new RouteConfig($this->container, $router, $routes);
+        $routeConfig->register();
+    }
+
+    /**
+     * This function is called by the routing component to fire up the frameworks dispatch mechanism.
+     *
+     * Example code in routes.php of the task app:
+     * $this->create('tasks_index', '/')->get()->action(
+     *		function($params){
+     *			$app = new TaskApp($params);
+     *			$app->dispatch('PageController', 'index');
+     *		}
+     *	);
+     *
+     *
+     * Example for for TaskApp implementation:
+     * class TaskApp extends \OCP\AppFramework\App {
+     *
+     *		public function __construct($params){
+     *			parent::__construct('tasks', $params);
+     *
+     *			$this->getContainer()->registerService('PageController', function(IAppContainer $c){
+     *				$a = $c->query('API');
+     *				$r = $c->query('Request');
+     *				return new PageController($a, $r);
+     *			});
+     *		}
+     *	}
+     *
+     * @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
+     * @since 6.0.0
+     */
+    public function dispatch(string $controllerName, string $methodName) {
+        \OC\AppFramework\App::main($controllerName, $methodName, $this->container);
+    }
 }

lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 				$this->manager->invalidateTokenById($uid, $token->getId());
 			}
 		} catch (Throwable $e) {
-			$this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
+			$this->logger->error('Could not clean up auth tokens after user deletion: '.$e->getMessage(), [
 				'exception' => $e,
 			]);
 		}

Indentation +34 added lines, -34 removed lines

@@ -19,38 +19,38 @@
  * @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent>
  */
 class UserDeletedTokenCleanupListener implements IEventListener {
-	/** @var Manager */
-	private $manager;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(Manager $manager,
-		LoggerInterface $logger) {
-		$this->manager = $manager;
-		$this->logger = $logger;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof UserDeletedEvent)) {
-			// Unrelated
-			return;
-		}
-
-		/**
-		 * Catch any exception during this process as any failure here shouldn't block the
-		 * user deletion.
-		 */
-		try {
-			$uid = $event->getUser()->getUID();
-			$tokens = $this->manager->getTokenByUser($uid);
-			foreach ($tokens as $token) {
-				$this->manager->invalidateTokenById($uid, $token->getId());
-			}
-		} catch (Throwable $e) {
-			$this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
-				'exception' => $e,
-			]);
-		}
-	}
+    /** @var Manager */
+    private $manager;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    public function __construct(Manager $manager,
+        LoggerInterface $logger) {
+        $this->manager = $manager;
+        $this->logger = $logger;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof UserDeletedEvent)) {
+            // Unrelated
+            return;
+        }
+
+        /**
+         * Catch any exception during this process as any failure here shouldn't block the
+         * user deletion.
+         */
+        try {
+            $uid = $event->getUser()->getUID();
+            $tokens = $this->manager->getTokenByUser($uid);
+            foreach ($tokens as $token) {
+                $this->manager->invalidateTokenById($uid, $token->getId());
+            }
+        } catch (Throwable $e) {
+            $this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
+                'exception' => $e,
+            ]);
+        }
+    }
 }

apps/settings/templates/settings/personal/security/twofactor.php

Spacing +4 added lines, -4 removed lines

@@ -25,12 +25,12 @@
 ?>
 
 <div id="two-factor-auth" class="section">
-	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
+	<h2><?php p($l->t('Two-Factor Authentication')); ?></h2>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('user-2fa')); ?>"></a>
-	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.'));?></p>
-	<p class="settings-hint"><?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.'));?></p>
+	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.')); ?></p>
+	<p class="settings-hint"><?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.')); ?></p>
 	<ul>
 	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
 		<li>

Indentation +12 added lines, -12 removed lines

@@ -19,18 +19,18 @@
 		<li>
 			<?php
 
-			/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
-			$provider = $data['provider'];
-		//Handle 2FA provider icons and theme
-		if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-			$icon = $provider->getDarkIcon();
-			//fallback icon if the 2factor provider doesn't provide an icon.
-		} else {
-			$icon = image_path('core', 'actions/password.svg');
-		}
-		/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
-		$settings = $data['settings'];
-		?>
+            /** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
+            $provider = $data['provider'];
+        //Handle 2FA provider icons and theme
+        if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
+            $icon = $provider->getDarkIcon();
+            //fallback icon if the 2factor provider doesn't provide an icon.
+        } else {
+            $icon = image_path('core', 'actions/password.svg');
+        }
+        /** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
+        $settings = $data['settings'];
+        ?>
 			<h3>
 				<img class="two-factor-provider-settings-icon" src="<?php p($icon) ?>" alt="">
 				<?php p($provider->getDisplayName()) ?>