Permalink
Browse files

Merge branch 'hotfix/session_namespace' of https://github.com/Maks3w/zf2

  • Loading branch information...
2 parents e8929c5 + bccaa86 commit 1edb1368814e203d372ebf7c422b4cc95a7878af @weierophinney weierophinney committed Apr 9, 2012
@@ -37,7 +37,7 @@
class Session extends AbstractUser
{
/**
- * Reference to an implementation of Zend_Session_Namespace object
+ * Reference to an implementation of Zend\Session\Container object
*
* @var \Zend\Session\Container $_session
*/
@@ -17,13 +17,13 @@
*/
namespace Zend\ProgressBar;
-use Zend\ProgressBar\Exception;
+
+use Zend\ProgressBar\Exception,
+ Zend\Session;
/**
* Zend_ProgressBar offers an interface for multiple enviroments.
*
- * @uses \Zend\ProgressBar\Exception
- * @uses \Zend\Session\Namespace
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
@@ -102,7 +102,7 @@ public function __construct(Adapter\AbstractAdapter $adapter, $min = 0, $max = 1
// See if we have to open a session namespace
if ($persistenceNamespace !== null) {
- $this->_persistenceNamespace = new \Zend\Session\SessionNamespace($persistenceNamespace);
+ $this->_persistenceNamespace = new Session\Container($persistenceNamespace);
}
// Set adapter
@@ -341,8 +341,8 @@ public function testSessionSaving()
$manager = new TestManager(null, null, $saveHandler);
$manager->start();
- /**
- * @see Zend_Session_Namespace
+ /*
+ * @see Zend\Session\Container
*/
$session = new \Zend\Session\Container('SaveHandler', $manager);

0 comments on commit 1edb136

Please sign in to comment.