diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-03-13 11:36:02 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-03-13 11:36:02 +0100 |
| commit | 3d22c5807ff626906306c114368779863de63ab6 (patch) | |
| tree | 2503bda22f765a28ec89676e013e57e931afc4e5 /Core/Tests/LegacySecurityContextTest.php | |
| parent | a717a745480d9b7839871c8afa02508f17904be7 (diff) | |
| parent | 7ce4fb1b7505e247eaff30acf3029a768c6f4844 (diff) | |
| download | symfony-security-3d22c5807ff626906306c114368779863de63ab6.zip symfony-security-3d22c5807ff626906306c114368779863de63ab6.tar.gz symfony-security-3d22c5807ff626906306c114368779863de63ab6.tar.bz2 | |
Merge branch '2.7'
* 2.7:
Changed visibility of setUp() and tearDown to protected
Changed visibility of setUp() and tearDown to protected
[2.7] Fix travis file
[HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
[Debug] reintroduce charset param to ExceptionHandler
Changed visibility of setUp() and tearDown to protected
[WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
[Debug] deprecate ExceptionHandler::utf8Htmlize
Added default button class
used HTML5 meta charset tag and removed hardcoded ones
Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
fixed XSS in the exception handler
Php Inspections (EA Extended) - static code analysis includes:
[2.3] Remove most refs uses
[FrameworkBundle] Read config/validation/*.(xml|yml) files
Test with local components instead of waiting for the subtree-splitter when possible
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.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/Helper/ProgressHelper.php
src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
src/Symfony/Component/Debug/ExceptionHandler.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
src/Symfony/Component/Templating/Tests/Helper/LegacyAssetsHelperTest.php
Diffstat (limited to 'Core/Tests/LegacySecurityContextTest.php')
| -rw-r--r-- | Core/Tests/LegacySecurityContextTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Tests/LegacySecurityContextTest.php b/Core/Tests/LegacySecurityContextTest.php index 4d1adf8..83abac1 100644 --- a/Core/Tests/LegacySecurityContextTest.php +++ b/Core/Tests/LegacySecurityContextTest.php @@ -21,7 +21,7 @@ class LegacySecurityContextTest extends \PHPUnit_Framework_TestCase private $authorizationChecker; private $securityContext; - public function setUp() + protected function setUp() { $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); |