ZF3

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.3.3
-  - 5.4
   - 5.5
   - 5.6
   - 7

composer.json

@@ -22,15 +22,15 @@
         }
     ],
     "require": {
-        "php":                               ">=5.3.3",
-        "zendframework/zend-mvc":            "2.*",
-        "zendframework/zend-eventmanager":   "2.*",
-        "zendframework/zend-stdlib":         "2.*",
-        "zendframework/zend-servicemanager": "2.*",
-        "zendframework/zend-modulemanager":  "2.*",
-        "zendframework/zend-version":        "2.*",
-        "zendframework/zend-debug":          "2.*",
-        "zendframework/zend-view":           "2.*"
+        "php":                               "^5.5 || ^7.0",
+        "zendframework/zend-mvc":            "^2.7 || ^3.0.1",
+        "zendframework/zend-eventmanager":   "^2.6.2 || ^3.0",
+        "zendframework/zend-stdlib":         "^2.7 || ^3.0",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-modulemanager":  "^2.7",
+        "zendframework/zend-version":        "^2.5",
+        "zendframework/zend-debug":          "^2.5 || ^3.0",
+        "zendframework/zend-view":           "^2.6"
     },
     "require-dev": {
       "phpunit/phpunit":                     "~4"

src/ZendDeveloperTools/Listener/EventLoggingListenerAggregate.php

@@ -11,9 +11,8 @@
 
 use Zend\EventManager\Event;
 use Zend\EventManager\SharedEventManagerInterface;
-use Zend\EventManager\SharedListenerAggregateInterface;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use ZendDeveloperTools\Collector\CollectorInterface;
+use ZendDeveloperTools\Collector\EventCollectorInterface;
 use ZendDeveloperTools\Profiler;
 
 /**
@@ -22,10 +21,10 @@
  * @author Mark Garrett <[email protected]>
  * @since 0.0.3
  */
-class EventLoggingListenerAggregate implements SharedListenerAggregateInterface
+class EventLoggingListenerAggregate
 {
     /**
-     * @var \ZendDeveloperTools\Collector\EventCollectorInterface[]
+     * @var EventCollectorInterface[]
      */
     protected $collectors;
 
@@ -37,7 +36,7 @@ class EventLoggingListenerAggregate implements SharedListenerAggregateInterface
     /**
      * Constructor.
      *
-     * @param \ZendDeveloperTools\Collector\EventCollectorInterface[] $collectors
+     * @param EventCollectorInterface[] $collectors
      * @param string[]                                                $identifiers
      */
     public function __construct(array $collectors, array $identifiers)
@@ -61,7 +60,9 @@ function ($identifier) {
      */
     public function attachShared(SharedEventManagerInterface $events)
     {
-        $events->attach($this->identifiers, '*', array($this,'onCollectEvent'), Profiler::PRIORITY_EVENT_COLLECTOR);
+        foreach ($this->identifiers as $id) {
+            $events->attach($id, '*', array($this,'onCollectEvent'), Profiler::PRIORITY_EVENT_COLLECTOR);
+        }
     }
 
     /**

src/ZendDeveloperTools/Listener/FirePhpListener.php

@@ -44,7 +44,7 @@ public function __construct(ServiceLocatorInterface $serviceLocator)
     /**
      * {@inheritdoc}
      */
-    public function attach(EventManagerInterface $events)
+    public function attach(EventManagerInterface $events, $priority = 1)
     {
         $this->listeners[] = $events->attach(
             ProfilerEvent::EVENT_COLLECTED,

src/ZendDeveloperTools/Listener/FlushListener.php

@@ -31,7 +31,7 @@ class FlushListener implements ListenerAggregateInterface
     /**
      * {@inheritdoc}
      */
-    public function attach(EventManagerInterface $events)
+    public function attach(EventManagerInterface $events, $priority = 1)
     {
         $this->listeners[] = $events->attach(
             MvcEvent::EVENT_FINISH,

src/ZendDeveloperTools/Listener/ProfilerListener.php

@@ -55,7 +55,7 @@ public function __construct(ServiceLocatorInterface $serviceLocator, Options $op
     /**
      * {@inheritdoc}
      */
-    public function attach(EventManagerInterface $events)
+    public function attach(EventManagerInterface $events, $priority = 1)
     {
         $this->listeners[] = $events->attach(
             MvcEvent::EVENT_FINISH,

src/ZendDeveloperTools/Listener/StorageListener.php

@@ -44,7 +44,7 @@ public function __construct(ServiceLocatorInterface $serviceLocator)
     /**
      * {@inheritdoc}
      */
-    public function attach(EventManagerInterface $events)
+    public function attach(EventManagerInterface $events, $priority = 1)
     {
         $this->listeners[] = $events->attach(
             ProfilerEvent::EVENT_COLLECTED,

src/ZendDeveloperTools/Listener/ToolbarListener.php

@@ -89,15 +89,11 @@ public function __construct($viewRenderer, Options $options)
     /**
      * {@inheritdoc}
      */
-    public function attach(EventManagerInterface $events)
+    public function attach(EventManagerInterface $events, $priority = 1)
     {
-        $this->listeners[] = $events->attach(
-            ProfilerEvent::EVENT_COLLECTED,
-            array($this, 'onCollected'),
-            Profiler::PRIORITY_TOOLBAR
-        );
+        $this->listeners[] = $events->getSharedManager()->attach('profiler', ProfilerEvent::EVENT_COLLECTED, array($this, 'onCollected'), Profiler::PRIORITY_TOOLBAR);
     }
-
+    
     /**
      * {@inheritdoc}
      */

src/ZendDeveloperTools/Module.php

@@ -91,21 +91,25 @@ public function onBootstrap(EventInterface $event)
         $report = $sm->get('ZendDeveloperTools\Report');
 
         if ($options->canFlushEarly()) {
-            $em->attachAggregate($sm->get('ZendDeveloperTools\FlushListener'));
+            $flushListener = $sm->get('ZendDeveloperTools\FlushListener');
+            $flushListener->attach($em);
         }
 
         if ($options->isStrict() && $report->hasErrors()) {
             throw new Exception\InvalidOptionException(implode(' ', $report->getErrors()));
         }
 
         if ($options->eventCollectionEnabled()) {
-            $sem->attachAggregate($sm->get('ZendDeveloperTools\EventLoggingListenerAggregate'));
+            $eventLoggingListener = $sm->get('ZendDeveloperTools\EventLoggingListenerAggregate');
+            $eventLoggingListener->attachShared($sem);
         }
 
-        $em->attachAggregate($sm->get('ZendDeveloperTools\ProfilerListener'));
+        $profilerListener = $sm->get('ZendDeveloperTools\ProfilerListener');
+        $profilerListener->attach($em);
 
         if ($options->isToolbarEnabled()) {
-            $sem->attach('profiler', $sm->get('ZendDeveloperTools\ToolbarListener'), null);
+            $toolbarListener = $sm->get('ZendDeveloperTools\ToolbarListener');
+            $toolbarListener->attach($em);
         }
 
         if ($options->isStrict() && $report->hasErrors()) {

src/ZendDeveloperTools/Profiler.php

@@ -212,7 +212,9 @@ public function collect(MvcEvent $mvcEvent)
                 $this->report->addCollector($collector);
             }
 
-            $this->eventManager->trigger(ProfilerEvent::EVENT_COLLECTED, $this->getEvent());
+            $event = $this->getEvent();
+            $event->setName(ProfilerEvent::EVENT_COLLECTED);
+            $this->eventManager->triggerEvent($event);
 
             return $this;
         }