fixing

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Author: ArtificialOwl

lib/private/WellKnown/Exceptions/NotManagedWellKnownRequestException.php

@@ -51,7 +51,7 @@ class NotManagedWellKnownRequestException extends Exception {
 	 * @param int $code
 	 * @param Throwable|null $previous
 	 */
-	public function __construct($errorCode = 404, $message = "", $code = 0, Throwable $previous = null) {
+	public function __construct(int $errorCode = 404, string $message = "", int $code = 0, ?Throwable $previous = null) {
 		parent::__construct($message, $code, $previous);
 		$this->errorCode = $errorCode;
 	}

lib/private/WellKnown/Exceptions/WellKnownRequestException.php

@@ -51,7 +51,7 @@ class WellKnownRequestException extends Exception {
 	 * @param int $code
 	 * @param Throwable|null $previous
 	 */
-	public function __construct($errorCode = 404, $message = "", $code = 0, Throwable $previous = null) {
+	public function __construct(int $errorCode = 404, string $message = "", int $code = 0, ?Throwable $previous = null) {
 		parent::__construct($message, $code, $previous);
 		$this->errorCode = $errorCode;
 	}

lib/private/WellKnown/Model/WellKnown.php

@@ -168,13 +168,13 @@ public function getProperties(): array {
 
 
 	/**
-	 * @param array $arr
+	 * @param array $links
 	 *
 	 * @return IWellKnown
 	 * @since 21.0.0
 	 */
-	public function addLink(array $arr): IWellKnown {
-		$this->links[] = $arr;
+	public function addLink(array $links): IWellKnown {
+		$this->links[] = $links;
 
 		return $this;
 	}

lib/private/WellKnown/WellKnownManager.php

@@ -30,6 +30,7 @@
 use OC\WellKnown\Exceptions\NotManagedWellKnownRequestException;
 use OC\WellKnown\Exceptions\WellKnownRequestException;
 use OC\WellKnown\Model\WellKnown;
+use OCP\AppFramework\Http;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IRequest;
 use OCP\WellKnown\Event\WellKnownEvent;
@@ -82,14 +83,14 @@ public function __construct(IEventDispatcher $eventDispatcher) {
 	public function manageRequest(IRequest $request): IWellKnown {
 		$service = $request->getParam('service', '');
 		if (!in_array($service, $this->managedServices)) {
-			throw new NotManagedWellKnownRequestException(404);
+			throw new NotManagedWellKnownRequestException(Http::STATUS_NOT_FOUND);
 		}
 
 		$wellKnown = new WellKnown($service, $request);
 		$this->eventDispatcher->dispatchTyped(new WellKnownEvent($wellKnown));
 
 		if ($this->isEmpty($wellKnown)) {
-			throw new WellKnownRequestException(404);
+			throw new WellKnownRequestException(Http::STATUS_NOT_FOUND);
 		}
 
 		return $wellKnown;

public.php

@@ -61,11 +61,14 @@
 		list($service) = explode('/', $pathInfo);
 	}
 
-	// Managing some .well-known request
+	OC_App::loadApps(['authentication']);
+	OC_App::loadApps(['filesystem', 'logging']);
 	OC_App::loadApps();
+
+	// Managing some .well-known request
 	try {
 		/** @var IWellKnownManager $manager */
-		$manager = \OC::$server->query(WellKnownManager::class);
+		$manager = \OC::$server->get(WellKnownManager::class);
 		$wellKnown = $manager->manageRequest($request);
 		header('Content-type: application/json');
 		echo json_encode($wellKnown);
@@ -88,14 +91,11 @@
 
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
-//	OC_App::loadApps(['authentication']); // should not be needed anymore
-//	OC_App::loadApps(['filesystem', 'logging']);
 
 	if (!\OC::$server->getAppManager()->isInstalled($app)) {
 		http_response_code(404);
 		exit;
 	}
-//	OC_App::loadApp($app);
 	OC_User::setIncognitoMode(true);
 
 	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';