From 04614b9c6e4474ffd0ed93319e3c20bb8d781193 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Sun, 4 Dec 2022 09:22:59 -0800 Subject: [PATCH] base: uppercase getUid --- lib/Controller/ApiBase.php | 2 +- lib/Controller/DaysController.php | 4 ++-- lib/Controller/OtherController.php | 2 +- lib/Controller/PageController.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Controller/ApiBase.php b/lib/Controller/ApiBase.php index f7d22952..f2e67311 100644 --- a/lib/Controller/ApiBase.php +++ b/lib/Controller/ApiBase.php @@ -85,7 +85,7 @@ class ApiBase extends Controller } /** Get logged in user's UID or throw HTTP error */ - protected function getUid(): string + protected function getUID(): string { $user = $this->userSession->getUser(); if ($this->getShareToken()) { diff --git a/lib/Controller/DaysController.php b/lib/Controller/DaysController.php index f3512cf3..9b8889f7 100644 --- a/lib/Controller/DaysController.php +++ b/lib/Controller/DaysController.php @@ -39,7 +39,7 @@ class DaysController extends ApiBase public function days(): JSONResponse { // Get the folder to show - $uid = $this->getUid(); + $uid = $this->getUID(); // Get the folder to show $root = null; @@ -92,7 +92,7 @@ class DaysController extends ApiBase public function day(string $id): JSONResponse { // Get user - $uid = $this->getUid(); + $uid = $this->getUID(); // Check for wildcard $dayIds = []; diff --git a/lib/Controller/OtherController.php b/lib/Controller/OtherController.php index 5d95830f..8b83e6b4 100644 --- a/lib/Controller/OtherController.php +++ b/lib/Controller/OtherController.php @@ -53,7 +53,7 @@ class OtherController extends ApiBase return new JSONResponse(['message' => 'Cannot change settings in readonly mode'], Http::STATUS_FORBIDDEN); } - $userId = $user->getUid(); + $userId = $user->getUID(); $this->config->setUserValue($userId, Application::APPNAME, $key, $value); return new JSONResponse([], Http::STATUS_OK); diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 7c2100d1..eb13f0f7 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -62,7 +62,7 @@ class PageController extends Controller $this->eventDispatcher->dispatchTyped(new LoadSidebar()); // Configuration - $uid = $user->getUid(); + $uid = $user->getUID(); $this->initialState->provideInitialState('timelinePath', $this->config->getUserValue( $uid, Application::APPNAME,