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/3130' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php
  • Loading branch information
@weierophinney
weierophinney committed Dec 5, 2012
114 parents 52ea07d + 918b5da + 035474f + 55ca933 + 58174bc + 1804746 + 67c0075 + e5983dd + a8b3425 + a2a193a + 33d1c27 + 1d5cfa1 + 460ae0b + c577f06 + db33b2e + 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 + 19c90c8 + 5dbf1b9 + 4a927fd + 4a648ec + d0636ac + 840f139 + aafb3ee + 8600965 + b26220b + 860ba0d + 759cd42 + eebf7bc + 6546e0d + 11d36d3 + 4a1db1e + 04eebff + 892dcff + b878b24 + 2db85a1 + 97242e6 + 9ee6b4d + 13fabed + 8fe32d7 + 9af5add + 309bc00 + 984be73 + be29716 + 41232e8 + 1b6d07e + 8cd4674 + 5258ba1 commit ee1d485
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 24 deletions.
36 changes: 26 additions & 10 deletions test/EventManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,18 @@ public function testAttachAggregateReturnsAttachOfListenerAggregate()
public function testCanDetachListenerAggregates()
{
// setup some other event listeners, to ensure appropriate items are detached
$listenerFooBar1 = $this->events->attach('foo.bar', function() { return true; });
$listenerFooBar2 = $this->events->attach('foo.bar', function() { return true; });
$listenerFooBaz1 = $this->events->attach('foo.baz', function() { return true; });
$listenerOther = $this->events->attach('other', function() { return true; });
$listenerFooBar1 = $this->events->attach('foo.bar', function () {
return true;
});
$listenerFooBar2 = $this->events->attach('foo.bar', function () {
return true;
});
$listenerFooBaz1 = $this->events->attach('foo.baz', function () {
return true;
});
$listenerOther = $this->events->attach('other', function () {
return true;
});

$aggregate = new TestAsset\MockAggregate();
$this->events->attachAggregate($aggregate);
Expand All @@ -307,10 +315,18 @@ public function testCanDetachListenerAggregates()
public function testCanDetachListenerAggregatesViaDetach()
{
// setup some other event listeners, to ensure appropriate items are detached
$listenerFooBar1 = $this->events->attach('foo.bar', function() { return true; });
$listenerFooBar2 = $this->events->attach('foo.bar', function() { return true; });
$listenerFooBaz1 = $this->events->attach('foo.baz', function() { return true; });
$listenerOther = $this->events->attach('other', function() { return true; });
$listenerFooBar1 = $this->events->attach('foo.bar', function () {
return true;
});
$listenerFooBar2 = $this->events->attach('foo.bar', function () {
return true;
});
$listenerFooBaz1 = $this->events->attach('foo.baz', function () {
return true;
});
$listenerOther = $this->events->attach('other', function () {
return true;
});

$aggregate = new TestAsset\MockAggregate();
$this->events->attach($aggregate);
Expand Down Expand Up @@ -593,7 +609,7 @@ public function testListenersAttachedWithWildcardAreTriggeredForAllEvents()
{
$test = new stdClass;
$test->events = array();
$callback = function($e) use ($test) {
$callback = function ($e) use ($test) {
$test->events[] = $e->getName();
};

Expand All @@ -618,7 +634,7 @@ public function testSharedEventManagerAttachReturnsCallbackHandler()
$callbackHandler = $shared->attach(
'foo',
'bar',
function($e) {
function ($e) {
return true;
}
);
Expand Down
10 changes: 5 additions & 5 deletions test/FilterChainTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ public function testRetrievingAttachedFiltersShouldReturnEmptyArrayWhenNoFilters

public function testFilterChainShouldReturnLastResponse()
{
$this->filterchain->attach(function($context, $params, $chain) {
$this->filterchain->attach(function ($context, $params, $chain) {
if (isset($params['string'])) {
$params['string'] = trim($params['string']);
}
$return = $chain->next($context, $params, $chain);
return $return;
});
$this->filterchain->attach(function($context, array $params) {
$this->filterchain->attach(function ($context, array $params) {
$string = isset($params['string']) ? $params['string'] : '';
return str_rot13($string);
});
Expand All @@ -107,17 +107,17 @@ public function testInterceptingFilterShouldReceiveChain()

public function testFilteringStopsAsSoonAsAFilterFailsToCallNext()
{
$this->filterchain->attach(function($context, $params, $chain) {
$this->filterchain->attach(function ($context, $params, $chain) {
if (isset($params['string'])) {
$params['string'] = trim($params['string']);
}
return $chain->next($context, $params, $chain);
}, 10000);
$this->filterchain->attach(function($context, array $params) {
$this->filterchain->attach(function ($context, array $params) {
$string = isset($params['string']) ? $params['string'] : '';
return str_rot13($string);
}, 1000);
$this->filterchain->attach(function($context, $params, $chain) {
$this->filterchain->attach(function ($context, $params, $chain) {
$string = isset($params['string']) ? $params['string'] : '';
return hash('md5', $string);
}, 100);
Expand Down
18 changes: 9 additions & 9 deletions test/StaticEventManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public function testListenersAttachedUsingWildcardEventWillBeTriggeredByResource
{
$test = new stdClass;
$test->events = array();
$callback = function($e) use ($test) {
$callback = function ($e) use ($test) {
$test->events[] = $e->getName();
};

Expand Down Expand Up @@ -252,10 +252,10 @@ public function testListenersAttachedToAnyIdentifierProvidedToEventManagerWillBe

$test = new \stdClass;
$test->triggered = 0;
$events->attach('foo', 'bar', function($e) use ($test) {
$events->attach('foo', 'bar', function ($e) use ($test) {
$test->triggered++;
});
$events->attach('bar', 'bar', function($e) use ($test) {
$events->attach('bar', 'bar', function ($e) use ($test) {
$test->triggered++;
});
$manager->trigger('bar', $this, array());
Expand All @@ -271,11 +271,11 @@ public function testListenersAttachedToWildcardsWillBeTriggered()

$test = new \stdClass;
$test->triggered = 0;
$events->attach('*', 'bar', function($e) use ($test) {
$events->attach('*', 'bar', function ($e) use ($test) {
$test->triggered++;
});
//Tests one can have multiple wildcards attached
$events->attach('*', 'bar', function($e) use ($test) {
$events->attach('*', 'bar', function ($e) use ($test) {
$test->triggered++;
});
$manager->trigger('bar', $this, array());
Expand All @@ -291,17 +291,17 @@ public function testListenersAttachedToAnyIdentifierProvidedToEventManagerOrWild

$test = new \stdClass;
$test->triggered = 0;
$events->attach('foo', 'bar', function($e) use ($test) {
$events->attach('foo', 'bar', function ($e) use ($test) {
$test->triggered++;
});
$events->attach('bar', 'bar', function($e) use ($test) {
$events->attach('bar', 'bar', function ($e) use ($test) {
$test->triggered++;
});
$events->attach('*', 'bar', function($e) use ($test) {
$events->attach('*', 'bar', function ($e) use ($test) {
$test->triggered++;
});
//Tests one can have multiple wildcards attached
$events->attach('*', 'bar', function($e) use ($test) {
$events->attach('*', 'bar', function ($e) use ($test) {
$test->triggered++;
});
$manager->trigger('bar', $this, array());
Expand Down

0 comments on commit ee1d485

Please # to comment.