This repository has been archived by the owner on Jan 29, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of git://github.com/zendframework/zf2 into fea…
…ture/cache-session-storage Conflicts: CHANGELOG.md
- Loading branch information
111 parents
984be73
+
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
+
be29716
+
41232e8
+
1b6d07e
+
8cd4674
+
9af5add
+
309bc00
+
035474f
commit e5aa383
Showing
3 changed files
with
74 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
* @package Zend_EventManager | ||
*/ | ||
|
||
namespace Zend\EventManager; | ||
|
||
use \Zend\EventManager\ProvidesEvents; | ||
|
||
/** | ||
* @category Zend | ||
* @package Zend_EventManager | ||
*/ | ||
trait EventManagerAwareTrait | ||
{ | ||
use ProvidesEvents; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
* @package Zend_EventManager | ||
*/ | ||
|
||
namespace ZendTest\EventManager; | ||
|
||
use \PHPUnit_Framework_TestCase as TestCase; | ||
use \Zend\EventManager\EventManager; | ||
|
||
/** | ||
* @requires PHP 5.4 | ||
*/ | ||
class EventManagerAwareTraitTest extends TestCase | ||
{ | ||
public function testSetEventManager() | ||
{ | ||
$object = $this->getObjectForTrait('\Zend\EventManager\EventManagerAwareTrait'); | ||
|
||
$this->assertAttributeEquals(null, 'events', $object); | ||
|
||
$eventManager = new EventManager; | ||
|
||
$object->setEventManager($eventManager); | ||
|
||
$this->assertAttributeEquals($eventManager, 'events', $object); | ||
} | ||
|
||
public function testGetEventManager() | ||
{ | ||
$object = $this->getObjectForTrait('\Zend\EventManager\EventManagerAwareTrait'); | ||
|
||
$this->assertInstanceOf('\Zend\EventManager\EventManagerInterface', $object->getEventManager()); | ||
|
||
$eventManager = new EventManager; | ||
|
||
$object->setEventManager($eventManager); | ||
|
||
$this->assertSame($eventManager, $object->getEventManager()); | ||
} | ||
} |