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

Commit

Permalink
Merge branch 'hotfix/geteventmanager' of https://github.com/akrabat/zf2…
Browse files Browse the repository at this point in the history 
… into feature/eventmanager-getter
  • Loading branch information
@weierophinney
weierophinney committed Jun 29, 2012
69 parents fea371a + c93bbae + a4ff530 + cbd4621 + 4b4dffb + 00380d2 + 3895f9f + 6349844 + b6905a7 + b7735a0 + 8312aef + 7be4333 + 8625190 + 4dd38f5 + e02bd81 + 87c797f + 73208bf + 0272cd1 + 1fcbea4 + 197a891 + 5859e98 + d34ef1c + e06dc2f + 4907ff6 + fd0e0ba + 891fbf7 + 83d5b01 + 4579f15 + c86ed1e + 16b8f20 + 83086b6 + a81c8a5 + a85d989 + 55ef06c + a2d63b1 + 8210d1d + 0a08fc0 + 7d37340 + ab0ab2a + b9e0b9b + e1d4bda + e251276 + 161ba87 + f10c77c + 58cc6ef + cecfbb0 + c165fb8 + 1febb29 + 3325e48 + 8b68fab + 43c1b37 + ec52465 + 2904103 + e4d7a5a + be7b13f + f8dd43d + b1b3322 + 93ccc75 + 2d494af + 25e9a69 + 3f70aa8 + 598d6ed + 8161582 + c01dc55 + 98634fe + 0c55546 + 1c83b8f + 815d8cc + e4d0160 commit db33b2e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/EventsCapableInterface.php
View file
Expand Up @@ -37,5 +37,5 @@ interface EventsCapableInterface
*
* @return EventManagerInterface
*/
public function events();
public function getEventManager();
}
2 changes: 1 addition & 1 deletion src/ProvidesEvents.php
View file
Expand Up @@ -69,7 +69,7 @@ public function setEventManager(EventManagerInterface $events)
*
* @return EventManagerInterface
*/
public function events()
public function getEventManager()
{
if (!$this->events instanceof EventManagerInterface) {
$this->setEventManager(new EventManager());
Expand Down
24 changes: 12 additions & 12 deletions test/StaticIntegrationTest.php
View file
Expand Up @@ -52,7 +52,7 @@ function ($e) use ($counter) {
}
);
$class = new TestAsset\ClassWithEvents();
$class->events()->setSharedManager($events);
$class->getEventManager()->setSharedManager($events);
$class->foo();
$this->assertEquals(1, $counter->count);
}
Expand All @@ -69,10 +69,10 @@ function ($e) use ($test) {
}
);
$class = new TestAsset\ClassWithEvents();
$class->events()->attach('foo', function ($e) use ($test) {
$class->getEventManager()->attach('foo', function ($e) use ($test) {
$test->results[] = 'local';
});
$class->events()->setSharedManager($events);
$class->getEventManager()->setSharedManager($events);
$class->foo();
$this->assertEquals(array('local', 'static'), $test->results);
}
Expand All @@ -90,16 +90,16 @@ function ($e) use ($test) {
10000 // high priority
);
$class = new TestAsset\ClassWithEvents();
$class->events()->attach('foo', function ($e) use ($test) {
$class->getEventManager()->attach('foo', function ($e) use ($test) {
$test->results[] = 'local';
}, 1); // low priority
$class->events()->attach('foo', function ($e) use ($test) {
$class->getEventManager()->attach('foo', function ($e) use ($test) {
$test->results[] = 'local2';
}, 1000); // medium priority
$class->events()->attach('foo', function ($e) use ($test) {
$class->getEventManager()->attach('foo', function ($e) use ($test) {
$test->results[] = 'local3';
}, 15000); // highest priority
$class->events()->setSharedManager($events);
$class->getEventManager()->setSharedManager($events);
$class->foo();
$this->assertEquals(array('local3', 'static', 'local2', 'local'), $test->results);
}
Expand All @@ -115,7 +115,7 @@ function ($e) use ($counter) {
}
);
$class = new TestAsset\ClassWithEvents();
$class->events()->unsetSharedManager();
$class->getEventManager()->unsetSharedManager();
$class->foo();
$this->assertEquals(0, $counter->count);
}
Expand All @@ -132,8 +132,8 @@ function ($e) use ($counter) {
);
$mockStaticEvents = new TestAsset\StaticEventsMock();
$class = new TestAsset\ClassWithEvents();
$class->events()->setSharedManager($mockStaticEvents);
$this->assertSame($mockStaticEvents, $class->events()->getSharedManager());
$class->getEventManager()->setSharedManager($mockStaticEvents);
$this->assertSame($mockStaticEvents, $class->getEventManager()->getSharedManager());
$class->foo();
$this->assertEquals(0, $counter->count);
}
Expand All @@ -151,10 +151,10 @@ function ($e) use ($test) {
100
);
$class = new TestAsset\ClassWithEvents();
$class->events()->attach('foo', function ($e) use ($test) {
$class->getEventManager()->attach('foo', function ($e) use ($test) {
$test->results[] = 'local';
}, -100);
$class->events()->setSharedManager($events);
$class->getEventManager()->setSharedManager($events);
$class->foo();
$this->assertEquals(array('static', 'local'), $test->results);
}
Expand Down
4 changes: 2 additions & 2 deletions test/TestAsset/ClassWithEvents.php
View file
Expand Up @@ -36,7 +36,7 @@ class ClassWithEvents
{
protected $events;

public function events(EventManagerInterface $events = null)
public function getEventManager(EventManagerInterface $events = null)
{
if (null !== $events) {
$this->events = $events;
Expand All @@ -49,6 +49,6 @@ public function events(EventManagerInterface $events = null)

public function foo()
{
$this->events()->trigger(__FUNCTION__, $this, array());
$this->getEventManager()->trigger(__FUNCTION__, $this, array());
}
}

0 comments on commit db33b2e

Please sign in to comment.