Skip to content

Commit b702ac3

Browse files
Merge branch '2.6' into 2.7
* 2.6: (24 commits) [HttpKernel] Embed the original exception as previous to bounced exceptions [Enhancement] netbeans - force interactive shell when limited detection [FrameworkBundle] fixes displaying of deprecation notices. Revert "Added missing changelog entry" [Debug] Tweak docblocks [Debug] Rework a bit the PHP doc Added missing changelog entry [StringUtil] Fixed singularification of 'movies' [Debug] Renamed "context" key to "scope_vars" to avoid any ambiguity Fix some phpdocs for Twig extensions & templating helpers [Debug] Made code in ErrorHandler easier to read Use specialized config methods instead of the generic ifTrue() method Fix the AJAX profiling bumped Symfony version to 2.6.7 updated VERSION for 2.6.6 updated CHANGELOG for 2.6.6 Safe escaping of fragments for eval() bumped Symfony version to 2.3.28 updated VERSION for 2.3.27 update CONTRIBUTORS for 2.3.27 ... Conflicts: src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/Kernel.php
2 parents 93681a1 + eafd626 commit b702ac3

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Tests/ContainerAwareEventManagerTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
class ContainerAwareEventManagerTest extends \PHPUnit_Framework_TestCase
1818
{
19+
private $container;
20+
private $evm;
21+
1922
protected function setUp()
2023
{
2124
$this->container = new Container();

0 commit comments

Comments
 (0)