Merge pull request #53 from samsonasik/feature/sm3

Support zend-servicemanager v3 and fixes check sessions exists bug on reload session
samsonasik · May 4, 2016 · cb59b76 · cb59b76
2 parents 167a708 + b6d5d54
commit cb59b76
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -19,6 +19,7 @@
         "zendframework/zend-debug": "~2.3"
     },
     "require-dev": {
+        "container-interop/container-interop": "^1.1",
         "satooshi/php-coveralls": "^1.0",
         "phpunit/phpcov": "~2.0",
         "zendframework/zend-test": "~2.3",

diff --git a/src/Controller/SessionToolbarController.php b/src/Controller/SessionToolbarController.php
@@ -79,7 +79,7 @@ public function removesessionAction()
      */
     public function reloadsessionAction()
     {
-        $sessionData = $this->sessionManager->getSessionData();
+        $sessionData = $this->sessionManager->getSessionData(false);
 
         $renderedContent = $this->viewRenderer
                                 ->render('zend-developer-tools/toolbar/session-data-list', array('sessionData' => $sessionData));

diff --git a/src/Factory/Collector/SessionCollectorFactory.php b/src/Factory/Collector/SessionCollectorFactory.php
@@ -18,6 +18,7 @@
  */
 namespace SanSessionToolbar\Factory\Collector;
 
+use Interop\Container\ContainerInterface;
 use SanSessionToolbar\Collector\SessionCollector;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -36,4 +37,12 @@ public function createService(ServiceLocatorInterface $serviceLocator)
     {
         return new SessionCollector((object) $serviceLocator->get('SanSessionManager'));
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(ContainerInterface $serviceLocator, $requestedName, array $options = null)
+    {
+        return $this->createService($serviceLocator);
+    }
 }
diff --git a/src/Factory/Controller/SessionToolbarControllerFactory.php b/src/Factory/Controller/SessionToolbarControllerFactory.php
@@ -18,6 +18,7 @@
  */
 namespace SanSessionToolbar\Factory\Controller;
 
+use Interop\Container\ContainerInterface;
 use SanSessionToolbar\Controller\SessionToolbarController;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorAwareInterface;
@@ -58,4 +59,12 @@ private function getParentServiceLocator(ServiceLocatorInterface $serviceLocator
 
         return $serviceLocator;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(ContainerInterface $serviceLocator, $requestedName, array $options = null)
+    {
+        return $this->createService($serviceLocator);
+    }
 }
diff --git a/src/Manager/SessionManager.php b/src/Manager/SessionManager.php
@@ -31,11 +31,13 @@ final class SessionManager implements SessionManagerInterface
     /**
      * {@inheritdoc}
      */
-    public function getSessionData()
+    public function getSessionData($checkExists = true)
     {
-        $manager = Container::getDefaultManager();
-        if (!$manager->sessionExists()) {
-            return;
+        if ($checkExists) {
+            $manager = Container::getDefaultManager();
+            if (!$manager->sessionExists()) {
+                return;
+            }
         }
 
         $container = new Container();

diff --git a/src/Manager/SessionManagerInterface.php b/src/Manager/SessionManagerInterface.php
@@ -28,9 +28,11 @@ interface SessionManagerInterface
     /**
      * Get Session Data.
      *
+     * @param bool $checkExists
+     *
      * @return array|null
      */
-    public function getSessionData();
+    public function getSessionData($checkExists = true);
 
     /**
      * Set/Unset Session by Container and its key.

diff --git a/test/Factory/Collector/SessionCollectorFactoryTest.php b/test/Factory/Collector/SessionCollectorFactoryTest.php
@@ -19,6 +19,7 @@
 
 namespace SanSessionToolbarTest\Factory\Collector;
 
+use Interop\Container\ContainerInterface;
 use PHPUnit_Framework_TestCase;
 use SanSessionToolbar\Factory\Collector\SessionCollectorFactory;
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -60,4 +61,21 @@ public function testCreateService()
         $result = $this->factory->createService($this->serviceLocator);
         $this->assertInstanceOf('SanSessionToolbar\Collector\SessionCollector', $result);
     }
+
+    /**
+     * @covers SanSessionToolbar\Factory\Collector\SessionCollectorFactory::__invoke
+     */
+    public function testInvoke()
+    {
+        if ($this->serviceLocator instanceof ContainerInterface) {
+            $sessionManager = $this->getMock('SanSessionToolbar\Manager\SessionManagerInterface');
+            $this->serviceLocator->expects($this->once())
+                                 ->method('get')
+                                 ->with('SanSessionManager')
+                                 ->willReturn($sessionManager);
+
+            $result = $this->factory->__invoke($this->serviceLocator, '');
+            $this->assertInstanceOf('SanSessionToolbar\Collector\SessionCollector', $result);
+        }
+    }
 }
diff --git a/test/Factory/Controller/SessionToolbarControllerFactoryTest.php b/test/Factory/Controller/SessionToolbarControllerFactoryTest.php
@@ -19,6 +19,7 @@
 
 namespace SanSessionToolbarTest\Factory\Controller;
 
+use Interop\Container\ContainerInterface;
 use PHPUnit_Framework_TestCase;
 use SanSessionToolbar\Factory\Controller\SessionToolbarControllerFactory;
 use Zend\Mvc\Controller\ControllerManager;
@@ -95,4 +96,28 @@ private function doTestCreateService(ServiceLocatorInterface $serviceLocator)
         $result = $this->factory->createService($serviceLocator);
         $this->assertInstanceOf('SanSessionToolbar\Controller\SessionToolbarController', $result);
     }
+
+    /**
+     * @covers SanSessionToolbar\Factory\Controller\SessionToolbarControllerFactory::getParentServiceLocator
+     * @covers SanSessionToolbar\Factory\Controller\SessionToolbarControllerFactory::__invoke
+     */
+    public function testInvoke()
+    {
+        if ($this->serviceLocator instanceof ContainerInterface) {
+            $mockViewRenderer = $this->getMock('Zend\View\Renderer\RendererInterface');
+            $this->serviceLocator->expects($this->at(0))
+                ->method('get')
+                ->with('ViewRenderer')
+                ->willReturn($mockViewRenderer);
+
+            $sessionManager = $this->getMock('SanSessionToolbar\Manager\SessionManagerInterface');
+            $this->serviceLocator->expects($this->at(1))
+                ->method('get')
+                ->with('SanSessionManager')
+                ->willReturn($sessionManager);
+
+            $result = $this->factory->__invoke($this->serviceLocator, '');
+            $this->assertInstanceOf('SanSessionToolbar\Controller\SessionToolbarController', $result);
+        }
+    }
 }