feature #18387 [DX] [LDAP] Added default service name for the Security component's Ldap providers (csarrazi)

fabpot · fabpot · commit aa459497bd35 · 2016-04-01T08:33:02.000+02:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [DX] [LDAP] Added default service name for the Security component's Ldap providers | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | This PR adds a default service name (`ldap`) for the Security component's Ldap factories (`LdapFactory`, `FormLoginLdapFactory` and `HttpBasicLdapFactory`. Commits ------- 29e3d38 Added default service name for the Security component's Ldap providers
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
@@ -45,7 +45,7 @@ public function addConfiguration(NodeDefinition $node)
 
         $node
             ->children()
-                ->scalarNode('service')->end()
+                ->scalarNode('service')->defaultValue('ldap')->end()
                 ->scalarNode('dn_string')->defaultValue('{username}')->end()
             ->end()
         ;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
@@ -55,7 +55,7 @@ public function addConfiguration(NodeDefinition $node)
 
         $node
             ->children()
-                ->scalarNode('service')->end()
+                ->scalarNode('service')->defaultValue('ldap')->end()
                 ->scalarNode('dn_string')->defaultValue('{username}')->end()
             ->end()
         ;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
@@ -47,7 +47,7 @@ public function addConfiguration(NodeDefinition $node)
     {
         $node
             ->children()
-                ->scalarNode('service')->isRequired()->cannotBeEmpty()->end()
+                ->scalarNode('service')->isRequired()->cannotBeEmpty()->defaultValue('ldap')->end()
                 ->scalarNode('base_dn')->isRequired()->cannotBeEmpty()->end()
                 ->scalarNode('search_dn')->end()
                 ->scalarNode('search_password')->end()
diff --git a/src/Symfony/Component/Ldap/README.md b/src/Symfony/Component/Ldap/README.md
@@ -11,14 +11,10 @@ have been marked as internal as they still needed some work.
 Breaking changes were introduced in Symfony 3.1, so code relying on
 previous version of the component will break with this version.
 
-Documentation
--------------
-
-The documentation for the component can be found [online] [0].
-
 Resources
 ---------
 
+  * [Documentation](https://symfony.com/doc/current/components/filesystem/index.html)
   * [Contributing](https://symfony.com/doc/current/contributing/index.html)
   * [Report issues](https://github.com/symfony/symfony/issues) and
     [send Pull Requests](https://github.com/symfony/symfony/pulls)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function addConfiguration(NodeDefinition $node)`
`45`	`45`
`46`	`46`	`$node`
`47`	`47`	`->children()`
`48`		`- ->scalarNode('service')->end()`
	`48`	`+ ->scalarNode('service')->defaultValue('ldap')->end()`
`49`	`49`	`->scalarNode('dn_string')->defaultValue('{username}')->end()`
`50`	`50`	`->end()`
`51`	`51`	`;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function addConfiguration(NodeDefinition $node)`
`55`	`55`
`56`	`56`	`$node`
`57`	`57`	`->children()`
`58`		`- ->scalarNode('service')->end()`
	`58`	`+ ->scalarNode('service')->defaultValue('ldap')->end()`
`59`	`59`	`->scalarNode('dn_string')->defaultValue('{username}')->end()`
`60`	`60`	`->end()`
`61`	`61`	`;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function addConfiguration(NodeDefinition $node)`
`47`	`47`	`{`
`48`	`48`	`$node`
`49`	`49`	`->children()`
`50`		`- ->scalarNode('service')->isRequired()->cannotBeEmpty()->end()`
	`50`	`+ ->scalarNode('service')->isRequired()->cannotBeEmpty()->defaultValue('ldap')->end()`
`51`	`51`	`->scalarNode('base_dn')->isRequired()->cannotBeEmpty()->end()`
`52`	`52`	`->scalarNode('search_dn')->end()`
`53`	`53`	`->scalarNode('search_password')->end()`