Skip to content

Fix RedundantPropertyInitializationCheck #25930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Mar 9, 2021
Merged

Fix RedundantPropertyInitializationCheck #25930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/Cache/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
4 changes: 2 additions & 2 deletions lib/private/Files/Storage/DAV.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -143,7 +143,7 @@ protected function init() {
'userName' => $this->user,
'password' => $this->password,
];
if (isset($this->authType)) {
if ($this->authType !== null) {
$settings['authType'] = $this->authType;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/private/Route/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -95,7 +95,7 @@ public function __construct(ILogger $logger) {
* @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);
Expand Down
4 changes: 2 additions & 2 deletions lib/private/User/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class User implements IUser {
/** @var string */
private $uid;

/** @var string */
/** @var string|null */
private $displayName;

/** @var UserInterface|null */
Expand Down Expand Up @@ -128,7 +128,7 @@ public function getUID() {
* @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
Expand Down