Merge pull request #28 from melanger/patch-2

remove unnecessary is_null

Author: vyskocilpavel

CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+#### Changed
+- Remove unnecessary is_null()
+
 #### Fixed
 - Log info message about successful authentication only after successful authentication to SP
 

lib/Auth/Process/DatabaseCommand.php

@@ -43,7 +43,7 @@ public static function insertLogin(&$request, &$date)
         $month = $date->format('m');
         $day = $date->format('d');
 
-        if (is_null($idpEntityID) || empty($idpEntityID) || is_null($spEntityId) || empty($spEntityId)) {
+        if (empty($idpEntityID) || empty($spEntityId)) {
             Logger::error(
                 "Some from attribute: 'idpEntityId', 'idpName', 'spEntityId' and 'spName'" .
                 " is null or empty and login log wasn't inserted into the database."
@@ -58,7 +58,7 @@ public static function insertLogin(&$request, &$date)
                 Logger::error("The login log wasn't inserted into table: " . $statisticsTableName . ".");
             }
 
-            if (!is_null($idpName) && !empty($idpName)) {
+            if (!empty($idpName)) {
                 $stmt->prepare(
                     "INSERT INTO " . $identityProvidersMapTableName .
                     "(entityId, name) VALUES (?, ?) ON DUPLICATE KEY UPDATE name = ?"
@@ -67,7 +67,7 @@ public static function insertLogin(&$request, &$date)
                 $stmt->execute();
             }
 
-            if (!is_null($spName) && !empty($spName)) {
+            if (!empty($spName)) {
                 $stmt->prepare(
                     "INSERT INTO " . $serviceProvidersMapTableName .
                     "(identifier, name) VALUES (?, ?) ON DUPLICATE KEY UPDATE name = ?"

templates/idpDetail-tpl.php

@@ -36,7 +36,7 @@
 
 $idpName = DatabaseCommand::getIdPNameByEntityId($idpEntityId);
 
-if (!is_null($idpName) && !empty($idpName)) {
+if (!empty($idpName)) {
     $this->data['header'] = $this->t('{proxystatistics:Proxystatistics:templates/idpDetail_header_name}') . $idpName;
 } else {
     $this->data['header'] = $this->t('{proxystatistics:Proxystatistics:templates/idpDetail_header_entityId}') .

templates/spDetail-tpl.php

@@ -35,7 +35,7 @@
 
 $spName = DatabaseCommand::getSpNameBySpIdentifier($spIdentifier);
 
-if (!is_null($spName) && !empty($spName)) {
+if (!empty($spName)) {
     $this->data['header'] = $this->t('{proxystatistics:Proxystatistics:templates/spDetail_header_name}') .
         $spName;
 } else {