Skip to content
Browse files

Merge branch 'hotfix/aliases-borked' into develop

  • Loading branch information...
2 parents 945af6c + 2098c4e commit 8e2ddedda1d156687ed421974971615ec822a656 @trq trq committed Feb 1, 2013
Showing with 6 additions and 6 deletions.
  1. +2 −2 lib/Proem/Proem.php
  2. +4 −4 tests/ProemTest.php
View
4 lib/Proem/Proem.php
@@ -67,9 +67,9 @@ public function __construct(AssetManagerInterface $assetManager = null)
$this->assetManager->alias([
'Proem\Signal\EventManagerInterface' => 'Proem\Signal\EventManager',
- 'Proem\Signal\EventManager' => 'eventManager',
+ 'eventManager' => 'Proem\Signal\EventManagerInterface',
'Proem\Filter\ChainManagerInterface' => 'Proem\Filter\ChainManager',
- 'Proem\Filter\ChainManager' => 'chainManager'
+ 'chainManager' => 'Proem\Filter\ChainManagerInterface'
]);
}
View
8 tests/ProemTest.php
@@ -39,9 +39,9 @@ public function testCanInstantiateProem()
->once()
->with([
'Proem\Signal\EventManagerInterface' => 'Proem\Signal\EventManager',
- 'Proem\Signal\EventManager' => 'eventManager',
+ 'eventManager' => 'Proem\Signal\EventManagerInterface',
'Proem\Filter\ChainManagerInterface' => 'Proem\Filter\ChainManager',
- 'Proem\Filter\ChainManager' => 'chainManager'
+ 'chainManager' => 'Proem\Filter\ChainManagerInterface'
]);
$this->assertInstanceOf('Proem\Proem', new Proem($assetManager));
@@ -74,9 +74,9 @@ public function testLoadsDefaultEventManager()
->once()
->with([
'Proem\Signal\EventManagerInterface' => 'Proem\Signal\EventManager',
- 'Proem\Signal\EventManager' => 'eventManager',
+ 'eventManager' => 'Proem\Signal\EventManagerInterface',
'Proem\Filter\ChainManagerInterface' => 'Proem\Filter\ChainManager',
- 'Proem\Filter\ChainManager' => 'chainManager'
+ 'chainManager' => 'Proem\Filter\ChainManagerInterface'
])
->shouldReceive('resolve')

0 comments on commit 8e2dded

Please sign in to comment.
Something went wrong with that request. Please try again.