Use session adapter from base package

aimeos · Feb 14, 2022 · b61a4e7 · b61a4e7
1 parent 6c353bd
commit b61a4e7
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 520 deletions.
diff --git a/Setup.php b/Setup.php
@@ -125,7 +125,7 @@ protected function createContext() : \Aimeos\MShop\Context\Item\Iface
 		$password = new \Aimeos\MW\Password\Standard();
 		$ctx->setPassword( $password );
 
-		$session = new \Aimeos\MW\Session\None();
+		$session = new \Aimeos\Base\Session\None();
 		$ctx->setSession( $session );
 
 		$cache = new \Aimeos\MW\Cache\None();

diff --git a/controller/common/tests/TestHelperCntl.php b/controller/common/tests/TestHelperCntl.php
@@ -91,7 +91,7 @@ private static function createContext( $site )
 		$ctx->setFilesystemManager( $fsm );
 
 
-		$session = new \Aimeos\MW\Session\None();
+		$session = new \Aimeos\Base\Session\None();
 		$ctx->setSession( $session );
 
 

diff --git a/lib/mshoplib/src/MShop/Context/Item/Iface.php b/lib/mshoplib/src/MShop/Context/Item/Iface.php
@@ -235,17 +235,17 @@ public function setProcess( \Aimeos\MW\Process\Iface $process ) : \Aimeos\MShop\
 	/**
 	 * Returns the session object.
 	 *
-	 * @return \Aimeos\MW\Session\Iface Session object
+	 * @return \Aimeos\Base\Session\Iface Session object
 	 */
-	public function session() : \Aimeos\MW\Session\Iface;
+	public function session() : \Aimeos\Base\Session\Iface;
 
 	/**
 	 * Sets the session object.
 	 *
-	 * @param \Aimeos\MW\Session\Iface $session Session object
+	 * @param \Aimeos\Base\Session\Iface $session Session object
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item for chaining method calls
 	 */
-	public function setSession( \Aimeos\MW\Session\Iface $session ) : \Aimeos\MShop\Context\Item\Iface;
+	public function setSession( \Aimeos\Base\Session\Iface $session ) : \Aimeos\MShop\Context\Item\Iface;
 
 	/**
 	 * Returns the view object.

diff --git a/lib/mshoplib/src/MShop/Context/Item/Standard.php b/lib/mshoplib/src/MShop/Context/Item/Standard.php
@@ -544,10 +544,10 @@ public function process() : \Aimeos\MW\Process\Iface
 	/**
 	 * Sets the session object.
 	 *
-	 * @param \Aimeos\MW\Session\Iface $session Session object
+	 * @param \Aimeos\Base\Session\Iface $session Session object
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item for chaining method calls
 	 */
-	public function setSession( \Aimeos\MW\Session\Iface $session ) : \Aimeos\MShop\Context\Item\Iface
+	public function setSession( \Aimeos\Base\Session\Iface $session ) : \Aimeos\MShop\Context\Item\Iface
 	{
 		$this->session = $session;
 
@@ -558,9 +558,9 @@ public function setSession( \Aimeos\MW\Session\Iface $session ) : \Aimeos\MShop\
 	/**
 	 * Returns the session object.
 	 *
-	 * @return \Aimeos\MW\Session\Iface Session object
+	 * @return \Aimeos\Base\Session\Iface Session object
 	 */
-	public function session() : \Aimeos\MW\Session\Iface
+	public function session() : \Aimeos\Base\Session\Iface
 	{
 		if( !isset( $this->session ) ) {
 			throw new \Aimeos\MShop\Exception( sprintf( 'Session object not available' ) );

diff --git a/lib/mshoplib/tests/TestHelperMShop.php b/lib/mshoplib/tests/TestHelperMShop.php
@@ -103,7 +103,7 @@ private static function createContext( $site )
 		$ctx->setI18n( array( 'de' => $i18n ) );
 
 
-		$session = new \Aimeos\MW\Session\None();
+		$session = new \Aimeos\Base\Session\None();
 		$ctx->setSession( $session );
 
 

diff --git a/lib/mwlib/src/MW/Session/Base.php b/lib/mwlib/src/MW/Session/Base.php
diff --git a/lib/mwlib/src/MW/Session/Exception.php b/lib/mwlib/src/MW/Session/Exception.php
diff --git a/lib/mwlib/src/MW/Session/Iface.php b/lib/mwlib/src/MW/Session/Iface.php
diff --git a/lib/mwlib/src/MW/Session/None.php b/lib/mwlib/src/MW/Session/None.php
diff --git a/lib/mwlib/src/MW/Session/PHP.php b/lib/mwlib/src/MW/Session/PHP.php