Changeset 9165

Timestamp:

05/22/08 08:02:24 (5 years ago)

Author:

dwhittle

Message:

1.1: fixed sfBrowser has duplicate listeners (closes #3612)

Files:

• branches/1.1/lib/event/sfEventDispatcher.class.php (modified) (2 diffs)
• branches/1.1/lib/util/sfBrowser.class.php (modified) (2 diffs)
• branches/1.1/test/functional/sfTestBrowserTest.php (modified) (1 diff)

branches/1.1/lib/event/sfEventDispatcher.class.php

@@ -4 +4 @@
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
@@ -155 +155 @@
-    return $this->listeners[$name];
-  }
+
+  /**
+   * Get the entire listeners stack.
+   *
+   * @return array The complete array of event names and listeners
+   */
+  public function getListenerStack()
+  {
+    return $this->listeners;
+  }
-}

branches/1.1/lib/util/sfBrowser.class.php

@@ -405 +405 @@
-      {
-        $currentConfiguration = $this->context->getConfiguration();
-, $currentConfiguration->getEventDispatcher()
+
-        $this->context = sfContext::createInstance($configuration);
+        
+        // copy in any missing listeners
+        $dispatcher = $configuration->getEventDispatcher();
+        foreach ($currentConfiguration->getEventDispatcher()->getListenerStack() as $name => $listeners)
+        {
+          foreach (array_diff($listeners, $dispatcher->getListeners($name)) as $listener)
+          {
+            $dispatcher->connect($name, $listener);
+          }
+        }
-      }
-      else
@@ -412 +422 @@
-        $this->context = sfContext::getInstance();
-        $this->context->initialize($this->context->getConfiguration());
-}
-
-
+  $this->context->getEventDispatcher()->connect('application.throw_exception', array($this, 'ListenToException'));
+
+
-      unset($currentConfiguration);
-    }

branches/1.1/test/functional/sfTestBrowserTest.php

@@ -108 +108 @@
-$b->get('/browser');
-$b->test()->ok($b->getContext()->getEventDispatcher()->hasListeners('my_event'), 'event listeners persist across multiple requests');
+
+// check consistency of number of listeners
+$nb = count($b->getContext()->getEventDispatcher()->getListeners('application.throw_exception'));
+$b->get('/browser');
+$b->test()->is(count($b->getContext()->getEventDispatcher()->getListeners('application.throw_exception')), $nb, 'event listeners are not duplicated');