Refs #4208 refactor all singletons except the hard ones (with custom getInstance()

(some tests failing)

1 files changed, 1 insertions, 17 deletions

diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php
index 66cef418ef..c57cea990e 100644
--- a/core/EventDispatcher.php
+++ b/core/EventDispatcher.php
@@ -17,7 +17,7 @@ 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.
  */
-class EventDispatcher
+class EventDispatcher extends Singleton
 {
     // implementation details for postEvent
     const EVENT_CALLBACK_GROUP_FIRST = 0;
@@ -25,22 +25,6 @@ class EventDispatcher
     const EVENT_CALLBACK_GROUP_THIRD = 2;
 
     /**
-     * Singleton instance.
-     */
-    private static $instance = null;
-
-    /**
-     * Returns the singleton EventDispatcher instance. Creates it if necessary.
-     */
-    public static function getInstance()
-    {
-        if (self::$instance === null) {
-            self::$instance = new EventDispatcher();
-        }
-        return self::$instance;
-    }
-
-    /**
      * Array of observers (callbacks attached to events) that are not methods
      * of plugin classes.
      *