Merge remote branch 'lsmith77/code_analyzer_2011_02_27'

* lsmith77/code_analyzer_2011_02_27:
  corrected NonceExpiredException namespace
  issues found by static code analysis

src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\HttpKernel\Security\EntryPoint;
+namespace Symfony\Component\Security\Core\Exception;
 
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;

tests/Symfony/Tests/Component/Config/Loader/DelegatingLoaderTest.php

@@ -13,10 +13,10 @@ namespace Symfony\Tests\Component\Config\Loader;
 
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\Config\Loader\DelegatingLoader;
-use Symfony\Component\Config\Loader\XmlFileLoader;
-use Symfony\Component\Config\Loader\ClosureLoader;
-use Symfony\Component\Config\RouteCollection;
-use Symfony\Component\Config\Route;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\Route;
 
 class DelegatingLoaderTest extends \PHPUnit_Framework_TestCase
 {

tests/Symfony/Tests/Component/Console/Input/InputArgumentTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Tests\Component\Console\Input;
 
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Exception;
 
 class InputArgumentTest extends \PHPUnit_Framework_TestCase
 {

tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php

@@ -14,7 +14,6 @@ namespace Symfony\Tests\Component\Console\Input;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Exception;
 
 class InputDefinitionTest extends \PHPUnit_Framework_TestCase
 {

tests/Symfony/Tests/Component/Console/Input/InputOptionTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Tests\Component\Console\Input;
 
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Exception;
 
 class InputOptionTest extends \PHPUnit_Framework_TestCase
 {

tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-1.php

@@ -34,8 +34,6 @@ class ProjectServiceContainer extends Container
     {
         $class = $this->getParameter('cla').'o'.$this->getParameter('ss');
         return $this->services['foo'] = new $class();
-
-        $this->applyInterfaceInjectors($instance);
     }
 
     /**

tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-2.php

@@ -33,8 +33,6 @@ class ProjectServiceContainer extends Container
     protected function getBarService()
     {
         return $this->services['bar'] = $this->get('barFactory')->createBarClass();
-
-        $this->applyInterfaceInjectors($instance);
     }
 
     /**
@@ -48,8 +46,6 @@ class ProjectServiceContainer extends Container
     protected function getBarfactoryService()
     {
         return $this->services['barfactory'] = new \BarClassFactory();
-
-        $this->applyInterfaceInjectors($instance);
     }
 
     /**

tests/Symfony/Tests/Component/DependencyInjection/Loader/ClosureLoaderTest.php

@@ -12,7 +12,7 @@
 namespace Symfony\Tests\Component\DependencyInjection\Loader;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\LoaderResolver;
+use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
 
 class ClosureLoaderTest extends \PHPUnit_Framework_TestCase

tests/Symfony/Tests/Component/DependencyInjection/Loader/PhpFileLoaderTest.php

@@ -14,7 +14,7 @@ namespace Symfony\Tests\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Loader\Loader;
+use Symfony\Component\Config\Loader\Loader;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\Config\FileLocator;

tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php

@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Loader\Loader;
+use Symfony\Component\Config\Loader\Loader;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Loader\IniFileLoader;

tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php

@@ -14,7 +14,7 @@ namespace Symfony\Tests\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Loader\Loader;
+use Symfony\Component\Config\Loader\Loader;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Loader\IniFileLoader;

tests/Symfony/Tests/Component/Templating/Loader/LoaderTest.php

@@ -14,7 +14,7 @@ namespace Symfony\Tests\Component\Templating\Loader;
 require_once __DIR__.'/../Fixtures/ProjectTemplateDebugger.php';
 
 use Symfony\Component\Templating\Loader\Loader;
-use Symfony\Component\Templating\Loader\TemplateNameParser;
+use Symfony\Component\Templating\TemplateNameParser;
 use Symfony\Component\Templating\TemplateReferenceInterface;
 
 class LoaderTest extends \PHPUnit_Framework_TestCase

tests/Symfony/Tests/Component/Templating/Storage/StorageTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Tests\Component\Templating\Storage;
 
 use Symfony\Component\Templating\Storage\Storage;
-use Symfony\Component\Templating\Renderer\PhpRenderer;
 
 class StorageTest extends \PHPUnit_Framework_TestCase
 {