Skip to content

some random fixes #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Feb 27, 2011
Merged

some random fixes #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b3c495
issues found by static code analysis
lsmith77 Feb 27, 2011
2bf30f8
corrected NonceExpiredException namespace
lsmith77 Feb 27, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Security/Core/Exception/NonceExpiredException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions tests/Symfony/Tests/Component/Config/Loader/DelegatingLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion tests/Symfony/Tests/Component/Console/Input/InputArgumentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion tests/Symfony/Tests/Component/Console/Input/InputOptionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 0 additions & 2 deletions tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ protected function getFooService()
{
$class = $this->getParameter('cla').'o'.$this->getParameter('ss');
return $this->services['foo'] = new $class();

$this->applyInterfaceInjectors($instance);
}

/**
Expand Down
4 changes: 0 additions & 4 deletions tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services_interfaces-2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ public function __construct()
protected function getBarService()
{
return $this->services['bar'] = $this->get('barFactory')->createBarClass();

$this->applyInterfaceInjectors($instance);
}

/**
Expand All @@ -48,8 +46,6 @@ protected function getBarService()
protected function getBarfactoryService()
{
return $this->services['barfactory'] = new \BarClassFactory();

$this->applyInterfaceInjectors($instance);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/Symfony/Tests/Component/DependencyInjection/Loader/ClosureLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Symfony/Tests/Component/DependencyInjection/Loader/PhpFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Symfony/Tests/Component/Templating/Loader/LoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/Symfony/Tests/Component/Templating/Storage/StorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down