Alias dev-master as 1.1.x-dev

This ensures we test against old and current Symfony versions

.gitignore

@@ -1,5 +1,3 @@
+composer.lock
 phpunit.xml
 vendor
-composer.lock
-composer.phar
-

.travis.yml

@@ -0,0 +1,27 @@
+language: php
+
+sudo: false
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+matrix:
+    fast_finish: true
+    allow_failures:
+        - php: hhvm
+        - env: SYMFONY_VERSION=3.0.*
+
+    include:
+        - php: 5.3
+          env: COMPOSER_FLAGS="--prefer-lowest"
+
+before_install:
+    - travis_retry composer self-update
+
+install:
+    - composer update ${COMPOSER_FLAGS} --no-interaction

README.md

@@ -1,16 +1,37 @@
 # WildcardEventDispatcher
 
-This library implements an event dispatcher, based on [Symfony2's interface][],
+[![Build Status](https://travis-ci.org/jmikola/WildcardEventDispatcher.png?branch=master)](https://travis-ci.org/jmikola/WildcardEventDispatcher)
+
+This library implements an event dispatcher, based on [Symfony's interface][],
 with wildcard syntax inspired by AMQP topic exchanges. Listeners may be bound to
 a wildcard pattern and be notified if a dispatched event's name matches that
 pattern. Literal event name matching is still supported.
 
-  [Symfony2's interface]: https://github.com/symfony/EventDispatcher
+If you are interested in using this library in a Symfony project, you may also
+want to take a look at the corresponding [bundle][].
 
-## Usage ##
+  [Symfony's interface]: https://github.com/symfony/EventDispatcher
+  [bundle]: https://github.com/jmikola/JmikolaWildcardEventDispatcherBundle
+
+## Installation
+
+The library is published as a [package][] and is installable via [Composer][]:
+
+```
+$ composer require jmikola/wildcard-event-dispatcher=~1.0
+```
+
+  [package]: https://packagist.org/packages/jmikola/wildcard-event-dispatcher
+  [Composer]: http://getcomposer.org/
+
+### Compatibility
+
+This library requires Symfony 2.3 or above.
+
+## Usage
 
 WildcardEventDispatcher implements EventDispatcherInterface and may be used as
-you would Symfony2's standard EventDispatcher:
+you would Symfony's standard EventDispatcher:
 
 ```php
 <?php
@@ -44,9 +65,9 @@ $dispatcher = new WildcardEventDispatcher(new EventDispatcher());
 
   [composes]: http://en.wikipedia.org/wiki/Object_composition
 
-## Wildcard Syntax ##
+## Wildcard Syntax
 
-### Single-word Wildcard ###
+### Single-word Wildcard
 
 Consider the scenario where the same listener is defined for multiple events,
 all of which share a common prefix:
@@ -84,7 +105,7 @@ and followed by another word. The matching of `core` alone may not make sense,
 but this is implemented in order to be consistent with AMQP. A trailing `*`
 after a non-empty sequence may match the preceding sequence sans `.*`.
 
-### Multi-word Wildcard ###
+### Multi-word Wildcard
 
 Suppose there was a `core` event in your application named `core.foo.bar`. The
 aforementioned `core.*` pattern would not catch this event. You could use:
@@ -124,7 +145,7 @@ $dispatcher = new WildcardEventDispatcher();
 $dispatcher->addListener('#', $allListener);
 ```
 
-### Additional Wildcard Documentation ###
+### Additional Wildcard Documentation
 
 When in doubt, the unit tests for `ListenerPattern` are a good resource for
 inferring how wildcards will be interpreted. This library aims to mimic the

composer.json

@@ -10,9 +10,14 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/event-dispatcher": ">=2.0-dev,<2.2-dev"
+        "symfony/event-dispatcher": "^2.3 || ^3.0"
     },
     "autoload": {
         "psr-0": { "Jmikola": "src/" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1.x-dev"
+        }
     }
 }

src/Jmikola/WildcardEventDispatcher/LazyListenerPattern.php

@@ -15,7 +15,7 @@ class LazyListenerPattern extends ListenerPattern
      * @param string   $eventPattern
      * @param callback $listenerProvider
      * @param integer  $priority
-     * @throws InvalidArgumentException if the listener provider is not a callback
+     * @throws \InvalidArgumentException if the listener provider is not a callback
      */
     public function __construct($eventPattern, $listenerProvider, $priority = 0)
     {

src/Jmikola/WildcardEventDispatcher/WildcardEventDispatcher.php

@@ -16,7 +16,7 @@ class WildcardEventDispatcher implements EventDispatcherInterface
     /**
      * Constructor.
      *
-     * If an EventDispatcherInterface is not provided , a new EventDispatcher
+     * If an EventDispatcherInterface is not provided, a new EventDispatcher
      * will be composed.
      *
      * @param EventDispatcherInterface $dispatcher
@@ -92,10 +92,14 @@ class WildcardEventDispatcher implements EventDispatcherInterface
     public function addSubscriber(EventSubscriberInterface $subscriber)
     {
         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
-            if (is_array($params)) {
-                $this->addListener($eventName, array($subscriber, $params[0]), $params[1]);
-            } else {
+            if (is_string($params)) {
                 $this->addListener($eventName, array($subscriber, $params));
+            } elseif (is_string($params[0])) {
+                $this->addListener($eventName, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);
+            } else {
+                foreach ($params as $listener) {
+                    $this->addListener($eventName, array($subscriber, $listener[0]), isset($listener[1]) ? $listener[1] : 0);
+                }
             }
         }
     }
@@ -106,7 +110,13 @@ class WildcardEventDispatcher implements EventDispatcherInterface
     public function removeSubscriber(EventSubscriberInterface $subscriber)
     {
         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
-            $this->removeListener($eventName, array($subscriber, is_array($params) ? $params[0] : $params));
+            if (is_array($params) && is_array($params[0])) {
+                foreach ($params as $listener) {
+                    $this->removeListener($eventName, array($subscriber, $listener[0]));
+                }
+            } else {
+                $this->removeListener($eventName, array($subscriber, is_string($params) ? $params : $params[0]));
+            }
         }
     }
 
@@ -185,4 +195,22 @@ class WildcardEventDispatcher implements EventDispatcherInterface
             }
         }
     }
+
+    /**
+     * @see EventDispatcherInterface::getListenerPriority()
+     * @throws \InvalidArgumentException if $eventName contains a wildcard pattern
+     * @throws \BadMethodCallException if this method is not implemented on the composed EventDispatcher
+     */
+    public function getListenerPriority($eventName, $listener)
+    {
+        if ($this->hasWildcards($eventName)) {
+            throw new \InvalidArgumentException('Wildcard patterns are not supported');
+        }
+
+        if ( ! method_exists($this->dispatcher, 'getListenerPriority')) {
+            throw new \BadMethodCallException('getListenerPriority() is not implemented');
+        }
+
+        return $this->dispatcher->getListenerPriority($eventName, $listener);
+    }
 }

tests/Jmikola/Tests/WildcardEventDispatcher/ListenerPatternTest.php

@@ -86,6 +86,6 @@ class ListenerPatternTest extends \PHPUnit_Framework_TestCase
 
     private function getMockEventDispatcher()
     {
-        return $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        return $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
     }
 }

tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherFunctionalTest.php

@@ -127,7 +127,7 @@ class WildcardEventDispatcherFunctionalTest extends \PHPUnit_Framework_TestCase
     private function assertNumberListenersAdded($expected, $eventName = null)
     {
         return isset($eventName)
-            ? $this->assertEquals($expected, count($this->dispatcher->getListeners($eventName)))
+            ? $this->assertCount($expected, $this->dispatcher->getListeners($eventName))
             : $this->assertEquals($expected, array_sum(array_map('count', $this->dispatcher->getListeners())));
     }
 }

tests/Jmikola/Tests/WildcardEventDispatcher/WildcardEventDispatcherTest.php

@@ -115,32 +115,74 @@ class EventDispatcherTest extends \PHPUnit_Framework_TestCase
          */
         $subscriber = new TestEventSubscriber();
 
-        $i = 0;
-        $defaultPriority = 0;
-        $numSubscribedEvents = count($subscriber->getSubscribedEvents());
+        $this->innerDispatcher->expects($this->at(0))
+            ->method('addListener')
+            ->with('core.request', array($subscriber, 'onRequest'), 0);
+        $this->innerDispatcher->expects($this->at(1))
+            ->method('addListener')
+            ->with('core.exception', array($subscriber, 'onException'), 10);
+        $this->innerDispatcher->expects($this->at(2))
+            ->method('addListener')
+            ->with('core.multi', array($subscriber, 'onMulti1'), 10);
+        $this->innerDispatcher->expects($this->at(3))
+            ->method('addListener')
+            ->with('core.multi', array($subscriber, 'onMulti2'), 20);
 
-        foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
-            $method = is_array($params) ? $params[0] : $params;
-            $priority = is_array($params) ? $params[1] : $defaultPriority;
+        $this->innerDispatcher->expects($this->at(4))
+            ->method('removeListener')
+            ->with('core.request', array($subscriber, 'onRequest'));
+        $this->innerDispatcher->expects($this->at(5))
+            ->method('removeListener')
+            ->with('core.exception', array($subscriber, 'onException'));
+        $this->innerDispatcher->expects($this->at(6))
+            ->method('removeListener')
+            ->with('core.multi', array($subscriber, 'onMulti1'));
+        $this->innerDispatcher->expects($this->at(7))
+            ->method('removeListener')
+            ->with('core.multi', array($subscriber, 'onMulti2'));
 
-            $this->innerDispatcher->expects($this->at($i))
-                ->method('addListener')
-                ->with($eventName, array($subscriber, $method), $priority);
 
-            $this->innerDispatcher->expects($this->at($numSubscribedEvents + $i))
-                ->method('removeListener')
-                ->with($eventName, array($subscriber, $method));
+        $this->dispatcher->addSubscriber($subscriber);
+        $this->dispatcher->removeSubscriber($subscriber);
+    }
 
-            ++$i;
+    public function testGetListenerPriorityInvokesMethodOnInnerDispather()
+    {
+        if ( ! method_exists('Symfony\Component\EventDispatcher\EventDispatcherInterface', 'getListenerPriority')) {
+            $this->markTestSkipped('getListenerPriority() does not exist on EventDispatcherInterface');
         }
 
-        $this->dispatcher->addSubscriber($subscriber, $priority);
-        $this->dispatcher->removeSubscriber($subscriber, $priority);
+        $this->innerDispatcher->expects($this->once())
+            ->method('getListenerPriority')
+            ->with('core.request', 'callback')
+            ->will($this->returnValue(1));
+
+        $this->assertSame(1, $this->dispatcher->getListenerPriority('core.request', 'callback'));
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testGetListenerPriorityRequiresEventNameWithoutWildcards()
+    {
+        $this->dispatcher->getListenerPriority('core.*', 'callback');
+    }
+
+    /**
+     * @expectedException BadMethodCallException
+     */
+    public function testGetListenerPriorityRequiresMethodOnInnerDispather()
+    {
+        if (method_exists('Symfony\Component\EventDispatcher\EventDispatcherInterface', 'getListenerPriority')) {
+            $this->markTestSkipped('getListenerPriority() exists on EventDispatcherInterface');
+        }
+
+        $this->dispatcher->getListenerPriority('core.request', 'callback');
     }
 
     private function getMockEventDispatcher()
     {
-        return $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        return $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
     }
 }
 
@@ -151,6 +193,7 @@ class TestEventSubscriber implements EventSubscriberInterface
         return array(
             'core.request' => 'onRequest',
             'core.exception' => array('onException', 10),
+            'core.multi' => array(array('onMulti1', 10), array('onMulti2', 20)),
         );
     }
 }

tests/bootstrap.php

@@ -1,9 +1,7 @@
-<?php 
+<?php
 
-if (file_exists($file = __DIR__.'/../vendor/.composer/autoload.php')) {
-    $loader = require_once $file;
-} else {
+if (!is_file($autoloadFile = __DIR__.'/../vendor/autoload.php')) {
     throw new RuntimeException('Install dependencies to run test suite.');
 }
 
-$loader->add('Jmikola\\WildcardEventDispatcher', __DIR__.'/../src');
+require $autoloadFile;