Merge pull request opensky#2 from stof/typo

Typo
j15e · May 11, 2011 · 2898631 · 2898631
2 parents db6262c + d93011c
commit 2898631
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/DependencyInjection/Security/HttpBasicPreAuthenticatedFactory.php b/DependencyInjection/Security/HttpBasicPreAuthenticatedFactory.php
@@ -69,6 +69,6 @@ public function getKey()
      */
     public function addConfiguration(NodeDefinition $builder)
     {
-        $builder->scalarNode('provider')->end();
+        $builder->children()->scalarNode('provider')->end()->end();
     }
 }
diff --git a/README.md b/README.md
@@ -23,18 +23,18 @@ from the symfony-devs mailing list.
 
 Add LdapBundle to your `src/` directory:
 
-    $ git submodule add https://github.com/opensky/LdapBundle.git src/OpenSky/Bundle/LdapBundle
+    $ git submodule add https://github.com/opensky/LdapBundle.git vendor/bundles/OpenSky/Bundle/LdapBundle
 
 ### Class Autoloading
 
 If the `src/` directory is already configured in your project's `autoload.php`
 via `registerNamespaceFallback()`, no changes should be necessary.  Otherwise,
 either define the fallback directory or explicitly add the "OpenSky" namespace:
 
-    # src/autoload.php
+    # app/autoload.php
 
     $loader->registerNamespaces(array(
-        'OpenSky' => __DIR__,
+        'OpenSky' => __DIR__'/../vendor/bundles',
     ));
 
 Additionally, ensure that the "Zend" namespace is also configured for autoloading.
@@ -56,7 +56,7 @@ Add LdapBundle to the `registerBundles()` method of your application kernel:
 
 The LDAP UserProvider may be configured with the following:
 
-    # app/config/config_dev.yml
+    # app/config/config.yml
 
     open_sky_ldap:
         client_options:
@@ -110,7 +110,7 @@ configured as follows:
                 http_basic_pre_auth: true
                 stateless:           true
         factories:
-            - %kernel.root_dir%/../src/OpenSky/Bundle/LdapBundle/Resources/config/security_factories.xml
+            - %kernel.root_dir%/../vendor/bundles/OpenSky/Bundle/LdapBundle/Resources/config/security_factories.xml
 
 Note: a future enhancement for this bundle will be a UserAuthenticationProvider
 to allow for authentication against an LDAP server, which will remove the need

diff --git a/Resources/config/security_factories.xml b/Resources/config/security_factories.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="security.authentication.factory.basic_pre_auth.class">OpenSky\Bundle\LdapBundle\Security\HttpBasicPreAuthenticatedFactory</parameter>
+        <parameter key="security.authentication.factory.basic_pre_auth.class">OpenSky\Bundle\LdapBundle\DependencyInjection\Security\HttpBasicPreAuthenticatedFactory</parameter>
     </parameters>
 
     <services>