PSR-12 + deprecation cleanup

Author: tvdijen

lib/Auth/LDAP.php

@@ -1,11 +1,5 @@
 <?php
 
-namespace SimpleSAML\Module\ldap\Auth\Process;
-
-use SimpleSAML\Module\ldap\Auth\Ldap;
-
-use Webmozart\Assert\Assert;
-
 /**
  * Filter to add attributes to the identity by executing a query against an LDAP directory
  *
@@ -38,6 +32,13 @@
  * @author Remy Blom <remy.blom@hku.nl>
  * @package SimpleSAMLphp
  */
+
+namespace SimpleSAML\Module\ldap\Auth\Process;
+
+use SimpleSAML\Logger;
+use SimpleSAML\Module\ldap\Auth\Ldap;
+use Webmozart\Assert\Assert;
+
 class AttributeAddFromLDAP extends BaseFilter
 {
     /**
@@ -72,55 +73,6 @@ class AttributeAddFromLDAP extends BaseFilter
      */
     public function __construct($config, $reserved)
     {
-        /*
-         * For backwards compatibility, check for old config names
-         * @TODO Remove after 2.0
-         */
-        if (isset($config['ldap_host'])) {
-            $config['ldap.hostname'] = $config['ldap_host'];
-        }
-        if (isset($config['ldap_port'])) {
-            $config['ldap.port'] = $config['ldap_port'];
-        }
-        if (isset($config['ldap_bind_user'])) {
-            $config['ldap.username'] = $config['ldap_bind_user'];
-        }
-        if (isset($config['ldap_bind_pwd'])) {
-            $config['ldap.password'] = $config['ldap_bind_pwd'];
-        }
-        if (isset($config['userid_attribute'])) {
-            $config['attribute.username'] = $config['userid_attribute'];
-        }
-        if (isset($config['ldap_search_base_dn'])) {
-            $config['ldap.basedn'] = $config['ldap_search_base_dn'];
-        }
-        if (isset($config['ldap_search_filter'])) {
-            $config['search.filter'] = $config['ldap_search_filter'];
-        }
-        if (isset($config['ldap_search_attribute'])) {
-            $config['search.attribute'] = $config['ldap_search_attribute'];
-        }
-        if (isset($config['new_attribute_name'])) {
-            $config['attribute.new'] = $config['new_attribute_name'];
-        }
-
-        /*
-         * Remove the old config names
-         * @TODO Remove after 2.0
-         */
-        unset(
-            $config['ldap_host'],
-            $config['ldap_port'],
-            $config['ldap_bind_user'],
-            $config['ldap_bind_pwd'],
-            $config['userid_attribute'],
-            $config['ldap_search_base_dn'],
-            $config['ldap_search_filter'],
-            $config['ldap_search_attribute'],
-            $config['new_attribute_name']
-        );
-
-        // Now that we checked for BC, run the parent constructor
         parent::__construct($config, $reserved);
 
         // Get filter specific config options
@@ -154,10 +106,10 @@ public function process(&$request)
         $arrSearch = [];
         $arrReplace = [];
         foreach ($attributes as $attr => $val) {
-            $arrSearch[] = '%'.$attr.'%';
+            $arrSearch[] = '%' . $attr . '%';
 
             if (strlen($val[0]) > 0) {
-                $arrReplace[] = Ldap::escape_filter_value($val[0]);
+                $arrReplace[] = Ldap::escapeFilterValue($val[0]);
             } else {
                 $arrReplace[] = '';
             }
@@ -167,13 +119,15 @@ public function process(&$request)
         $filter = str_replace($arrSearch, $arrReplace, $this->search_filter);
 
         if (strpos($filter, '%') !== false) {
-            \SimpleSAML\Logger::info('AttributeAddFromLDAP: There are non-existing attributes in the search filter. ('.
-                $this->search_filter.')');
+            Logger::info(
+                'AttributeAddFromLDAP: There are non-existing attributes in the search filter. (' .
+                $this->search_filter . ')'
+            );
             return;
         }
 
         if (!in_array($this->attr_policy, ['merge', 'replace', 'add'], true)) {
-            \SimpleSAML\Logger::warning("AttributeAddFromLDAP: 'attribute.policy' must be one of 'merge',".
+            Logger::warning("AttributeAddFromLDAP: 'attribute.policy' must be one of 'merge'," .
                 "'replace' or 'add'.");
             return;
         }
@@ -183,7 +137,7 @@ public function process(&$request)
             $ldap = $this->getLdap();
         } catch (\Exception $e) {
             // Added this warning in case $this->getLdap() fails
-            \SimpleSAML\Logger::warning("AttributeAddFromLDAP: exception = ".$e);
+            Logger::warning("AttributeAddFromLDAP: exception = " . $e);
             return;
         }
         // search for matching entries