From c2144df888db6098df9d7c81fc539f2224a6a31b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 18 Sep 2013 09:27:26 +0200 Subject: [PATCH 1/4] updated the composer install command to reflect changes in Composer --- src/Symfony/Bridge/Doctrine/README.md | 2 +- src/Symfony/Bridge/Monolog/README.md | 2 +- src/Symfony/Bridge/Propel1/README.md | 2 +- src/Symfony/Bridge/Twig/README.md | 2 +- src/Symfony/Component/BrowserKit/README.md | 2 +- src/Symfony/Component/ClassLoader/README.md | 2 +- src/Symfony/Component/Config/README.md | 2 +- src/Symfony/Component/Console/README.md | 2 +- src/Symfony/Component/CssSelector/README.md | 2 +- src/Symfony/Component/DependencyInjection/README.md | 2 +- src/Symfony/Component/DomCrawler/README.md | 2 +- src/Symfony/Component/EventDispatcher/README.md | 2 +- src/Symfony/Component/Filesystem/README.md | 2 +- src/Symfony/Component/Finder/README.md | 2 +- src/Symfony/Component/Form/README.md | 2 +- src/Symfony/Component/HttpFoundation/README.md | 2 +- src/Symfony/Component/HttpKernel/README.md | 2 +- src/Symfony/Component/Locale/README.md | 2 +- src/Symfony/Component/OptionsResolver/README.md | 2 +- src/Symfony/Component/Process/README.md | 2 +- src/Symfony/Component/PropertyAccess/README.md | 2 +- src/Symfony/Component/Routing/README.md | 2 +- src/Symfony/Component/Security/README.md | 2 +- src/Symfony/Component/Serializer/README.md | 2 +- src/Symfony/Component/Stopwatch/README.md | 2 +- src/Symfony/Component/Templating/README.md | 2 +- src/Symfony/Component/Translation/README.md | 2 +- src/Symfony/Component/Validator/README.md | 2 +- src/Symfony/Component/Yaml/README.md | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/README.md b/src/Symfony/Bridge/Doctrine/README.md index 9aecb01e3f..2a97041a05 100644 --- a/src/Symfony/Bridge/Doctrine/README.md +++ b/src/Symfony/Bridge/Doctrine/README.md @@ -10,5 +10,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Bridge/Doctrine/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Bridge/Monolog/README.md b/src/Symfony/Bridge/Monolog/README.md index 4e2253c5ea..f28c85b009 100644 --- a/src/Symfony/Bridge/Monolog/README.md +++ b/src/Symfony/Bridge/Monolog/README.md @@ -9,5 +9,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Bridge/Monolog/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Bridge/Propel1/README.md b/src/Symfony/Bridge/Propel1/README.md index abf786e0be..81a3388edf 100644 --- a/src/Symfony/Bridge/Propel1/README.md +++ b/src/Symfony/Bridge/Propel1/README.md @@ -9,5 +9,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Bridge/Propel1/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Bridge/Twig/README.md b/src/Symfony/Bridge/Twig/README.md index e5663236dd..0e7c9608e4 100644 --- a/src/Symfony/Bridge/Twig/README.md +++ b/src/Symfony/Bridge/Twig/README.md @@ -11,5 +11,5 @@ If you want to run the unit tests, install dev dependencies before running PHPUnit: $ cd path/to/Symfony/Bridge/Twig/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/BrowserKit/README.md b/src/Symfony/Component/BrowserKit/README.md index da19188362..1b40c9fe2d 100644 --- a/src/Symfony/Component/BrowserKit/README.md +++ b/src/Symfony/Component/BrowserKit/README.md @@ -19,5 +19,5 @@ provided by the HttpKernel component. You can run the unit tests with the following command: $ cd path/to/Symfony/Component/BrowserKit/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/ClassLoader/README.md b/src/Symfony/Component/ClassLoader/README.md index 5ac31c6489..fc222b1c9e 100644 --- a/src/Symfony/Component/ClassLoader/README.md +++ b/src/Symfony/Component/ClassLoader/README.md @@ -65,5 +65,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/ClassLoader/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Config/README.md b/src/Symfony/Component/Config/README.md index c7865b3815..1b12e89a8b 100644 --- a/src/Symfony/Component/Config/README.md +++ b/src/Symfony/Component/Config/README.md @@ -12,6 +12,6 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Config/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Console/README.md b/src/Symfony/Component/Console/README.md index fbf05fc853..bfc704427c 100644 --- a/src/Symfony/Component/Console/README.md +++ b/src/Symfony/Component/Console/README.md @@ -46,7 +46,7 @@ Tests You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Console/ - $ composer.phar install --dev + $ composer.phar install $ phpunit Third Party diff --git a/src/Symfony/Component/CssSelector/README.md b/src/Symfony/Component/CssSelector/README.md index 2424bea90a..a9b300d649 100644 --- a/src/Symfony/Component/CssSelector/README.md +++ b/src/Symfony/Component/CssSelector/README.md @@ -21,5 +21,5 @@ Current code is a port of https://github.com/SimonSapin/cssselect@fd2e70 You can run the unit tests with the following command: $ cd path/to/Symfony/Component/CssSelector/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/DependencyInjection/README.md b/src/Symfony/Component/DependencyInjection/README.md index ab67595240..29d1cd0aa0 100644 --- a/src/Symfony/Component/DependencyInjection/README.md +++ b/src/Symfony/Component/DependencyInjection/README.md @@ -69,5 +69,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/DependencyInjection/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/DomCrawler/README.md b/src/Symfony/Component/DomCrawler/README.md index 721c0d9df1..489e4680cb 100644 --- a/src/Symfony/Component/DomCrawler/README.md +++ b/src/Symfony/Component/DomCrawler/README.md @@ -28,5 +28,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/DomCrawler/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/EventDispatcher/README.md b/src/Symfony/Component/EventDispatcher/README.md index 11f6b1888e..2cc76980ad 100644 --- a/src/Symfony/Component/EventDispatcher/README.md +++ b/src/Symfony/Component/EventDispatcher/README.md @@ -21,5 +21,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/EventDispatcher/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Filesystem/README.md b/src/Symfony/Component/Filesystem/README.md index 94ac1469c1..7d8a4749ed 100644 --- a/src/Symfony/Component/Filesystem/README.md +++ b/src/Symfony/Component/Filesystem/README.md @@ -41,5 +41,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Filesystem/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Finder/README.md b/src/Symfony/Component/Finder/README.md index a4caf93baa..8494531d21 100644 --- a/src/Symfony/Component/Finder/README.md +++ b/src/Symfony/Component/Finder/README.md @@ -36,6 +36,6 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Finder/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Form/README.md b/src/Symfony/Component/Form/README.md index 2bb5255556..96c43af5cf 100644 --- a/src/Symfony/Component/Form/README.md +++ b/src/Symfony/Component/Form/README.md @@ -22,5 +22,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Form/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/HttpFoundation/README.md b/src/Symfony/Component/HttpFoundation/README.md index ed49b4e15e..ea6a790a64 100644 --- a/src/Symfony/Component/HttpFoundation/README.md +++ b/src/Symfony/Component/HttpFoundation/README.md @@ -44,5 +44,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/HttpFoundation/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/HttpKernel/README.md b/src/Symfony/Component/HttpKernel/README.md index e0f3c987c4..7aa0656b3a 100644 --- a/src/Symfony/Component/HttpKernel/README.md +++ b/src/Symfony/Component/HttpKernel/README.md @@ -85,5 +85,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/HttpKernel/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Locale/README.md b/src/Symfony/Component/Locale/README.md index 72b4bfa3d4..155db4aea6 100644 --- a/src/Symfony/Component/Locale/README.md +++ b/src/Symfony/Component/Locale/README.md @@ -23,7 +23,7 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/XXX/ - $ composer.phar install --dev + $ composer.phar install $ phpunit If your PHP have the ``intl`` extension enabled but the intl extension ICU data diff --git a/src/Symfony/Component/OptionsResolver/README.md b/src/Symfony/Component/OptionsResolver/README.md index 29cea102d6..65617f79a3 100644 --- a/src/Symfony/Component/OptionsResolver/README.md +++ b/src/Symfony/Component/OptionsResolver/README.md @@ -103,5 +103,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/OptionsResolver/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Process/README.md b/src/Symfony/Component/Process/README.md index 7b9f30757b..9bcc656b7d 100644 --- a/src/Symfony/Component/Process/README.md +++ b/src/Symfony/Component/Process/README.md @@ -43,5 +43,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/XXX/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/PropertyAccess/README.md b/src/Symfony/Component/PropertyAccess/README.md index 0ae94e0879..79b6ebca5a 100644 --- a/src/Symfony/Component/PropertyAccess/README.md +++ b/src/Symfony/Component/PropertyAccess/README.md @@ -10,5 +10,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/PropertyAccess/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Routing/README.md b/src/Symfony/Component/Routing/README.md index 663844a674..83febc79bb 100644 --- a/src/Symfony/Component/Routing/README.md +++ b/src/Symfony/Component/Routing/README.md @@ -30,5 +30,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Routing/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Security/README.md b/src/Symfony/Component/Security/README.md index 34193f0fef..930b6d836d 100644 --- a/src/Symfony/Component/Security/README.md +++ b/src/Symfony/Component/Security/README.md @@ -19,5 +19,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Security/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Serializer/README.md b/src/Symfony/Component/Serializer/README.md index 3e808059db..5a1606ca09 100644 --- a/src/Symfony/Component/Serializer/README.md +++ b/src/Symfony/Component/Serializer/README.md @@ -11,5 +11,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Serializer/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Stopwatch/README.md b/src/Symfony/Component/Stopwatch/README.md index 601ce3224c..428bba6b63 100644 --- a/src/Symfony/Component/Stopwatch/README.md +++ b/src/Symfony/Component/Stopwatch/README.md @@ -9,5 +9,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Stopwatch/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Templating/README.md b/src/Symfony/Component/Templating/README.md index 7c2814a2d3..bde622fef4 100644 --- a/src/Symfony/Component/Templating/README.md +++ b/src/Symfony/Component/Templating/README.md @@ -14,5 +14,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Templating/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Translation/README.md b/src/Symfony/Component/Translation/README.md index a69cee437b..7caca7a282 100644 --- a/src/Symfony/Component/Translation/README.md +++ b/src/Symfony/Component/Translation/README.md @@ -31,5 +31,5 @@ http://symfony.com/doc/2.2/book/translation.html You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Translation/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Validator/README.md b/src/Symfony/Component/Validator/README.md index 27e0977fbd..8dcbaa75ef 100644 --- a/src/Symfony/Component/Validator/README.md +++ b/src/Symfony/Component/Validator/README.md @@ -116,5 +116,5 @@ http://jcp.org/en/jsr/detail?id=303 You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Validator/ - $ composer.phar install --dev + $ composer.phar install $ phpunit diff --git a/src/Symfony/Component/Yaml/README.md b/src/Symfony/Component/Yaml/README.md index 0864e49dca..941a3460e3 100644 --- a/src/Symfony/Component/Yaml/README.md +++ b/src/Symfony/Component/Yaml/README.md @@ -15,5 +15,5 @@ Resources You can run the unit tests with the following command: $ cd path/to/Symfony/Component/Yaml/ - $ composer.phar install --dev + $ composer.phar install $ phpunit From 0b6519fc0e80e47ab1b193bba9b7b01714767278 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 18 Sep 2013 17:29:46 +0200 Subject: [PATCH 2/4] [HttpKernel] remove unneeded strtoupper --- .../Component/HttpKernel/EventListener/RouterListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php index 606b358e72..ce51c3f9fc 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php @@ -93,7 +93,7 @@ class RouterListener implements EventSubscriberInterface throw new NotFoundHttpException($message, $e); } catch (MethodNotAllowedException $e) { - $message = sprintf('No route found for "%s %s": Method Not Allowed (Allow: %s)', $request->getMethod(), $request->getPathInfo(), strtoupper(implode(', ', $e->getAllowedMethods()))); + $message = sprintf('No route found for "%s %s": Method Not Allowed (Allow: %s)', $request->getMethod(), $request->getPathInfo(), implode(', ', $e->getAllowedMethods())); throw new MethodNotAllowedHttpException($e->getAllowedMethods(), $message, $e); } From f65a526e7d57e2fb584c6409d798eb52236d8f03 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 15 Sep 2013 20:39:31 +0200 Subject: [PATCH 3/4] [FrameworkBundle] made sure that the debug event dispatcher is used everywhere --- .../Compiler/RegisterKernelListenersPass.php | 4 ++-- .../DependencyInjection/FrameworkExtension.php | 12 +++++++----- .../FrameworkBundle/Resources/config/debug.xml | 2 +- .../Compiler/RegisterKernelListenersPassTest.php | 4 ++++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php index ad406eb6a3..49e7a3edce 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RegisterKernelListenersPass.php @@ -18,11 +18,11 @@ class RegisterKernelListenersPass implements CompilerPassInterface { public function process(ContainerBuilder $container) { - if (!$container->hasDefinition('event_dispatcher')) { + if (!$container->hasDefinition('event_dispatcher') && !$container->hasAlias('event_dispatcher')) { return; } - $definition = $container->getDefinition('event_dispatcher'); + $definition = $container->findDefinition('event_dispatcher'); foreach ($container->findTaggedServiceIds('kernel.event_listener') as $id => $events) { foreach ($events as $event) { diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index b4decdfefc..767400b16d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -51,12 +51,14 @@ class FrameworkExtension extends Extension if ($container->getParameter('kernel.debug')) { $loader->load('debug.xml'); - // only HttpKernel needs the debug event dispatcher $definition = $container->findDefinition('http_kernel'); - $arguments = $definition->getArguments(); - $arguments[0] = new Reference('debug.event_dispatcher'); - $arguments[2] = new Reference('debug.controller_resolver'); - $definition->setArguments($arguments); + $definition->replaceArgument(2, new Reference('debug.controller_resolver')); + + // replace the regular event_dispatcher service with the debug one + $definition = $container->findDefinition('event_dispatcher'); + $definition->setPublic(false); + $container->setDefinition('debug.event_dispatcher.parent', $definition); + $container->setAlias('event_dispatcher', 'debug.event_dispatcher'); } $configuration = $this->getConfiguration($configs, $container); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml index 7d10cc70b9..d05f98ab4b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml @@ -17,7 +17,7 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php index 670052fe1b..8414b8dc98 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php @@ -78,6 +78,10 @@ class RegisterKernelListenersPassTest extends \PHPUnit_Framework_TestCase ->method('getDefinition') ->will($this->returnValue($definition)); + $builder->expects($this->atLeastOnce()) + ->method('findDefinition') + ->will($this->returnValue($definition)); + $registerListenersPass = new RegisterKernelListenersPass(); $registerListenersPass->process($builder); } From de39bd543319b74e3e51159210187f47afd19713 Mon Sep 17 00:00:00 2001 From: bronze1man Date: Wed, 18 Sep 2013 20:41:53 +0800 Subject: [PATCH 4/4] Fix some annotates --- .../Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php | 1 + .../Bridge/Propel1/Security/User/PropelUserProvider.php | 4 ++-- .../Bundle/FrameworkBundle/Routing/DelegatingLoader.php | 1 + .../FrameworkBundle/Templating/Asset/PackageFactory.php | 1 + .../Bundle/TwigBundle/Loader/FilesystemLoader.php | 1 + src/Symfony/Component/ClassLoader/ClassMapGenerator.php | 2 +- .../Component/Config/Definition/Builder/ExprBuilder.php | 1 + src/Symfony/Component/Console/Application.php | 4 ++-- src/Symfony/Component/Console/Command/Command.php | 2 +- .../Component/Console/Formatter/OutputFormatter.php | 2 +- src/Symfony/Component/Console/Input/InputDefinition.php | 2 +- src/Symfony/Component/Console/Tester/CommandTester.php | 2 ++ .../Component/CssSelector/Node/CombinedSelectorNode.php | 1 + src/Symfony/Component/CssSelector/Node/NodeInterface.php | 3 +++ .../DependencyInjection/Extension/ExtensionInterface.php | 2 +- src/Symfony/Component/Form/CallbackTransformer.php | 3 +++ src/Symfony/Component/Form/Form.php | 2 +- .../Component/HttpFoundation/BinaryFileResponse.php | 4 ++-- src/Symfony/Component/HttpKernel/Client.php | 1 + src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php | 2 +- .../Event/GetResponseForControllerResultEvent.php | 2 +- .../HttpKernel/Fragment/FragmentRendererInterface.php | 1 + .../HttpKernel/Profiler/RedisProfilerStorage.php | 9 ++++----- src/Symfony/Component/Locale/Locale.php | 8 ++++---- .../Component/Locale/Stub/DateFormat/FullTransformer.php | 2 +- .../Routing/Matcher/Dumper/MatcherDumperInterface.php | 2 ++ .../Component/Security/Acl/Domain/AclCollectionCache.php | 1 + .../Component/Security/Acl/Model/AclInterface.php | 2 ++ .../Security/Acl/Model/AclProviderInterface.php | 2 ++ .../Core/Authentication/RememberMe/PersistentToken.php | 2 +- .../Authentication/RememberMe/TokenProviderInterface.php | 2 ++ .../Core/Authentication/Token/AnonymousToken.php | 2 ++ .../Core/Authentication/Token/UsernamePasswordToken.php | 2 ++ .../Component/Security/Core/User/UserInterface.php | 2 ++ .../AuthenticationFailureHandlerInterface.php | 1 + .../AuthenticationSuccessHandlerInterface.php | 1 + .../Http/Authorization/AccessDeniedHandlerInterface.php | 1 + .../EntryPoint/AuthenticationEntryPointInterface.php | 1 + .../Component/Security/Http/Firewall/LogoutListener.php | 1 + src/Symfony/Component/Security/Http/HttpUtils.php | 1 + .../Http/Logout/LogoutSuccessHandlerInterface.php | 1 + .../Security/Tests/Acl/Dbal/MutableAclProviderTest.php | 2 +- .../Http/RememberMe/TokenBasedRememberMeServicesTest.php | 1 - src/Symfony/Component/Serializer/Encoder/XmlEncoder.php | 2 +- src/Symfony/Component/Templating/Loader/ChainLoader.php | 2 +- .../Component/Templating/Loader/LoaderInterface.php | 1 + .../Component/Translation/Loader/LoaderInterface.php | 1 + .../Validator/Mapping/Loader/AbstractLoader.php | 1 + .../Component/Validator/Mapping/Loader/XmlFileLoader.php | 2 +- src/Symfony/Component/Yaml/Exception/ParseException.php | 4 ++-- src/Symfony/Component/Yaml/Unescaper.php | 4 ++-- 51 files changed, 73 insertions(+), 34 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php index ef9eb14bf5..bd3080d928 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php @@ -14,6 +14,7 @@ namespace Symfony\Bridge\Doctrine\Form\ChoiceList; use Symfony\Component\Form\Exception\UnexpectedTypeException; use Doctrine\ORM\QueryBuilder; use Doctrine\DBAL\Connection; +use Doctrine\ORM\EntityManager; /** * Getting Entities through the ORM QueryBuilder diff --git a/src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php b/src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php index 11a14fdb54..dd88674cbe 100644 --- a/src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php +++ b/src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php @@ -47,8 +47,8 @@ class PropelUserProvider implements UserProviderInterface /** * Default constructor * - * @param $class The User model class. - * @param $property The property to use to retrieve a user. + * @param string $class The User model class. + * @param string|null $property The property to use to retrieve a user. */ public function __construct($class, $property = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php index e0ec390f1e..4d0e849edc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php @@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser; use Symfony\Component\Config\Loader\DelegatingLoader as BaseDelegatingLoader; use Symfony\Component\Config\Loader\LoaderResolverInterface; use Psr\Log\LoggerInterface; +use Symfony\Component\Routing\RouteCollection; /** * DelegatingLoader delegates route loading to other loaders using a loader resolver. diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PackageFactory.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PackageFactory.php index de36a32831..0a63a29cd6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PackageFactory.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PackageFactory.php @@ -13,6 +13,7 @@ namespace Symfony\Bundle\FrameworkBundle\Templating\Asset; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Templating\Asset\PackageInterface; /** * Creates packages based on whether the current request is secure. diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php index 94c930fef2..f76b5d0b8e 100644 --- a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php +++ b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php @@ -13,6 +13,7 @@ namespace Symfony\Bundle\TwigBundle\Loader; use Symfony\Component\Templating\TemplateNameParserInterface; use Symfony\Component\Config\FileLocatorInterface; +use Symfony\Component\Templating\TemplateReferenceInterface; /** * FilesystemLoader extends the default Twig filesystem loader diff --git a/src/Symfony/Component/ClassLoader/ClassMapGenerator.php b/src/Symfony/Component/ClassLoader/ClassMapGenerator.php index b0e6580df6..0c469481eb 100644 --- a/src/Symfony/Component/ClassLoader/ClassMapGenerator.php +++ b/src/Symfony/Component/ClassLoader/ClassMapGenerator.php @@ -39,7 +39,7 @@ class ClassMapGenerator /** * Iterate over all files in the given directory searching for classes * - * @param Iterator|string $dir The directory to search in or an iterator + * @param \Iterator|string $dir The directory to search in or an iterator * * @return array A class map array */ diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php index 7e06944cd1..9bbbcadc18 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php @@ -10,6 +10,7 @@ */ namespace Symfony\Component\Config\Definition\Builder; + use Symfony\Component\Config\Definition\Exception\UnsetKeyException; /** diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index 49ef6224f7..cc9b6ece92 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -736,7 +736,7 @@ class Application * @param string $namespace An optional namespace name * @param Boolean $asDom Whether to return a DOM or an XML string * - * @return string|DOMDocument An XML string representing the Application + * @return string|\DOMDocument An XML string representing the Application */ public function asXml($namespace = null, $asDom = false) { @@ -787,7 +787,7 @@ class Application /** * Renders a caught exception. * - * @param Exception $e An exception instance + * @param \Exception $e An exception instance * @param OutputInterface $output An OutputInterface instance */ public function renderException($e, $output) diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php index 963e777dfe..46411f928e 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php @@ -597,7 +597,7 @@ class Command * * @param Boolean $asDom Whether to return a DOM or an XML string * - * @return string|DOMDocument An XML string representing the command + * @return string|\DOMDocument An XML string representing the command */ public function asXml($asDom = false) { diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php index 36721601ed..8091f009f5 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php @@ -45,7 +45,7 @@ class OutputFormatter implements OutputFormatterInterface * Initializes console output formatter. * * @param Boolean $decorated Whether this formatter should actually decorate strings - * @param FormatterStyle[] $styles Array of "name => FormatterStyle" instances + * @param OutputFormatterStyleInterface[] $styles Array of "name => FormatterStyle" instances * * @api */ diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php index 69d2f1efe1..eb9c19bfa4 100644 --- a/src/Symfony/Component/Console/Input/InputDefinition.php +++ b/src/Symfony/Component/Console/Input/InputDefinition.php @@ -475,7 +475,7 @@ class InputDefinition * * @param Boolean $asDom Whether to return a DOM or an XML string * - * @return string|DOMDocument An XML string representing the InputDefinition + * @return string|\DOMDocument An XML string representing the InputDefinition */ public function asXml($asDom = false) { diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php index c84057400e..336e343830 100644 --- a/src/Symfony/Component/Console/Tester/CommandTester.php +++ b/src/Symfony/Component/Console/Tester/CommandTester.php @@ -14,6 +14,8 @@ namespace Symfony\Component\Console\Tester; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\StreamOutput; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; /** * Eases the testing of console commands. diff --git a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php index 13e39270e0..2f14ad9421 100644 --- a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php +++ b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php @@ -12,6 +12,7 @@ namespace Symfony\Component\CssSelector\Node; use Symfony\Component\CssSelector\Exception\ParseException; +use Symfony\Component\CssSelector\XPathExpr; /** * CombinedSelectorNode represents a combinator node. diff --git a/src/Symfony/Component/CssSelector/Node/NodeInterface.php b/src/Symfony/Component/CssSelector/Node/NodeInterface.php index 113b1b75d7..2717253f94 100644 --- a/src/Symfony/Component/CssSelector/Node/NodeInterface.php +++ b/src/Symfony/Component/CssSelector/Node/NodeInterface.php @@ -11,6 +11,9 @@ namespace Symfony\Component\CssSelector\Node; +use Symfony\Component\CssSelector\XPathExpr; +use Symfony\Component\CssSelector\Exception\ParseException; + /** * ClassNode represents a "selector.className" node. * diff --git a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php index fc015e1459..424f02088e 100644 --- a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php +++ b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php @@ -28,7 +28,7 @@ interface ExtensionInterface * @param array $config An array of configuration values * @param ContainerBuilder $container A ContainerBuilder instance * - * @throws InvalidArgumentException When provided tag is not defined in this extension + * @throws \InvalidArgumentException When provided tag is not defined in this extension * * @api */ diff --git a/src/Symfony/Component/Form/CallbackTransformer.php b/src/Symfony/Component/Form/CallbackTransformer.php index 1dfe890027..b35da45bc7 100644 --- a/src/Symfony/Component/Form/CallbackTransformer.php +++ b/src/Symfony/Component/Form/CallbackTransformer.php @@ -11,6 +11,9 @@ namespace Symfony\Component\Form; +use Symfony\Component\Form\Exception\UnexpectedTypeException; +use Symfony\Component\Form\Exception\TransformationFailedException; + class CallbackTransformer implements DataTransformerInterface { /** diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index 6f96732d6e..9914d0189a 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -144,7 +144,7 @@ class Form implements \IteratorAggregate, FormInterface * * @param FormConfigInterface $config The form configuration. * - * @throws FormException if a data mapper is not provided for a compound form + * @throws Exception if a data mapper is not provided for a compound form */ public function __construct(FormConfigInterface $config) { diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php index ea46117262..aa212a3ca9 100644 --- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php +++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -34,7 +34,7 @@ class BinaryFileResponse extends Response /** * Constructor. * - * @param SplFileInfo|string $file The file to stream + * @param \SplFileInfo|string $file The file to stream * @param integer $status The response status code * @param array $headers An array of response headers * @param boolean $public Files are public by default @@ -64,7 +64,7 @@ class BinaryFileResponse extends Response /** * Sets the file to stream. * - * @param SplFileInfo|string $file The file to stream + * @param \SplFileInfo|string $file The file to stream * @param string $contentDisposition * @param Boolean $autoEtag * @param Boolean $autoLastModified diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php index 6c896749a3..1618885715 100644 --- a/src/Symfony/Component/HttpKernel/Client.php +++ b/src/Symfony/Component/HttpKernel/Client.php @@ -20,6 +20,7 @@ use Symfony\Component\BrowserKit\Cookie as DomCookie; use Symfony\Component\BrowserKit\History; use Symfony\Component\BrowserKit\CookieJar; use Symfony\Component\HttpKernel\TerminableInterface; +use Symfony\Component\HttpFoundation\Response; /** * Client simulates a browser and makes requests to a Kernel object. diff --git a/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php b/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php index f6b5585c84..59c4af98c8 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php +++ b/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php @@ -51,7 +51,7 @@ class ErrorHandler * * @param integer $level The level at which the conversion to Exception is done (null to use the error_reporting() value and 0 to disable) * - * @return The registered error handler + * @return ErrorHandler The registered error handler */ public static function register($level = null) { diff --git a/src/Symfony/Component/HttpKernel/Event/GetResponseForControllerResultEvent.php b/src/Symfony/Component/HttpKernel/Event/GetResponseForControllerResultEvent.php index 1bc0f98fd0..fcb38daaa8 100644 --- a/src/Symfony/Component/HttpKernel/Event/GetResponseForControllerResultEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/GetResponseForControllerResultEvent.php @@ -56,7 +56,7 @@ class GetResponseForControllerResultEvent extends GetResponseEvent /** * Assigns the return value of the controller. * - * @param mixed The controller return value + * @param mixed $controllerResult The controller return value * * @api */ diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentRendererInterface.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentRendererInterface.php index a758d2c582..ae172df80d 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/FragmentRendererInterface.php +++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentRendererInterface.php @@ -13,6 +13,7 @@ namespace Symfony\Component\HttpKernel\Fragment; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Controller\ControllerReference; +use Symfony\Component\HttpFoundation\Response; /** * Interface implemented by all rendering strategies. diff --git a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php index d62d6c7996..724485fa04 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpKernel\Profiler; -use Redis; /** * RedisProfilerStorage stores profiling information in Redis. @@ -32,7 +31,7 @@ class RedisProfilerStorage implements ProfilerStorageInterface protected $lifetime; /** - * @var Redis + * @var \Redis */ private $redis; @@ -199,7 +198,7 @@ class RedisProfilerStorage implements ProfilerStorageInterface /** * Internal convenience method that returns the instance of Redis. * - * @return Redis + * @return \Redis * * @throws \RuntimeException */ @@ -216,7 +215,7 @@ class RedisProfilerStorage implements ProfilerStorageInterface throw new \RuntimeException('RedisProfilerStorage requires that the redis extension is loaded.'); } - $redis = new Redis; + $redis = new \Redis; $redis->connect($data['host'], $data['port']); if (isset($data['path'])) { @@ -238,7 +237,7 @@ class RedisProfilerStorage implements ProfilerStorageInterface /** * Set instance of the Redis * - * @param Redis $redis + * @param \Redis $redis */ public function setRedis($redis) { diff --git a/src/Symfony/Component/Locale/Locale.php b/src/Symfony/Component/Locale/Locale.php index 271e61d72f..d4a2f6c508 100644 --- a/src/Symfony/Component/Locale/Locale.php +++ b/src/Symfony/Component/Locale/Locale.php @@ -84,7 +84,7 @@ class Locale extends \Locale * Returns all available country codes * * @return array The country codes - * @throws RuntimeException When the resource bundles cannot be loaded + * @throws \RuntimeException When the resource bundles cannot be loaded */ public static function getCountries() { @@ -137,7 +137,7 @@ class Locale extends \Locale * Returns all available language codes * * @return array The language codes - * @throws RuntimeException When the resource bundles cannot be loaded + * @throws \RuntimeException When the resource bundles cannot be loaded */ public static function getLanguages() { @@ -187,7 +187,7 @@ class Locale extends \Locale * Returns all available locale codes * * @return array The locale codes - * @throws RuntimeException When the resource bundles cannot be loaded + * @throws \RuntimeException When the resource bundles cannot be loaded */ public static function getLocales() { @@ -282,7 +282,7 @@ class Locale extends \Locale /** * Returns the fallback locale for a given locale, if any * - * @param $locale The locale to find the fallback for + * @param string $locale The locale to find the fallback for * @return string|null The fallback locale, or null if no parent exists */ protected static function getFallbackLocale($locale) diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php index cdfa558dce..c2cec8e5c5 100644 --- a/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php +++ b/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php @@ -102,7 +102,7 @@ class FullTransformer * Return the formatted ICU value for the matched date characters * * @param string $dateChars The date characters to be replaced with a formatted ICU value - * @param DateTime $dateTime A DateTime object to be used to generate the formatted value + * @param \DateTime $dateTime A DateTime object to be used to generate the formatted value * * @return string The formatted value * diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php index f85e4ceff0..5e7c134b9f 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Routing\Matcher\Dumper; +use Symfony\Component\Routing\RouteCollection; + /** * MatcherDumperInterface is the interface that all matcher dumper classes must implement. * diff --git a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php index d3a4b3799b..5dfef08839 100644 --- a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php +++ b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php @@ -14,6 +14,7 @@ namespace Symfony\Component\Security\Acl\Domain; use Symfony\Component\Security\Acl\Model\AclProviderInterface; use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; use Symfony\Component\Security\Acl\Model\SecurityIdentityRetrievalStrategyInterface; +use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; /** * This service caches ACLs for an entire collection of objects. diff --git a/src/Symfony/Component/Security/Acl/Model/AclInterface.php b/src/Symfony/Component/Security/Acl/Model/AclInterface.php index fffe59166f..02bbd008e5 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclInterface.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Acl\Model; +use Symfony\Component\Security\Acl\Exception\NoAceFoundException; + /** * This interface represents an access control list (ACL) for a domain object. * Each domain object can have exactly one associated ACL. diff --git a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php index 4be49bfc0a..615cf145ac 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Acl\Model; +use Symfony\Component\Security\Acl\Exception\AclNotFoundException; + /** * Provides a common interface for retrieving ACLs. * diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php index f3f6858e2c..8919be9f66 100644 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php @@ -100,7 +100,7 @@ final class PersistentToken implements PersistentTokenInterface /** * Returns the time the token was last used * - * @return DateTime + * @return \DateTime */ public function getLastUsed() { diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php index 0c6f75e03d..39a4ebe486 100644 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Core\Authentication\RememberMe; +use Symfony\Component\Security\Core\Exception\TokenNotFoundException; + /** * Interface for TokenProviders * diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php index 9b0a084338..cabb6d5fd3 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Core\Authentication\Token; +use Symfony\Component\Security\Core\Role\RoleInterface; + /** * AnonymousToken represents an anonymous token. * diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php index d6e3998f1f..3854242f25 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Core\Authentication\Token; +use Symfony\Component\Security\Core\Role\RoleInterface; + /** * UsernamePasswordToken implements a username and password token. * diff --git a/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php index 6e9b0f1899..1b52dab996 100644 --- a/src/Symfony/Component/Security/Core/User/UserInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserInterface.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Security\Core\User; +use Symfony\Component\Security\Core\Role\Role; + /** * Represents the interface that all user classes must implement. * diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php index 8dbd29a7f6..e2d375e754 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php @@ -13,6 +13,7 @@ namespace Symfony\Component\Security\Http\Authentication; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; /** * Interface for custom authentication failure handlers. diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php index 5c08e73cce..9ec64b4493 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php @@ -13,6 +13,7 @@ namespace Symfony\Component\Security\Http\Authentication; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; /** * Interface for a custom authentication success handler diff --git a/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php b/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php index a10a5d0f9d..5f60fd6aa1 100644 --- a/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php @@ -13,6 +13,7 @@ namespace Symfony\Component\Security\Http\Authorization; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Security\Core\Exception\AccessDeniedException; +use Symfony\Component\HttpFoundation\Response; /** * This is used by the ExceptionListener to translate an AccessDeniedException diff --git a/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php b/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php index d190fc7b88..0d7595d407 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php @@ -13,6 +13,7 @@ namespace Symfony\Component\Security\Http\EntryPoint; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; /** * AuthenticationEntryPointInterface is the interface used to start the diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php index ca2f4394d3..653c64429b 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php @@ -20,6 +20,7 @@ use Symfony\Component\Security\Core\Exception\LogoutException; use Symfony\Component\Security\Http\HttpUtils; use Symfony\Component\Security\Http\Logout\LogoutHandlerInterface; use Symfony\Component\Security\Http\Logout\LogoutSuccessHandlerInterface; +use Symfony\Component\Security\Core\Exception\InvalidCsrfTokenException; /** * LogoutListener logout users. diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php index 0453520a58..c3ff865bae 100644 --- a/src/Symfony/Component/Security/Http/HttpUtils.php +++ b/src/Symfony/Component/Security/Http/HttpUtils.php @@ -20,6 +20,7 @@ use Symfony\Component\Routing\Matcher\RequestMatcherInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Routing\Exception\MethodNotAllowedException; use Symfony\Component\Routing\Exception\ResourceNotFoundException; +use Symfony\Component\HttpFoundation\Response; /** * Encapsulates the logic needed to create sub-requests, redirect the user, and match URLs. diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php b/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php index 61642a8b5f..4246fa4414 100644 --- a/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Security\Http\Logout; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; /** * LogoutSuccesshandlerInterface. diff --git a/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php b/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php index 3e8d65fc4e..edcdd4d6d5 100644 --- a/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php +++ b/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php @@ -372,7 +372,7 @@ class MutableAclProviderTest extends \PHPUnit_Framework_TestCase * @param AclProvider $provider * @param array $data * @throws \InvalidArgumentException - * @throws Exception + * @throws \Exception */ protected function importAcls(AclProvider $provider, array $data) { diff --git a/src/Symfony/Component/Security/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php b/src/Symfony/Component/Security/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php index 6de69f1d03..4699257fa3 100644 --- a/src/Symfony/Component/Security/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php +++ b/src/Symfony/Component/Security/Tests/Http/RememberMe/TokenBasedRememberMeServicesTest.php @@ -14,7 +14,6 @@ namespace Symfony\Component\Security\Tests\Http\RememberMe; use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface; use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken; -use Symfony\Component\Security\Core\Authentication\Token\Token; use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php index 0c77a16a9e..7923a75a1f 100644 --- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php @@ -148,7 +148,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec } /** - * @param DOMNode $node + * @param \DOMNode $node * @param string $val * * @return Boolean diff --git a/src/Symfony/Component/Templating/Loader/ChainLoader.php b/src/Symfony/Component/Templating/Loader/ChainLoader.php index 0eec8e570e..56bedb7118 100644 --- a/src/Symfony/Component/Templating/Loader/ChainLoader.php +++ b/src/Symfony/Component/Templating/Loader/ChainLoader.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Templating\Loader; -use Symfony\Component\Templating\Storage; +use Symfony\Component\Templating\Storage\Storage; use Symfony\Component\Templating\TemplateReferenceInterface; /** diff --git a/src/Symfony/Component/Templating/Loader/LoaderInterface.php b/src/Symfony/Component/Templating/Loader/LoaderInterface.php index 4b6d52562d..3f96222b11 100644 --- a/src/Symfony/Component/Templating/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Templating/Loader/LoaderInterface.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Templating\Loader; use Symfony\Component\Templating\TemplateReferenceInterface; +use Symfony\Component\Templating\Storage\Storage; /** * LoaderInterface is the interface all loaders must implement. diff --git a/src/Symfony/Component/Translation/Loader/LoaderInterface.php b/src/Symfony/Component/Translation/Loader/LoaderInterface.php index 4d9965ce99..0b28e14a0d 100644 --- a/src/Symfony/Component/Translation/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Translation/Loader/LoaderInterface.php @@ -13,6 +13,7 @@ namespace Symfony\Component\Translation\Loader; use Symfony\Component\Translation\MessageCatalogue; use Symfony\Component\Translation\Exception\InvalidResourceException; +use Symfony\Component\Translation\Exception\NotFoundResourceException; /** * LoaderInterface is the interface implemented by all translation loaders. diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php index 54c0dbe474..7015f92d42 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Validator\Mapping\Loader; use Symfony\Component\Validator\Exception\MappingException; +use Symfony\Component\Validator\Constraint; abstract class AbstractLoader implements LoaderInterface { diff --git a/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php index a9ae396777..cad247e883 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php @@ -183,7 +183,7 @@ class XmlFileLoader extends FileLoader * * @param string $file Path of file * - * @return SimpleXMLElement + * @return \SimpleXMLElement * * @throws MappingException */ diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php index a27a005e6f..dad166d7c4 100644 --- a/src/Symfony/Component/Yaml/Exception/ParseException.php +++ b/src/Symfony/Component/Yaml/Exception/ParseException.php @@ -32,9 +32,9 @@ class ParseException extends RuntimeException * @param integer $parsedLine The line where the error occurred * @param integer $snippet The snippet of code near the problem * @param string $parsedFile The file name where the error occurred - * @param Exception $previous The previous exception + * @param \Exception $previous The previous exception */ - public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, Exception $previous = null) + public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, \Exception $previous = null) { $this->parsedFile = $parsedFile; $this->parsedLine = $parsedLine; diff --git a/src/Symfony/Component/Yaml/Unescaper.php b/src/Symfony/Component/Yaml/Unescaper.php index 708f2a18f2..ac3a576b67 100644 --- a/src/Symfony/Component/Yaml/Unescaper.php +++ b/src/Symfony/Component/Yaml/Unescaper.php @@ -130,7 +130,7 @@ class Unescaper * * @return string The string with the new encoding * - * @throws RuntimeException if no suitable encoding function is found (iconv or mbstring) + * @throws \RuntimeException if no suitable encoding function is found (iconv or mbstring) */ private function convertEncoding($value, $to, $from) { @@ -140,6 +140,6 @@ class Unescaper return iconv($from, $to, $value); } - throw new RuntimeException('No suitable convert encoding function (install the iconv or mbstring extension).'); + throw new \RuntimeException('No suitable convert encoding function (install the iconv or mbstring extension).'); } }