From 6425459f5bead57fd76d5c98a4cff9ff16676e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Jumeau?= Date: Thu, 10 Aug 2017 17:55:10 +0200 Subject: [PATCH 1/2] Fix non-existing Ldap::find() method Replace Ldap::find() method with Ldap::query() method & updating Adapater's options --- components/ldap.rst | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/components/ldap.rst b/components/ldap.rst index ac676cd5934..9ee347142ad 100644 --- a/components/ldap.rst +++ b/components/ldap.rst @@ -37,15 +37,11 @@ using the following options: ``version`` The version of the LDAP protocol to use -``useSsl`` - Whether or not to secure the connection using SSL - -``useStartTls`` +``encryption`` Whether or not to secure the connection using StartTLS -``optReferrals`` - Specifies whether to automatically follow referrals - returned by the LDAP server +``options`` + LDAP server's options as defined in :class:`ConnectionOptions ` For example, to connect to a start-TLS secured LDAP server:: @@ -73,10 +69,10 @@ distinguished name (DN) and the password of a user:: Once bound (or if you enabled anonymous authentication on your LDAP server), you may query the LDAP server using the -:method:`Symfony\\Component\\Ldap\\Ldap::find` method:: +:method:`Symfony\\Component\\Ldap\\Ldap::query` method:: // ... - $ldap->find('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))'); + $ldap->query('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))'); .. _Packagist: https://packagist.org/packages/symfony/ldap From cf20bbc03f4732cb086fcb5a52d5d8b2042b418f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Jumeau?= Date: Fri, 11 Aug 2017 15:30:06 +0200 Subject: [PATCH 2/2] Fix description of encryption option --- components/ldap.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ldap.rst b/components/ldap.rst index 9ee347142ad..355f49914ef 100644 --- a/components/ldap.rst +++ b/components/ldap.rst @@ -38,7 +38,7 @@ using the following options: The version of the LDAP protocol to use ``encryption`` - Whether or not to secure the connection using StartTLS + The encryption protocol : ``ssl``, ``tls`` or ``none`` (default) ``options`` LDAP server's options as defined in :class:`ConnectionOptions `