Removed var ===/!== null checks before empty(var) function

Author: BaranekD

CHANGELOG.md

@@ -66,6 +66,7 @@ All notable changes to this project will be documented in this file.
 #### Changed
 - RpcConnector now stores cookie into file
 - Set CONNECTTIMEOUT and TIMEOUT in RpcConnector
+- Removed checks in ifs that var is (not) null before empty(var) function (empty checks that itself)
 - Use new object perunFacility in LDAP to search information about facility
 - Configuration for warning on DS is now in module_perun.php
 

lib/AdapterLdap.php

@@ -337,7 +337,7 @@ public function getMemberStatusByUserAndVo($user, $vo)
             ["perunGroupid"]
         );
 
-        if ($groupId === null || empty($groupId)) {
+        if (empty($groupId)) {
             return Member::INVALID;
         }
         return Member::VALID;

lib/Auth/Process/PerunAttributes.php

@@ -81,7 +81,7 @@ public function process(&$request)
             foreach ($this->attrMap as $attrName => $attrValue) {
                 if (isset($request['Attributes'][$attrValue])) {
                     $attr = $request['Attributes'][$attrValue];
-                    if ($attr === null || empty($attr)) {
+                    if (empty($attr)) {
                         array_push($attributes, $attrName);
                     }
                 } else {

lib/Auth/Process/PerunIdentity.php

@@ -216,7 +216,7 @@ public function process(&$request)
 
         $groups = $this->adapter->getUsersGroupsOnFacility($this->spEntityId, $user->getId());
 
-        if ($this->checkGroupMembership && ($groups === null || empty($groups))) {
+        if ($this->checkGroupMembership && empty($groups)) {
             if ($this->allowRegistrationToGroups) {
                 $vosForRegistration = $this->getVosForRegistration($user);
 

templates/listOfSps-tpl.php

@@ -96,7 +96,7 @@
                         <th><?php echo $this->t('{perun:listOfSps:description}') ?></th>
                         <?php
                         foreach ($attributesToShow as $attr) {
-                            if ($samlServices !== null && !empty($samlServices)) {
+                            if (!empty($samlServices)) {
                                 echo "<th class='" .
                                     getClass(array_values($samlServices)[0]['facilityAttributes'][$attr]) .
                                     "'>" . array_values($samlServices)[0]['facilityAttributes'][$attr]['displayName']
@@ -109,8 +109,7 @@
                     <tbody>
                     <?php
                     foreach ($allServices as $service) {
-                        if ($service['showOnServiceList'] === null || $service['showOnServiceList']['value'] === null ||
-                            empty($service['showOnServiceList']['value']) ||
+                        if (empty($service['showOnServiceList']['value']) ||
                             !($service['showOnServiceList']['value'])
                         ) {
                             continue;
@@ -142,8 +141,7 @@
 
 function printServiceName($service)
 {
-    if ($service['loginURL'] === null || $service['loginURL']['value'] === null ||
-        empty($service['loginURL']['value'])
+    if (empty($service['loginURL']['value'])
     ) {
         return $service['facility']->getName();
     } else {
@@ -155,7 +153,7 @@ function printServiceName($service)
 function printAttributeValue($attribute, $service, $attr)
 {
     $value = $attribute['value'];
-    if (($value === null || empty($value)) && $attribute['type'] !== "java.lang.Boolean") {
+    if (empty($value) && $attribute['type'] !== "java.lang.Boolean") {
         return "<td class='center'>&horbar;</td>";
     }
     $string = '';

www/getSpMetadata.php

@@ -22,18 +22,18 @@
 $conf = Configuration::getConfig(CONFIG_FILE_NAME);
 
 $proxyIdentifier = $conf->getString(PROXY_IDENTIFIER);
-assert($proxyIdentifier === null || empty($proxyIdentifier));
+assert(empty($proxyIdentifier));
 
 $attributesDefinitions = $conf->getArray(ATTRIBUTES_DEFINITIONS);
 assert($attributesDefinitions === null || is_array($attributesDefinitions));
 
 $perunProxyIdentifierAttr = $conf->getString(PERUN_PROXY_IDENTIFIER_ATTR_NAME);
 $perunProxyEntityIDAttr = $conf->getString(PERUN_PROXY_ENTITY_ID_ATTR_NAME);
-assert($perunProxyEntityIDAttr === null || empty($perunProxyEntityIDAttr) ||
-    $perunProxyIdentifierAttr === null || empty($perunProxyIdentifierAttr));
+
+assert(empty($perunProxyEntityIDAttr) || empty($perunProxyIdentifierAttr));
 
 $absoluteFileName = $conf->getString(ABSOLUTE_FILE_NAME);
-assert($absoluteFileName === null || empty($absoluteFileName));
+assert(empty($absoluteFileName));
 
 $rpcAdapter = new AdapterRpc();
 

www/listOfSps.php

@@ -21,23 +21,23 @@
 $conf = Configuration::getConfig(CONFIG_FILE_NAME);
 
 $proxyIdentifier = $conf->getString(PROXY_IDENTIFIER);
-if ($proxyIdentifier === null || empty($proxyIdentifier)) {
+if (empty($proxyIdentifier)) {
     throw new Exception(
         "perun:listOfSps: missing mandatory config option '" . PROXY_IDENTIFIER
         . "'."
     );
 }
 
 $perunProxyIdentifierAttr = $conf->getString(PERUN_PROXY_IDENTIFIER_ATTR_NAME);
-if ($perunProxyIdentifierAttr === null || empty($perunProxyIdentifierAttr)) {
+if (empty($perunProxyIdentifierAttr)) {
     throw new Exception(
         "perun:listOfSps: missing mandatory config option '"
         . PERUN_PROXY_IDENTIFIER_ATTR_NAME . "'."
     );
 }
 
 $attributesDefinitions = $conf->getArray(ATTRIBUTES_DEFINITIONS);
-if ($attributesDefinitions === null || empty($attributesDefinitions)) {
+if (empty($attributesDefinitions)) {
     throw new Exception(
         "perun:listOfSps: missing mandatory config option '"
         . ATTRIBUTES_DEFINITIONS . "'."
@@ -46,18 +46,15 @@
 
 $showOIDCServices = $conf->getBoolean(SHOW_OIDC_SERVICES, false);
 $perunSaml2EntityIdAttr = $conf->getString(PERUN_SAML2_ENTITY_ID_ATTR_NAME);
-if ($perunSaml2EntityIdAttr === null || empty($perunSaml2EntityIdAttr)) {
+if (empty($perunSaml2EntityIdAttr)) {
     throw new Exception(
         "perun:listOfSps: missing mandatory config option '"
         . PERUN_SAML2_ENTITY_ID_ATTR_NAME . "'."
     );
 }
 
 $perunOidcClientIdAttr = $conf->getString(PERUN_OIDC_CLIENT_ID_ATTR_NAME);
-if ($showOIDCServices
-    && ($perunOidcClientIdAttr === null
-        || empty($perunOidcClientIdAttr))
-) {
+if ($showOIDCServices && empty($perunOidcClientIdAttr)) {
     throw new Exception(
         "perun:listOfSps: missing mandatory config option '"
         . PERUN_OIDC_CLIENT_ID_ATTR_NAME . "'."
@@ -78,18 +75,16 @@
 $attrNames = [];
 
 array_push($attrNames, $perunSaml2EntityIdAttr);
-if ($perunOidcClientIdAttr !== null && !empty($perunOidcClientIdAttr)) {
+if (!empty($perunOidcClientIdAttr)) {
     array_push($attrNames, $perunOidcClientIdAttr);
 }
-if ($perunLoginURLAttr !== null && !empty($perunLoginURLAttr)) {
+if (!empty($perunLoginURLAttr)) {
     array_push($attrNames, $perunLoginURLAttr);
 }
-if ($perunTestSpAttr !== null && !empty($perunTestSpAttr)) {
+if (!empty($perunTestSpAttr)) {
     array_push($attrNames, $perunTestSpAttr);
 }
-if ($perunShowOnServiceListAttr !== null
-    && !empty($perunShowOnServiceListAttr)
-) {
+if (!empty($perunShowOnServiceListAttr)) {
     array_push($attrNames, $perunShowOnServiceListAttr);
 }
 foreach ($attributesDefinitions as $attributeDefinition) {
@@ -107,9 +102,7 @@
     foreach ($attributes as $attribute) {
         $facilityAttributes[$attribute['name']] = $attribute;
     }
-    if ($facilityAttributes[$perunSaml2EntityIdAttr]['value'] !== null
-        && !empty($facilityAttributes[$perunSaml2EntityIdAttr]['value'])
-    ) {
+    if (!empty($facilityAttributes[$perunSaml2EntityIdAttr]['value'])) {
         $samlServices[$facility->getId()] = [
             'facility' => $facility,
             'loginURL' => $facilityAttributes[$perunLoginURLAttr],
@@ -121,10 +114,7 @@
         }
     }
 
-    if ($showOIDCServices
-        && ($facilityAttributes[$perunOidcClientIdAttr]['value'] !== null
-            && !empty($facilityAttributes[$perunOidcClientIdAttr]['value']))
-    ) {
+    if ($showOIDCServices && !empty($facilityAttributes[$perunOidcClientIdAttr]['value'])) {
         $oidcServices[$facility->getId()] = [
             'facility' => $facility,
             'loginURL' => $facilityAttributes[$perunLoginURLAttr],