From 4b3c49550f7a5cd21f774a103d8df9d2cb7dd719 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Sun, 27 Feb 2011 19:34:02 +0100 Subject: [PATCH 1/2] issues found by static code analysis --- .../Http/EntryPoint/DigestAuthenticationEntryPoint.php | 2 +- .../Component/Config/Loader/DelegatingLoaderTest.php | 8 ++++---- .../Tests/Component/Console/Input/InputArgumentTest.php | 1 - .../Tests/Component/Console/Input/InputDefinitionTest.php | 1 - .../Tests/Component/Console/Input/InputOptionTest.php | 1 - .../Fixtures/php/services_interfaces-1.php | 2 -- .../Fixtures/php/services_interfaces-2.php | 4 ---- .../DependencyInjection/Loader/ClosureLoaderTest.php | 2 +- .../DependencyInjection/Loader/PhpFileLoaderTest.php | 2 +- .../DependencyInjection/Loader/XmlFileLoaderTest.php | 2 +- .../DependencyInjection/Loader/YamlFileLoaderTest.php | 2 +- .../Tests/Component/Templating/Loader/LoaderTest.php | 2 +- .../Tests/Component/Templating/Storage/StorageTest.php | 1 - 13 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php index ecc6178304149..71866b48f061e 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php @@ -14,7 +14,7 @@ use Symfony\Component\EventDispatcher\EventInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; -use Symfony\Component\Security\Core\Exception\NonceExpiredException; +use Symfony\Component\HttpKernel\Security\EntryPoint\NonceExpiredException; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Log\LoggerInterface; diff --git a/tests/Symfony/Tests/Component/Config/Loader/DelegatingLoaderTest.php b/tests/Symfony/Tests/Component/Config/Loader/DelegatingLoaderTest.php index f6679920d007c..4f97fed847778 100644 --- a/tests/Symfony/Tests/Component/Config/Loader/DelegatingLoaderTest.php +++ b/tests/Symfony/Tests/Component/Config/Loader/DelegatingLoaderTest.php @@ -13,10 +13,10 @@ 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 { diff --git a/tests/Symfony/Tests/Component/Console/Input/InputArgumentTest.php b/tests/Symfony/Tests/Component/Console/Input/InputArgumentTest.php index e85245b6fb9db..a28836f36d69f 100644 --- a/tests/Symfony/Tests/Component/Console/Input/InputArgumentTest.php +++ b/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 { diff --git a/tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php b/tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php index fc0da1e30036e..8a6a35ea97da5 100644 --- a/tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php +++ b/tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php @@ -14,7 +14,6 @@ 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 { diff --git a/tests/Symfony/Tests/Component/Console/Input/InputOptionTest.php b/tests/Symfony/Tests/Component/Console/Input/InputOptionTest.php index ce5f7c2df5832..b2568b094c274 100644 --- a/tests/Symfony/Tests/Component/Console/Input/InputOptionTest.php +++ b/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 { diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-1.php b/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-1.php index b352e51c60752..96e461086c1a4 100755 --- a/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-1.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-1.php @@ -34,8 +34,6 @@ protected function getFooService() { $class = $this->getParameter('cla').'o'.$this->getParameter('ss'); return $this->services['foo'] = new $class(); - - $this->applyInterfaceInjectors($instance); } /** diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-2.php b/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-2.php index 3104010daee82..348496d5a1efb 100755 --- a/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-2.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-2.php @@ -33,8 +33,6 @@ public function __construct() protected function getBarService() { return $this->services['bar'] = $this->get('barFactory')->createBarClass(); - - $this->applyInterfaceInjectors($instance); } /** @@ -48,8 +46,6 @@ protected function getBarService() protected function getBarfactoryService() { return $this->services['barfactory'] = new \BarClassFactory(); - - $this->applyInterfaceInjectors($instance); } /** diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Loader/ClosureLoaderTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Loader/ClosureLoaderTest.php index 751187110e11c..e5566a317160c 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Loader/ClosureLoaderTest.php +++ b/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 diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Loader/PhpFileLoaderTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Loader/PhpFileLoaderTest.php index 115aa0b463bc3..189d438f80931 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Loader/PhpFileLoaderTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Loader/PhpFileLoaderTest.php @@ -14,7 +14,7 @@ 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; diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php index bcc0974c28d81..d0eebfd44baec 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php @@ -16,7 +16,7 @@ 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; diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php index ae0ff6bebf460..e7230d6abd7ff 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php @@ -14,7 +14,7 @@ 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; diff --git a/tests/Symfony/Tests/Component/Templating/Loader/LoaderTest.php b/tests/Symfony/Tests/Component/Templating/Loader/LoaderTest.php index 5c56f01f6df0f..0b919bfea2a25 100644 --- a/tests/Symfony/Tests/Component/Templating/Loader/LoaderTest.php +++ b/tests/Symfony/Tests/Component/Templating/Loader/LoaderTest.php @@ -14,7 +14,7 @@ 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 diff --git a/tests/Symfony/Tests/Component/Templating/Storage/StorageTest.php b/tests/Symfony/Tests/Component/Templating/Storage/StorageTest.php index 902176afc4f8d..c9492ef1914ab 100644 --- a/tests/Symfony/Tests/Component/Templating/Storage/StorageTest.php +++ b/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 { From 2bf30f8bb756407a9438cca78fc1317f478ab632 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Sun, 27 Feb 2011 19:46:40 +0100 Subject: [PATCH 2/2] corrected NonceExpiredException namespace --- .../Component/Security/Core/Exception/NonceExpiredException.php | 2 +- .../Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php b/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php index 5544a63cf3f0f..34bb1dd395ac7 100644 --- a/src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php +++ b/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; diff --git a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php index 71866b48f061e..ecc6178304149 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php @@ -14,7 +14,7 @@ use Symfony\Component\EventDispatcher\EventInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; -use Symfony\Component\HttpKernel\Security\EntryPoint\NonceExpiredException; +use Symfony\Component\Security\Core\Exception\NonceExpiredException; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Log\LoggerInterface; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy