diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-06-11 19:39:49 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-06-11 19:39:49 +0200 |
commit | 1a271b443b5d5e65f6cb4db3786779d9f4c98102 (patch) | |
tree | 80b8b781b60a3e1a2925af9ac0ec1c6a2f09b8ba /Http | |
parent | 8c2b934b13e2eb75e7109b5550ed180d14754019 (diff) | |
parent | bb80188e3b42a85f6c4ead17332098cab3f62aac (diff) | |
download | symfony-security-1a271b443b5d5e65f6cb4db3786779d9f4c98102.zip symfony-security-1a271b443b5d5e65f6cb4db3786779d9f4c98102.tar.gz symfony-security-1a271b443b5d5e65f6cb4db3786779d9f4c98102.tar.bz2 |
Merge branch '2.8'
* 2.8: (36 commits)
Fix test name
fixed CS
Allow new lines in Messages translated with transchoice() (replacement for #14867)
[Form] Swap new ChoiceView constructor arguments to ease migrating from the deprecated one
[2.3] Fix tests on Windows
[Yaml] remove partial deprecation annotation
[HttpFoundation] Postpone setting the date header on a Response
[Console] SymfonyStyle : Fix blocks wordwrapping
[Console] SymfonyStyle : Fix blocks output is broken on windows cmd
[toolbar] Merged colored icons in toolbar
[Validator] remove partial deprecation annotation
Updated UPGRADE-2.4.md
added missing "
Silence invasive deprecation warnings, opt-in for warnings
[Form] Support DateTimeImmutable in transform()
Show the FormType and FormTypeExtension in case of deprecated use of setDefaultOptions
Removed route name from the debugbar.
[FrameworkBundle] Document form.csrf_provider service deprecation
[Form] add test to avoid regression of #14891
without this change allways the legacy code get called
...
Conflicts:
UPGRADE-2.4.md
UPGRADE-2.7.md
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Monolog/Logger.php
src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
src/Symfony/Bridge/Twig/AppVariable.php
src/Symfony/Bridge/Twig/Extension/AssetExtension.php
src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingAssetHelperPass.php
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PackageFactory.php
src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PathPackage.php
src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/TwigBundle/Debug/TimedTwigEngine.php
src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php
src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
src/Symfony/Bundle/TwigBundle/TwigDefaultEscapingStrategy.php
src/Symfony/Bundle/TwigBundle/TwigEngine.php
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
src/Symfony/Component/ClassLoader/DebugClassLoader.php
src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
src/Symfony/Component/ClassLoader/UniversalClassLoader.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/Console/Command/Command.php
src/Symfony/Component/Console/Helper/DialogHelper.php
src/Symfony/Component/Console/Helper/HelperSet.php
src/Symfony/Component/Console/Helper/ProgressBar.php
src/Symfony/Component/Console/Helper/ProgressHelper.php
src/Symfony/Component/Console/Helper/TableHelper.php
src/Symfony/Component/Console/Input/InputDefinition.php
src/Symfony/Component/Console/Input/StringInput.php
src/Symfony/Component/Debug/DebugClassLoader.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/Debug/Exception/DummyException.php
src/Symfony/Component/Debug/ExceptionHandler.php
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/DependencyInjection/Definition.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
src/Symfony/Component/EventDispatcher/Event.php
src/Symfony/Component/Filesystem/Filesystem.php
src/Symfony/Component/Form/Deprecated/FormEvents.php
src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
src/Symfony/Component/Form/ResolvedFormType.php
src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
src/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php
src/Symfony/Component/HttpKernel/EventListener/EsiListener.php
src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php
src/Symfony/Component/HttpKernel/Exception/FlattenException.php
src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
src/Symfony/Component/HttpKernel/HttpCache/Esi.php
src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php
src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Log/NullLogger.php
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Locale/Exception/MethodArgumentNotImplementedException.php
src/Symfony/Component/Locale/Exception/MethodArgumentValueNotImplementedException.php
src/Symfony/Component/Locale/Exception/MethodNotImplementedException.php
src/Symfony/Component/Locale/Exception/NotImplementedException.php
src/Symfony/Component/Locale/Locale.php
src/Symfony/Component/Locale/Stub/DateFormat/AmPmTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/DayOfWeekTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/DayOfYearTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/DayTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/Hour1200Transformer.php
src/Symfony/Component/Locale/Stub/DateFormat/Hour1201Transformer.php
src/Symfony/Component/Locale/Stub/DateFormat/Hour2400Transformer.php
src/Symfony/Component/Locale/Stub/DateFormat/Hour2401Transformer.php
src/Symfony/Component/Locale/Stub/DateFormat/HourTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/MinuteTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/QuarterTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/SecondTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php
src/Symfony/Component/Locale/Stub/DateFormat/Transformer.php
src/Symfony/Component/Locale/Stub/DateFormat/YearTransformer.php
src/Symfony/Component/Locale/Stub/StubCollator.php
src/Symfony/Component/Locale/Stub/StubIntl.php
src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php
src/Symfony/Component/Locale/Stub/StubLocale.php
src/Symfony/Component/Locale/Stub/StubNumberFormatter.php
src/Symfony/Component/OptionsResolver/OptionsResolver.php
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Process/ProcessUtils.php
src/Symfony/Component/PropertyAccess/PropertyAccess.php
src/Symfony/Component/Routing/Annotation/Route.php
src/Symfony/Component/Routing/Loader/XmlFileLoader.php
src/Symfony/Component/Routing/Loader/YamlFileLoader.php
src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php
src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
src/Symfony/Component/Routing/Route.php
src/Symfony/Component/Serializer/Encoder/JsonDecode.php
src/Symfony/Component/Serializer/Encoder/JsonEncode.php
src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
src/Symfony/Component/Templating/Asset/Package.php
src/Symfony/Component/Templating/Asset/PackageInterface.php
src/Symfony/Component/Templating/Asset/PathPackage.php
src/Symfony/Component/Templating/Asset/UrlPackage.php
src/Symfony/Component/Templating/Helper/AssetsHelper.php
src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
src/Symfony/Component/Templating/Loader/Loader.php
src/Symfony/Component/Translation/Translator.php
src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
src/Symfony/Component/VarDumper/Cloner/Data.php
src/Symfony/Component/Yaml/Yaml.php
Diffstat (limited to 'Http')
-rw-r--r-- | Http/Firewall/AccessListener.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Firewall/AccessListener.php b/Http/Firewall/AccessListener.php index 6fd68f3..c234317 100644 --- a/Http/Firewall/AccessListener.php +++ b/Http/Firewall/AccessListener.php @@ -50,7 +50,7 @@ class AccessListener implements ListenerInterface public function handle(GetResponseEvent $event) { if (null === $token = $this->tokenStorage->getToken()) { - throw new AuthenticationCredentialsNotFoundException('A Token was not found in the SecurityContext.'); + throw new AuthenticationCredentialsNotFoundException('A Token was not found in the TokenStorage.'); } $request = $event->getRequest(); |