Move EventDispatcher service to DI and remove EventDispatcher::clearAllObservers method. This method is only used to 'reset' the EventDispatcher, and is no longer necessary thanks to DI.

1 files changed, 10 insertions, 27 deletions

diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php
index 47ae487cde..2955e5b03f 100644
--- a/core/EventDispatcher.php
+++ b/core/EventDispatcher.php
@@ -9,16 +9,23 @@
 
 namespace Piwik;
 
+use Piwik\Container\StaticContainer;
 use Piwik\Plugin;
 
 /**
  * This class allows code to post events from anywhere in Piwik and for
  * plugins to associate callbacks to be executed when events are posted.
- *
- * @method static \Piwik\EventDispatcher getInstance()
  */
-class EventDispatcher extends Singleton
+class EventDispatcher
 {
+    /**
+     * @return EventDispatcher
+     */
+    public static function getInstance()
+    {
+        return StaticContainer::get('Piwik\EventDispatcher');
+    }
+
     // implementation details for postEvent
     const EVENT_CALLBACK_GROUP_FIRST = 0;
     const EVENT_CALLBACK_GROUP_SECOND = 1;
@@ -158,30 +165,6 @@ class EventDispatcher extends Singleton
     }
 
     /**
-     * Removes all registered extra observers for an event name. Only used for testing.
-     *
-     * @param string $eventName
-     */
-    public function clearObservers($eventName)
-    {
-        $this->extraObservers[$eventName] = array();
-    }
-
-    /**
-     * Removes all registered extra observers. Only used for testing.
-     */
-    public function clearAllObservers()
-    {
-        foreach ($this->extraObservers as $eventName => $eventObservers) {
-            if (strpos($eventName, 'Log.format') === 0) {
-                continue;
-            }
-
-            $this->extraObservers[$eventName] = array();
-        }
-    }
-
-    /**
      * Re-posts all pending events to the given plugin.
      *
      * @param Plugin $plugin