Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merged branch drak/caed (PR #3783)

Commits
-------

d04638a [EventDispatcher] More logical positions for classes.

Discussion
----------

[EventDispatcher] More logical positions for classes.

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -

---------------------------------------------------------------------------

by stof at 2012-04-04T18:59:02Z

ah sorry, I looked at the patch too fast. Only the interface is moved
  • Loading branch information...
commit 6bcd0a2d40378780ad0491bba8b23515cd985973 2 parents fec3d29 + d04638a
Fabien Potencier fabpot authored
2  src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
@@ -5,7 +5,7 @@
5 5 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
6 6
7 7 <parameters>
8   - <parameter key="debug.event_dispatcher.class">Symfony\Component\EventDispatcher\ContainerAwareTraceableEventDispatcher</parameter>
  8 + <parameter key="debug.event_dispatcher.class">Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher</parameter>
9 9 <parameter key="debug.stopwatch.class">Symfony\Component\HttpKernel\Debug\Stopwatch</parameter>
10 10 <parameter key="debug.container.dump">%kernel.cache_dir%/%kernel.container_class%.xml</parameter>
11 11 <parameter key="debug.controller_resolver.class">Symfony\Bundle\FrameworkBundle\Controller\TraceableControllerResolver</parameter>
2  ...ernel/Debug/TraceableEventDispatcherInterface.php → ...tcher/Debug/TraceableEventDispatcherInterface.php
@@ -9,7 +9,7 @@
9 9 * file that was distributed with this source code.
10 10 */
11 11
12   -namespace Symfony\Component\HttpKernel\Debug;
  12 +namespace Symfony\Component\EventDispatcher\Debug;
13 13
14 14 /**
15 15 * @author Fabien Potencier <fabien@symfony.com>
2  src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -13,7 +13,7 @@
13 13
14 14 use Symfony\Component\HttpFoundation\Request;
15 15 use Symfony\Component\HttpFoundation\Response;
16   -use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcherInterface;
  16 +use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
17 17 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
18 18
19 19 /**
4 ...atcher/ContainerAwareTraceableEventDispatcher.php → .../Debug/ContainerAwareTraceableEventDispatcher.php
@@ -9,15 +9,15 @@
9 9 * file that was distributed with this source code.
10 10 */
11 11
12   -namespace Symfony\Component\EventDispatcher;
  12 +namespace Symfony\Component\HttpKernel\Debug;
13 13
14 14 use Symfony\Component\HttpKernel\Debug\Stopwatch;
15 15 use Symfony\Component\HttpKernel\Log\LoggerInterface;
16 16 use Symfony\Component\HttpKernel\Profiler\Profiler;
17   -use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcherInterface;
18 17 use Symfony\Component\DependencyInjection\ContainerInterface;
19 18 use Symfony\Component\EventDispatcher\Event;
20 19 use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
  20 +use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
21 21
22 22 /**
23 23 * Extends the ContainerAwareEventDispatcher to add some debugging tools.
2  src/Symfony/Component/HttpKernel/Tests/DataCollector/EventDataCollectorTest.php
@@ -14,7 +14,7 @@
14 14 use Symfony\Component\HttpKernel\DataCollector\EventDataCollector;
15 15 use Symfony\Component\HttpFoundation\Request;
16 16 use Symfony\Component\HttpFoundation\Response;
17   -use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcherInterface;
  17 +use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
18 18 use Symfony\Component\EventDispatcher\EventDispatcher;
19 19 use Symfony\Component\HttpKernel\Tests\Fixtures\TestEventDispatcher;
20 20
4 ...ts/ContainerAwareTraceableEventDispatcherTest.php → ...ug/ContainerAwareTraceableEventDispatcherTest.php
@@ -9,9 +9,9 @@
9 9 * file that was distributed with this source code.
10 10 */
11 11
12   -namespace Symfony\Component\EventDispatcher\Tests;
  12 +namespace Symfony\Component\HttpKernel\Tests\Debug;
13 13
14   -use Symfony\Component\EventDispatcher\ContainerAwareTraceableEventDispatcher;
  14 +use Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher;
15 15 use Symfony\Component\HttpKernel\Debug\Stopwatch;
16 16
17 17 class ContainerAwareTraceableEventDispatcherTest extends \PHPUnit_Framework_TestCase
2  src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
@@ -11,7 +11,7 @@
11 11
12 12 namespace Symfony\Component\HttpKernel\Tests\Fixtures;
13 13
14   -use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcherInterface;
  14 +use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
15 15 use Symfony\Component\EventDispatcher\EventDispatcher;
16 16
17 17 class TestEventDispatcher extends EventDispatcher implements TraceableEventDispatcherInterface

0 comments on commit 6bcd0a2

Please sign in to comment.
Something went wrong with that request. Please try again.