Fix Psalm issues (#1)

Author: tvdijen

lib/Auth/Process/AttributeAddUsersGroups.php

@@ -2,6 +2,8 @@
 
 namespace SimpleSAML\Module\ldap\Auth\Process;
 
+use SimpleSAML\Utils\Arrays;
+
 /**
  * Does a reverse membership lookup on the logged in user,
  * looking for groups it is a member of and adds them to
@@ -252,7 +254,7 @@ protected function search($memberof)
         $get_attributes = [$map['memberof'], $map['type']];
         if (isset($map['name']) && $map['name']) {
             $get_attributes[] = $map['name'];
-            $use_group_name = false;
+            $use_group_name = true;
         }
 
         // Check each DN of the passed memberOf
@@ -319,7 +321,7 @@ protected function searchActiveDirectory($dn)
             ' Member Attribute: '.$map['member'].
             ' Type Attribute: '.$map['type'].
             ' Type Value: '.$this->type_map['group'].
-            ' Base: '.implode('; ', $this->base_dn)
+            ' Base: '.implode('; ', Arrays::Arrayize($this->base_dn))
         );
 
         // AD connections should have this set

lib/Auth/Process/BaseFilter.php

@@ -49,9 +49,9 @@ abstract class BaseFilter extends \SimpleSAML\Auth\ProcessingFilter
      * Instance, object of the ldap connection. Stored here to
      * be access later during processing.
      *
-     * @var \SimpleSAML\Auth\LDAP
+     * @var \SimpleSAML\Auth\LDAP|null
      */
-    private $ldap;
+    private $ldap = null;
 
 
     /**
@@ -249,6 +249,7 @@ public function __construct(&$config, $reserved)
         );
     }
 
+
     /**
      * Getter for the LDAP connection object. Created this getter
      * rather than setting in the constructor to avoid unnecessarily
@@ -294,6 +295,7 @@ protected function getLdap()
         return $this->ldap;
     }
 
+
     /**
      * Local utility function to get details about a variable,
      * basically converting it to a string to be used in a log

lib/ConfigHelper.php

@@ -205,6 +205,10 @@ public function login($username, $password, array $sasl_args = null)
                 }
             }
 
+            /**
+             * PHPdoc changed in SSP 1.18; Remove it after release
+             * @var string|null $dn
+             */
             $dn = $ldap->searchfordn(
                 $this->searchBase,
                 $this->searchAttributes,
@@ -213,6 +217,7 @@ public function login($username, $password, array $sasl_args = null)
                 $this->searchFilter,
                 $this->searchScope
             );
+
             if ($dn === null) {
                 /* User not found with search. */
                 \SimpleSAML\Logger::info($this->location.': Unable to find users DN. username=\''.$username.'\'');