From 08aaa96630e14ecc54e8aab8c57c3c4909708b43 Mon Sep 17 00:00:00 2001
From: Andrew Hoffmann <andrew.hoffmann@wisc.edu>
Date: Tue, 6 Dec 2016 10:49:23 -0600
Subject: [PATCH] Group conditional logic to clarify precedence
It may not be clear to the developer that `&&` takes precedence over `||`. This change was recommended by a code quality scan.
---
.../uwphps/preauth/FederatedPreauthUserDetailsProvider.php | 4 ++--
.../wisc/doit/uwphps/preauth/PreauthUserDetailsProvider.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/edu/wisc/doit/uwphps/preauth/FederatedPreauthUserDetailsProvider.php b/src/main/edu/wisc/doit/uwphps/preauth/FederatedPreauthUserDetailsProvider.php
index 48dfdf1..1dd0dd8 100644
--- a/src/main/edu/wisc/doit/uwphps/preauth/FederatedPreauthUserDetailsProvider.php
+++ b/src/main/edu/wisc/doit/uwphps/preauth/FederatedPreauthUserDetailsProvider.php
@@ -27,8 +27,8 @@ class FederatedPreauthUserDetailsProvider extends UserDetailsProvider
public function loadUser()
{
// Return null if no Shib session is found
- if ($this->httpHeaders && !getenv(static::SHIB_SESSION_ID_HTTP) ||
- !$this->httpHeaders && !getenv(static::SHIB_SESSION_ID)) {
+ if (($this->httpHeaders && !getenv(static::SHIB_SESSION_ID_HTTP)) ||
+ (!$this->httpHeaders && !getenv(static::SHIB_SESSION_ID))) {
return null;
}
diff --git a/src/main/edu/wisc/doit/uwphps/preauth/PreauthUserDetailsProvider.php b/src/main/edu/wisc/doit/uwphps/preauth/PreauthUserDetailsProvider.php
index 31f8261..58b647d 100644
--- a/src/main/edu/wisc/doit/uwphps/preauth/PreauthUserDetailsProvider.php
+++ b/src/main/edu/wisc/doit/uwphps/preauth/PreauthUserDetailsProvider.php
@@ -29,8 +29,8 @@ class PreauthUserDetailsProvider extends UserDetailsProvider
public function loadUser()
{
// Return null if no Shib session is found
- if ($this->httpHeaders && !getenv(static::SHIB_SESSION_ID_HTTP) ||
- !$this->httpHeaders && !getenv(static::SHIB_SESSION_ID)) {
+ if (($this->httpHeaders && !getenv(static::SHIB_SESSION_ID_HTTP)) ||
+ (!$this->httpHeaders && !getenv(static::SHIB_SESSION_ID))) {
return null;
}
--
GitLab