pull FlashMessenger container from flashMessenger plugin

samsonasik · Nov 21, 2016 · 43b34ed · 43b34ed
1 parent 28aeaa0
commit 43b34ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Module.php b/src/Module.php
@@ -63,8 +63,8 @@ public function flashMessengerHandler(EventInterface $e)
             return;
         }
 
-        $flash = $controller->plugin('flashMessenger');
-        $container = new Container('FlashMessenger');
+        $flash         = $controller->plugin('flashMessenger');
+        $container     = $flash->getContainer();
         $reCreateFlash = $container->getArrayCopy();
 
         foreach ($reCreateFlash as $key => $row) {

diff --git a/test/ModuleTest.php b/test/ModuleTest.php
@@ -78,7 +78,7 @@ public function testOnBootstrap($hasMessages)
             $sharedEvmAttach->will(function() use ($module, $e, $hasMessages, $abstractActionController, $flashMessenger, $pluginManager) {
                 $abstractActionController->getPluginManager()->willReturn($pluginManager)->shouldBeCalled();
                 $pluginManager->has('flashMessenger')->willReturn(true)->shouldBeCalled();
-                
+
                 if ($hasMessages) {
                     $namespace = 'flash';
                     $message   = 'a message';
@@ -89,6 +89,8 @@ public function testOnBootstrap($hasMessages)
                     $container = new Container('FlashMessenger');
                     $container->offsetSet($namespace, $splQueue);
 
+                    $flashMessenger->getContainer()->willReturn($container)
+                                                   ->shouldBeCalled();
                     $flashMessenger->setNamespace($namespace)
                                    ->willReturn($flashMessenger)
                                    ->shouldBeCalled();
@@ -121,7 +123,7 @@ public function testOnBootstrap($hasMessages)
 
         $this->module->onBootstrap($e->reveal());
     }
-    
+
     public function testOnBootstrapWithDoesntHasFlashMessenger()
     {
         $e = $this->prophesize('Zend\Mvc\MvcEvent');
@@ -161,7 +163,7 @@ public function testOnBootstrapWithDoesntHasFlashMessenger()
 
         $e->getApplication()
           ->willReturn($application)
-          ->shouldBeCalled(); 
+          ->shouldBeCalled();
 
         $this->module->onBootstrap($e->reveal());
     }