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

Commit 35742a0

Browse files
weierophinneyweierophinney
committed
Merge branch 'feature/63' into develop
Close #63
2 parents db74f6c + 0171c0a commit 35742a0

8 files changed

+69
-97
lines changed

‎benchmarks/MultipleEventIndividualSharedListenerBench.php

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,41 @@
22

33
namespace ZendBench\EventManager;
44

5-
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
65
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
76
use PhpBench\Benchmark\Metadata\Annotations\Revs;
7+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
88
use Zend\EventManager\SharedEventManager;
99
use Zend\EventManager\EventManager;
1010

1111
/**
12-
* @BeforeMethods({"setUp"})
12+
* @Revs(1000)
13+
* @Iterations(10)
14+
* @Warmup(2)
1315
*/
1416
class MultipleEventIndividualSharedListenerBench
1517
{
1618
use BenchTrait;
1719

18-
private $sharedEvents;
19-
20+
/** @var EventManager */
2021
private $events;
2122

23+
/** @var array */
2224
private $eventsToTrigger;
2325

24-
public function setUp()
26+
public function __construct()
2527
{
2628
$identifiers = $this->getIdentifierList();
27-
$this->sharedEvents = new SharedEventManager();
29+
$sharedEvents = new SharedEventManager();
2830
foreach ($this->getEventList() as $event) {
29-
$this->sharedEvents->attach($identifiers[0], $event, $this->generateCallback());
31+
$sharedEvents->attach($identifiers[0], $event, $this->generateCallback());
3032
}
31-
$this->events = new EventManager($this->sharedEvents, [$identifiers[0]]);
33+
$this->events = new EventManager($sharedEvents, [$identifiers[0]]);
3234

3335
$this->eventsToTrigger = array_filter($this->getEventList(), function ($value) {
3436
return ($value !== '*');
3537
});
3638
}
3739

38-
/**
39-
* Trigger the event list
40-
*
41-
* @Revs(1000)
42-
* @Iterations(20)
43-
*/
4440
public function benchTrigger()
4541
{
4642
foreach ($this->eventsToTrigger as $event) {

‎benchmarks/MultipleEventLocalListenerBench.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,27 @@
22

33
namespace ZendBench\EventManager;
44

5-
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
65
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
76
use PhpBench\Benchmark\Metadata\Annotations\Revs;
7+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
88
use Zend\EventManager\EventManager;
99

1010
/**
11-
* @BeforeMethods({"setUp"})
11+
* @Revs(1000)
12+
* @Iterations(10)
13+
* @Warmup(2)
1214
*/
1315
class MultipleEventLocalListenerBench
1416
{
1517
use BenchTrait;
1618

19+
/** @var EventManager */
20+
private $events;
21+
22+
/** @var array */
1723
private $eventsToTrigger;
1824

19-
public function setUp()
25+
public function __construct()
2026
{
2127
$this->events = new EventManager();
2228

@@ -25,12 +31,6 @@ public function setUp()
2531
});
2632
}
2733

28-
/**
29-
* Attach and trigger the event list
30-
*
31-
* @Revs(1000)
32-
* @Iterations(20)
33-
*/
3434
public function benchTrigger()
3535
{
3636
foreach ($this->eventsToTrigger as $event) {

‎benchmarks/MultipleEventMultipleLocalAndSharedListenerBench.php

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,43 @@
22

33
namespace ZendBench\EventManager;
44

5-
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
65
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
76
use PhpBench\Benchmark\Metadata\Annotations\Revs;
7+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
88
use Zend\EventManager\SharedEventManager;
99
use Zend\EventManager\EventManager;
1010

1111
/**
12-
* @BeforeMethods({"setUp"})
12+
* @Revs(1000)
13+
* @Iterations(10)
14+
* @Warmup(2)
1315
*/
1416
class MultipleEventMultipleLocalAndSharedListenerBench
1517
{
1618
use BenchTrait;
1719

18-
private $sharedEvents;
19-
20+
/** @var EventManager */
2021
private $events;
2122

23+
/** @var array */
2224
private $eventsToTrigger;
2325

24-
public function setUp()
26+
public function __construct()
2527
{
2628
$identifiers = $this->getIdentifierList();
27-
$this->sharedEvents = new SharedEventManager();
29+
$sharedEvents = new SharedEventManager();
2830
foreach ($this->getIdentifierList() as $identifier) {
2931
foreach ($this->getEventList() as $event) {
30-
$this->sharedEvents->attach($identifier, $event, $this->generateCallback());
32+
$sharedEvents->attach($identifier, $event, $this->generateCallback());
3133
}
3234
}
33-
$this->events = new EventManager($this->sharedEvents, $identifiers);
35+
$this->events = new EventManager($sharedEvents, $identifiers);
3436

3537
$this->eventsToTrigger = array_filter($this->getEventList(), function ($value) {
3638
return ($value !== '*');
3739
});
3840
}
3941

40-
/**
41-
* Attach and trigger the event list
42-
*
43-
* @Revs(1000)
44-
* @Iterations(20)
45-
*/
4642
public function benchTrigger()
4743
{
4844
foreach ($this->eventsToTrigger as $event) {

‎benchmarks/MultipleEventMultipleSharedListenerBench.php

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,43 @@
22

33
namespace ZendBench\EventManager;
44

5-
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
65
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
76
use PhpBench\Benchmark\Metadata\Annotations\Revs;
7+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
88
use Zend\EventManager\SharedEventManager;
99
use Zend\EventManager\EventManager;
1010

1111
/**
12-
* @BeforeMethods({"setUp"})
12+
* @Revs(1000)
13+
* @Iterations(10)
14+
* @Warmup(2)
1315
*/
1416
class MultipleEventMultipleSharedListenerBench
1517
{
1618
use BenchTrait;
1719

18-
private $sharedEvents;
19-
20+
/** @var EventManager */
2021
private $events;
2122

23+
/** @var array */
2224
private $eventsToTrigger;
2325

24-
public function setUp()
26+
public function __construct()
2527
{
2628
$identifiers = $this->getIdentifierList();
27-
$this->sharedEvents = new SharedEventManager();
29+
$sharedEvents = new SharedEventManager();
2830
foreach ($this->getIdentifierList() as $identifier) {
2931
foreach ($this->getEventList() as $event) {
30-
$this->sharedEvents->attach($identifier, $event, $this->generateCallback());
32+
$sharedEvents->attach($identifier, $event, $this->generateCallback());
3133
}
3234
}
33-
$this->events = new EventManager($this->sharedEvents, $identifiers);
35+
$this->events = new EventManager($sharedEvents, $identifiers);
3436

3537
$this->eventsToTrigger = array_filter($this->getEventList(), function ($value) {
3638
return ($value !== '*');
3739
});
3840
}
3941

40-
/**
41-
* Trigger the event list
42-
*
43-
* @Revs(1000)
44-
* @Iterations(20)
45-
*/
4642
public function benchTrigger()
4743
{
4844
foreach ($this->eventsToTrigger as $event) {

‎benchmarks/SingleEventMultipleListenerBench.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,31 @@
22

33
namespace ZendBench\EventManager;
44

5-
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
65
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
76
use PhpBench\Benchmark\Metadata\Annotations\Revs;
7+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
88
use Zend\EventManager\EventManager;
99

1010
/**
11-
* @BeforeMethods({"setUp"})
11+
* @Revs(1000)
12+
* @Iterations(10)
13+
* @Warmup(2)
1214
*/
1315
class SingleEventMultipleListenerBench
1416
{
1517
use BenchTrait;
1618

19+
/** @var EventManager */
1720
private $events;
1821

19-
public function setUp()
22+
public function __construct()
2023
{
2124
$this->events = new EventManager();
2225
for ($i = 0; $i < $this->numListeners; $i++) {
2326
$this->events->attach('dispatch', $this->generateCallback());
2427
}
2528
}
2629

27-
/**
28-
* Trigger the dispatch event
29-
*
30-
* @Revs(1000)
31-
* @Iterations(20)
32-
*/
3330
public function benchTrigger()
3431
{
3532
$this->events->trigger('dispatch');

‎benchmarks/SingleEventMultipleSharedListenerBench.php

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,34 @@
22

33
namespace ZendBench\EventManager;
44

5-
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
65
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
76
use PhpBench\Benchmark\Metadata\Annotations\Revs;
7+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
88
use Zend\EventManager\SharedEventManager;
99
use Zend\EventManager\EventManager;
1010

1111
/**
12-
* @BeforeMethods({"setUp"})
12+
* @Revs(1000)
13+
* @Iterations(10)
14+
* @Warmup(2)
1315
*/
1416
class SingleEventMultipleSharedListenerBench
1517
{
1618
use BenchTrait;
1719

18-
private $sharedEvents;
19-
20+
/** @var EventManager */
2021
private $events;
2122

22-
public function setUp()
23+
public function __construct()
2324
{
2425
$identifiers = $this->getIdentifierList();
25-
$this->sharedEvents = new SharedEventManager();
26+
$sharedEvents = new SharedEventManager();
2627
for ($i = 0; $i < $this->numListeners; $i += 1) {
27-
$this->sharedEvents->attach($identifiers[0], 'dispatch', $this->generateCallback());
28+
$sharedEvents->attach($identifiers[0], 'dispatch', $this->generateCallback());
2829
}
29-
$this->events = new EventManager($this->sharedEvents, [$identifiers[0]]);
30+
$this->events = new EventManager($sharedEvents, [$identifiers[0]]);
3031
}
3132

32-
/**
33-
* Trigger the dispatch event
34-
*
35-
* @Revs(1000)
36-
* @Iterations(20)
37-
*/
3833
public function benchTrigger()
3934
{
4035
$this->events->trigger('dispatch');

‎benchmarks/SingleEventSingleListenerBench.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,29 @@
22

33
namespace ZendBench\EventManager;
44

5-
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
65
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
76
use PhpBench\Benchmark\Metadata\Annotations\Revs;
7+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
88
use Zend\EventManager\EventManager;
99

1010
/**
11-
* @BeforeMethods({"setUp"})
11+
* @Revs(1000)
12+
* @Iterations(10)
13+
* @Warmup(2)
1214
*/
1315
class SingleEventSingleListenerBench
1416
{
1517
use BenchTrait;
1618

19+
/** @var EventManager */
1720
private $events;
1821

19-
public function setUp()
22+
public function __construct()
2023
{
2124
$this->events = new EventManager();
2225
$this->events->attach('dispatch', $this->generateCallback());
2326
}
2427

25-
/**
26-
* Trigger the dispatch event
27-
*
28-
* @Revs(1000)
29-
* @Iterations(20)
30-
*/
3128
public function benchTrigger()
3229
{
3330
$this->events->trigger('dispatch');

‎benchmarks/SingleEventSingleSharedListenerBench.php

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,32 @@
22

33
namespace ZendBench\EventManager;
44

5-
use PhpBench\Benchmark\Metadata\Annotations\BeforeMethods;
65
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
76
use PhpBench\Benchmark\Metadata\Annotations\Revs;
7+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
88
use Zend\EventManager\SharedEventManager;
99
use Zend\EventManager\EventManager;
1010

1111
/**
12-
* @BeforeMethods({"setUp"})
12+
* @Revs(1000)
13+
* @Iterations(10)
14+
* @Warmup(2)
1315
*/
1416
class SingleEventSingleSharedListenerBench
1517
{
1618
use BenchTrait;
1719

18-
private $sharedEvents;
19-
20+
/** @var EventManager */
2021
private $events;
2122

22-
public function setUp()
23+
public function __construct()
2324
{
2425
$identifiers = $this->getIdentifierList();
25-
$this->sharedEvents = new SharedEventManager();
26-
$this->sharedEvents->attach($identifiers[0], 'dispatch', $this->generateCallback());
27-
$this->events = new EventManager($this->sharedEvents, [$identifiers[0]]);
26+
$sharedEvents = new SharedEventManager();
27+
$sharedEvents->attach($identifiers[0], 'dispatch', $this->generateCallback());
28+
$this->events = new EventManager($sharedEvents, [$identifiers[0]]);
2829
}
2930

30-
/**
31-
* Trigger the dispatch event
32-
*
33-
* @Revs(1000)
34-
* @Iterations(20)
35-
*/
3631
public function benchTrigger()
3732
{
3833
$this->events->trigger('dispatch');

0 commit comments

Comments
 (0)