From 618805b14f163e630577f9ad701b12fa017a1d70 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 4 Mar 2021 14:49:58 +0100
Subject: [PATCH] Fix RedundantPropertyInitializationCheck

For #25839

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 lib/private/Cache/File.php        | 2 +-
 lib/private/Files/Storage/DAV.php | 4 ++--
 lib/private/Route/Router.php      | 4 ++--
 lib/private/User/User.php         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php
index 04ec33f761..756bc9c36a 100644
--- a/lib/private/Cache/File.php
+++ b/lib/private/Cache/File.php
@@ -49,7 +49,7 @@ class File implements ICache {
 	 * @throws \OC\User\NoUserException
 	 */
 	protected function getStorage() {
-		if (isset($this->storage)) {
+		if ($this->storage !== null) {
 			return $this->storage;
 		}
 		if (\OC::$server->getUserSession()->isLoggedIn()) {
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
index 0c9c41a3d9..8f09452e1f 100644
--- a/lib/private/Files/Storage/DAV.php
+++ b/lib/private/Files/Storage/DAV.php
@@ -69,7 +69,7 @@ class DAV extends Common {
 	protected $password;
 	/** @var string */
 	protected $user;
-	/** @var string */
+	/** @var string|null */
 	protected $authType;
 	/** @var string */
 	protected $host;
@@ -143,7 +143,7 @@ class DAV extends Common {
 			'userName' => $this->user,
 			'password' => $this->password,
 		];
-		if (isset($this->authType)) {
+		if ($this->authType !== null) {
 			$settings['authType'] = $this->authType;
 		}
 
diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php
index 8a7123ffc8..2ed8a1991e 100644
--- a/lib/private/Route/Router.php
+++ b/lib/private/Route/Router.php
@@ -56,7 +56,7 @@ class Router implements IRouter {
 	protected $root = null;
 	/** @var null|UrlGenerator */
 	protected $generator = null;
-	/** @var string[] */
+	/** @var string[]|null */
 	protected $routingFiles;
 	/** @var bool */
 	protected $loaded = false;
@@ -95,7 +95,7 @@ class Router implements IRouter {
 	 * @return string[]
 	 */
 	public function getRoutingFiles() {
-		if (!isset($this->routingFiles)) {
+		if ($this->routingFiles === null) {
 			$this->routingFiles = [];
 			foreach (\OC_APP::getEnabledApps() as $app) {
 				$appPath = \OC_App::getAppPath($app);
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index 24082926b0..5bc42a469d 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -61,7 +61,7 @@ class User implements IUser {
 	/** @var string */
 	private $uid;
 
-	/** @var string */
+	/** @var string|null */
 	private $displayName;
 
 	/** @var UserInterface|null */
@@ -128,7 +128,7 @@ class User implements IUser {
 	 * @return string
 	 */
 	public function getDisplayName() {
-		if (!isset($this->displayName)) {
+		if ($this->displayName === null) {
 			$displayName = '';
 			if ($this->backend && $this->backend->implementsActions(Backend::GET_DISPLAYNAME)) {
 				// get display name and strip whitespace from the beginning and end of it