Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge pull request #190 from seyfer/master
Browse files Browse the repository at this point in the history
Fix issue #159
  • Loading branch information
Ocramius committed May 6, 2015
2 parents 7844297 + dc12fe1 commit d343268
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/ZendDeveloperTools/Profiler.php
Expand Up @@ -10,11 +10,11 @@

namespace ZendDeveloperTools;

use Zend\Mvc\MvcEvent;
use Zend\Stdlib\PriorityQueue;
use Zend\EventManager\EventInterface;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\EventManagerAwareInterface;
use Zend\EventManager\EventManagerInterface;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\PriorityQueue;

class Profiler implements EventManagerAwareInterface
{
Expand Down Expand Up @@ -209,7 +209,7 @@ public function collect(MvcEvent $mvcEvent)
if (isset($this->collectors)) {
foreach ($this->collectors as $collector) {
$collector->collect($mvcEvent);
$this->report->addCollector(unserialize(serialize($collector)));
$this->report->addCollector($collector);
}

$this->eventManager->trigger(ProfilerEvent::EVENT_COLLECTED, $this->getEvent());
Expand Down

2 comments on commit d343268

@dillchuk
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks the latest RbacCollector. Just FYI, I don't know the big picture here, probably the fix belongs in RbacCollector's getCollection().

@belgattitude
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, RbacCollector should be fixed instead of reverting this change.

made a PR: ZF-Commons/zfc-rbac#296

Please sign in to comment.