From db6262ca16c274f90b93caf254936c0bcf58eb2a Mon Sep 17 00:00:00 2001
From: Kris Wallsmith <kris.wallsmith@gmail.com>
Date: Wed, 20 Apr 2011 12:09:30 -0700
Subject: [PATCH] moved security factory into DI namespace

---
 .../Security}/HttpBasicPreAuthenticatedFactory.php          | 2 +-
 .../Security/HttpBasicPreAuthenticatedFactoryTest.php       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename {Security => DependencyInjection/Security}/HttpBasicPreAuthenticatedFactory.php (97%)
 rename Tests/{ => DependencyInjection}/Security/HttpBasicPreAuthenticatedFactoryTest.php (85%)

diff --git a/Security/HttpBasicPreAuthenticatedFactory.php b/DependencyInjection/Security/HttpBasicPreAuthenticatedFactory.php
similarity index 97%
rename from Security/HttpBasicPreAuthenticatedFactory.php
rename to DependencyInjection/Security/HttpBasicPreAuthenticatedFactory.php
index d012c9b..f5068c2 100644
--- a/Security/HttpBasicPreAuthenticatedFactory.php
+++ b/DependencyInjection/Security/HttpBasicPreAuthenticatedFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenSky\Bundle\LdapBundle\Security;
+namespace OpenSky\Bundle\LdapBundle\DependencyInjection\Security;
 
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 
diff --git a/Tests/Security/HttpBasicPreAuthenticatedFactoryTest.php b/Tests/DependencyInjection/Security/HttpBasicPreAuthenticatedFactoryTest.php
similarity index 85%
rename from Tests/Security/HttpBasicPreAuthenticatedFactoryTest.php
rename to Tests/DependencyInjection/Security/HttpBasicPreAuthenticatedFactoryTest.php
index 3e96f45..df83e4a 100644
--- a/Tests/Security/HttpBasicPreAuthenticatedFactoryTest.php
+++ b/Tests/DependencyInjection/Security/HttpBasicPreAuthenticatedFactoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace OpenSky\Bundle\LdapBundle\Tests\Security;
+namespace OpenSky\Bundle\LdapBundle\Tests\DependencyInjection\Security;
 
-use OpenSky\Bundle\LdapBundle\Security\HttpBasicPreAuthenticatedFactory;
+use OpenSky\Bundle\LdapBundle\DependencyInjection\Security\HttpBasicPreAuthenticatedFactory;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -18,7 +18,7 @@ public function testCreate()
         $defaultEntryPoint = $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface');
 
         // Load "security.authentication.listener.basic_pre_auth.class" parameter from ldap.xml
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../../../Resources/config'));
         $loader->load('ldap.xml');
 
         list($provider, $listenerId, $returnedDefaultEntryPoint) = $factory->create($container, rand(), array(), $userProvider, $defaultEntryPoint);