Fix pass custom config to Symfony Ldap-Adapter

Author: PhilVanB

MapbenderLDAPBundle.php

@@ -3,19 +3,26 @@
 namespace Mapbender\LDAPBundle;
 
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Ldap\Adapter\ExtLdap\Adapter;
+use Symfony\Component\DependencyInjection\Definition;
 
 class MapbenderLDAPBundle extends Bundle
 {
     public function build(ContainerBuilder $container)
     {
-        parent::build($container);
         $configLocator = new FileLocator(__DIR__ . '/Resources/config');
         $loader = new YamlFileLoader($container, $configLocator);
         $loader->load('services.yml');
-        $container->addResource(new FileResource($configLocator->locate('services.yml')));
+        $providerDefinition = new Definition(Adapter::class, array([
+                'host' => '%ldap.host%',
+                'port' => '%ldap.port%',
+                'version' => '%ldap.version%',
+                'encryption' => '%ldap.encryption%',
+            ],
+        ));
+        $container->setDefinition('Symfony\Component\Ldap\Adapter\ExtLdap\Adapter', $providerDefinition);
     }
 }

Resources/config/services.yml

@@ -8,32 +8,32 @@ services:
         arguments:
             - host: '%ldap.host%'
             - port: '%ldap.port%'
-            - encryption: '%ldap.encryption'
+            - encryption: '%ldap.encryption%'
             - options:
-                  protocol_version: '%ldap.version'
+                  protocol_version: '%ldap.version%'
                   referrals: false
 
     mapbender.ldap.client:
         class: Mapbender\LDAPBundle\Security\LdapClient
         arguments:
-        - '%ldap.host%'
-        - '%ldap.port%'
-        - '%ldap.version%'
-        - '%ldap.encryption%'
-        - '%ldap.bind.dn%'
-        - '%ldap.bind.pwd%'
+            - '%ldap.host%'
+            - '%ldap.port%'
+            - '%ldap.version%'
+            - '%ldap.encryption%'
+            - '%ldap.bind.dn%'
+            - '%ldap.bind.pwd%'
 
     mapbender.ldap.user_provider:
         class: Mapbender\LDAPBundle\Security\LdapUserProvider
         arguments:
-        - '@mapbender.ldap.client'
-        - '%ldap.user.baseDn%'
-        - '%ldap.user.query%'
-        - '%ldap.user.groupKey%'
-        - '%ldap.group.baseDn%'
-        - '%ldap.group.query%'
-        - '%ldap.group.id%'
-        - '%ldap.group.defaultRoles%'
+            - '@mapbender.ldap.client'
+            - '%ldap.user.baseDn%'
+            - '%ldap.user.query%'
+            - '%ldap.user.groupKey%'
+            - '%ldap.group.baseDn%'
+            - '%ldap.group.query%'
+            - '%ldap.group.id%'
+            - '%ldap.group.defaultRoles%'
 
     mapbender.ldap.authenticator:
         class: Mapbender\LDAPBundle\Security\MapbenderLdapAuthenticator

Security/LdapClient.php

@@ -13,12 +13,12 @@ class LdapClient
 
     public function __construct($host, $port, $version, $encryption, $bindDn, $bindPwd)
     {
-        $adapterOptions = array_filter([
+        $adapterOptions = [
             'host' => $host,
             'port' => $port,
             'version' => $version,
             'encryption' => $encryption,
-        ]);
+        ];
         $this->adapter = new Adapter($adapterOptions);
         $this->host = $host;
         $this->bindDn = $bindDn;