Skip to content

Remove remaining LdapClient usages #7993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2017
Merged

Remove remaining LdapClient usages #7993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions security/ldap.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ use the ``ldap`` user provider.
providers:
my_ldap:
ldap:
service: Symfony\Component\Ldap\LdapClient
service: Symfony\Component\Ldap\Ldap
base_dn: dc=example,dc=com
search_dn: "cn=read-only-admin,dc=example,dc=com"
search_password: password
Expand All @@ -154,7 +154,7 @@ use the ``ldap`` user provider.
<config>
<provider name="my_ldap">
<ldap
service="Symfony\Component\Ldap\LdapClient"
service="Symfony\Component\Ldap\Ldap"
base-dn="dc=example,dc=com"
search-dn="cn=read-only-admin,dc=example,dc=com"
search-password="password"
Expand All @@ -167,13 +167,13 @@ use the ``ldap`` user provider.

.. code-block:: php

use Symfony\Component\Ldap\LdapClient;
use Symfony\Component\Ldap\Ldap;

$container->loadFromExtension('security', array(
'providers' => array(
'ldap_users' => array(
'ldap' => array(
'service' => LdapClient::class,
'service' => Ldap::class,
'base_dn' => 'dc=example,dc=com',
'search_dn' => 'cn=read-only-admin,dc=example,dc=com',
'search_password' => 'password',
Expand Down Expand Up @@ -335,7 +335,7 @@ Configuration example for form login
# ...
form_login_ldap:
# ...
service: Symfony\Component\Ldap\LdapClient;
service: Symfony\Component\Ldap\Ldap;
dn_string: 'uid={username},dc=example,dc=com'

.. code-block:: xml
Expand All @@ -351,21 +351,21 @@ Configuration example for form login
<config>
<firewall name="main">
<form-login-ldap
service="Symfony\Component\Ldap\LdapClient"
service="Symfony\Component\Ldap\Ldap"
dn-string="uid={username},dc=example,dc=com" />
</firewall>
</config>
</srv:container>

.. code-block:: php

use Symfony\Component\Ldap\LdapClient;
use Symfony\Component\Ldap\Ldap;

$container->loadFromExtension('security', array(
'firewalls' => array(
'main' => array(
'form_login_ldap' => array(
'service' => LdapClient::class,
'service' => Ldap::class,
'dn_string' => 'uid={username},dc=example,dc=com',
// ...
),
Expand All @@ -389,7 +389,7 @@ Configuration example for HTTP Basic
# ...
http_basic_ldap:
# ...
service: Symfony\Component\Ldap\LdapClient
service: Symfony\Component\Ldap\Ldap
dn_string: 'uid={username},dc=example,dc=com'

.. code-block:: xml
Expand All @@ -404,20 +404,20 @@ Configuration example for HTTP Basic

<config>
<firewall name="main" stateless="true">
<http-basic-ldap service="Symfony\Component\Ldap\LdapClient" dn-string="uid={username},dc=example,dc=com" />
<http-basic-ldap service="Symfony\Component\Ldap\Ldap" dn-string="uid={username},dc=example,dc=com" />
</firewall>
</config>
</srv:container>

.. code-block:: php

use Symfony\Component\Ldap\LdapClient;
use Symfony\Component\Ldap\Ldap;

$container->loadFromExtension('security', array(
'firewalls' => array(
'main' => array(
'http_basic_ldap' => array(
'service' => LdapClient::class,
'service' => Ldap::class,
'dn_string' => 'uid={username},dc=example,dc=com',
// ...
),
Expand All @@ -442,7 +442,7 @@ Configuration example for form login and query_string
# ...
form_login_ldap:
# ...
service: Symfony\Component\Ldap\LdapClient
service: Symfony\Component\Ldap\Ldap
dn_string: 'dc=example,dc=com'
query_string: '(&(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))'

Expand All @@ -459,7 +459,7 @@ Configuration example for form login and query_string
<config>
<firewall name="main">
<form-login-ldap
service="Symfony\Component\Ldap\LdapClient"
service="Symfony\Component\Ldap\Ldap"
dn-string="dc=example,dc=com"
query-string="(&amp;(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))" />
</firewall>
Expand All @@ -469,13 +469,13 @@ Configuration example for form login and query_string
.. code-block:: php

// app/config/security.php
use Symfony\Component\Ldap\LdapClient;
use Symfony\Component\Ldap\Ldap;

$container->loadFromExtension('security', array(
'firewalls' => array(
'main' => array(
'form_login_ldap' => array(
'service' => LdapClient::class,
'service' => Ldap::class,
'dn_string' => 'dc=example,dc=com',
'query_string' => '(&(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))',
// ...
Expand Down