Thanks to visit codestin.com
Credit goes to github.com

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

Use v2-compatible EventManager instantiation when lazy-loading #73

Merged
merged 1 commit into from
Feb 12, 2016
Merged

Use v2-compatible EventManager instantiation when lazy-loading #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Storage/Adapter/AbstractAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
use Zend\EventManager\EventManager;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\EventsCapableInterface;
use Zend\EventManager\SharedEventManager;

abstract class AbstractAdapter implements StorageInterface, EventsCapableInterface
{
Expand Down Expand Up @@ -190,7 +189,8 @@ public function getCaching()
public function getEventManager()
{
if ($this->events === null) {
$this->events = new EventManager(new SharedEventManager(), [__CLASS__, get_class($this)]);
$this->events = new EventManager();
$this->events->setIdentifiers([__CLASS__, get_class($this)]);
}
return $this->events;
}
Expand Down
42 changes: 42 additions & 0 deletions test/Storage/Adapter/EventManagerCompatibilityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Cache
*/

namespace ZendTest\Cache\Storage\Adapter;

use PHPUnit_Framework_TestCase as TestCase;
use Zend\Cache\Storage\Adapter\AbstractAdapter;
use Zend\EventManager\EventManager;
use ZendTest\Cache\Storage\TestAsset\MockAdapter;

class EventManagerCompatibilityTest extends TestCase
{
public function setUp()
{
$this->adapter = new MockAdapter();
}

public function testCanLazyLoadEventManager()
{
$events = $this->adapter->getEventManager();
$this->assertInstanceOf(EventManager::class, $events);
return $events;
}

/**
* @depends testCanLazyLoadEventManager
*/
public function testLazyLoadedEventManagerIsInjectedProperlyWithDefaultIdentifiers(EventManager $events)
Copy link
Member

Choose a reason for hiding this comment

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

To be sure, I'd also add an @coversNothing test that triggers an event (any event) on the event manager and on its attached shared event manager (integration test)

Copy link
Member Author

Choose a reason for hiding this comment

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

Ugh, missed this comment!

That said, the other tests are already testing triggering of events, and that works between both versions. The difference, however, is that those inject an EM instance (or mock) to do so, so they're primarily testing that the correct calls are made. I did, however, have issues crop up in testing yesterday when completing the migration patch due to compatibility issues, which I was able to fix. I'll see if I can come up with an additional test to be on the safe-side, though.

{
$this->assertEquals([
AbstractAdapter::class,
MockAdapter::class,
], $events->getIdentifiers());
}
}