summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2015-06-19 17:19:52 +0200
committerNicolas Grekas <nicolas.grekas@gmail.com>2015-06-19 17:19:52 +0200
commit96932d004f5a2355b8a5691092bfda75c6cf6d0e (patch)
tree9850fb3e9f9fa296f7cb41cf5396d38f1e5dd6bd
parent432cbd7386cc1a6a6713bf9569b2eeec955bb509 (diff)
parentc839c1382bfd96b6a356a2e9498bf5bd1ff775c1 (diff)
downloadsymfony-security-96932d004f5a2355b8a5691092bfda75c6cf6d0e.zip
symfony-security-96932d004f5a2355b8a5691092bfda75c6cf6d0e.tar.gz
symfony-security-96932d004f5a2355b8a5691092bfda75c6cf6d0e.tar.bz2
Merge branch '2.8'
* 2.8: [2.8] Silence newest deprecations [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer [VarDumper] Fix dump output for better readability [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelperTest.php src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php src/Symfony/Bundle/TwigBundle/Tests/Extension/LegacyAssetsExtensionTest.php src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php src/Symfony/Component/Console/Tests/ApplicationTest.php src/Symfony/Component/Console/Tests/Command/CommandTest.php src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php src/Symfony/Component/Console/Tests/Input/StringInputTest.php src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php src/Symfony/Component/DependencyInjection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php src/Symfony/Component/DependencyInjection/Tests/LegacyDefinitionTest.php src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php src/Symfony/Component/EventDispatcher/Tests/EventTest.php src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php src/Symfony/Component/HttpKernel/Tests/KernelTest.php src/Symfony/Component/Locale/Tests/LocaleTest.php src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsResolverTest.php src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php src/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php src/Symfony/Component/Routing/Tests/RouteTest.php src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php src/Symfony/Component/Templating/Tests/Helper/LegacyAssetsHelperTest.php src/Symfony/Component/Templating/Tests/Helper/LegacyCoreAssetsHelperTest.php src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php src/Symfony/Component/Yaml/Tests/YamlTest.php
-rw-r--r--Core/Tests/LegacySecurityContextTest.php2
-rw-r--r--Tests/Core/LegacySecurityContextInterfaceTest.php2
2 files changed, 0 insertions, 4 deletions
diff --git a/Core/Tests/LegacySecurityContextTest.php b/Core/Tests/LegacySecurityContextTest.php
index f1f7861..c5da22d 100644
--- a/Core/Tests/LegacySecurityContextTest.php
+++ b/Core/Tests/LegacySecurityContextTest.php
@@ -26,8 +26,6 @@ class LegacySecurityContextTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
$this->tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
$this->authorizationChecker = $this->getMock('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
$this->securityContext = new SecurityContext($this->tokenStorage, $this->authorizationChecker);
diff --git a/Tests/Core/LegacySecurityContextInterfaceTest.php b/Tests/Core/LegacySecurityContextInterfaceTest.php
index 3fad2b1..57517bf 100644
--- a/Tests/Core/LegacySecurityContextInterfaceTest.php
+++ b/Tests/Core/LegacySecurityContextInterfaceTest.php
@@ -24,8 +24,6 @@ class LegacySecurityContextInterfaceTest extends \PHPUnit_Framework_TestCase
*/
public function testConstantSync()
{
- $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
$this->assertSame(Security::ACCESS_DENIED_ERROR, SecurityContextInterface::ACCESS_DENIED_ERROR);
$this->assertSame(Security::AUTHENTICATION_ERROR, SecurityContextInterface::AUTHENTICATION_ERROR);
$this->assertSame(Security::LAST_USERNAME, SecurityContextInterface::LAST_USERNAME);