nextcloud / server

lib/public/ISession.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *

Indentation +57 added lines, -57 removed lines

@@ -45,68 +45,68 @@
  */
 interface ISession {
 
-	/**
-	 * Set a value in the session
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @since 6.0.0
-	 */
-	public function set(string $key, $value);
+    /**
+     * Set a value in the session
+     *
+     * @param string $key
+     * @param mixed $value
+     * @since 6.0.0
+     */
+    public function set(string $key, $value);
 
-	/**
-	 * Get a value from the session
-	 *
-	 * @param string $key
-	 * @return mixed should return null if $key does not exist
-	 * @since 6.0.0
-	 */
-	public function get(string $key);
+    /**
+     * Get a value from the session
+     *
+     * @param string $key
+     * @return mixed should return null if $key does not exist
+     * @since 6.0.0
+     */
+    public function get(string $key);
 
-	/**
-	 * Check if a named key exists in the session
-	 *
-	 * @param string $key
-	 * @return bool
-	 * @since 6.0.0
-	 */
-	public function exists(string $key): bool;
+    /**
+     * Check if a named key exists in the session
+     *
+     * @param string $key
+     * @return bool
+     * @since 6.0.0
+     */
+    public function exists(string $key): bool;
 
-	/**
-	 * Remove a $key/$value pair from the session
-	 *
-	 * @param string $key
-	 * @since 6.0.0
-	 */
-	public function remove(string $key);
+    /**
+     * Remove a $key/$value pair from the session
+     *
+     * @param string $key
+     * @since 6.0.0
+     */
+    public function remove(string $key);
 
-	/**
-	 * Reset and recreate the session
-	 * @since 6.0.0
-	 */
-	public function clear();
+    /**
+     * Reset and recreate the session
+     * @since 6.0.0
+     */
+    public function clear();
 
-	/**
-	 * Close the session and release the lock
-	 * @since 7.0.0
-	 */
-	public function close();
+    /**
+     * Close the session and release the lock
+     * @since 7.0.0
+     */
+    public function close();
 
-	/**
-	 * Wrapper around session_regenerate_id
-	 *
-	 * @param bool $deleteOldSession Whether to delete the old associated session file or not.
-	 * @return void
-	 * @since 9.0.0
-	 */
-	public function regenerateId(bool $deleteOldSession = true);
+    /**
+     * Wrapper around session_regenerate_id
+     *
+     * @param bool $deleteOldSession Whether to delete the old associated session file or not.
+     * @return void
+     * @since 9.0.0
+     */
+    public function regenerateId(bool $deleteOldSession = true);
 
-	/**
-	 * Wrapper around session_id
-	 *
-	 * @return string
-	 * @throws SessionNotAvailableException
-	 * @since 9.1.0
-	 */
-	public function getId(): string;
+    /**
+     * Wrapper around session_id
+     *
+     * @return string
+     * @throws SessionNotAvailableException
+     * @since 9.1.0
+     */
+    public function getId(): string;
 }

lib/private/Session/Session.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *

Indentation +43 added lines, -43 removed lines

@@ -29,53 +29,53 @@
 
 abstract class Session implements \ArrayAccess, ISession {
 
-	/**
-	 * @var bool
-	 */
-	protected $sessionClosed = false;
+    /**
+     * @var bool
+     */
+    protected $sessionClosed = false;
 
-	/**
-	 * $name serves as a namespace for the session keys
-	 *
-	 * @param string $name
-	 */
-	abstract public function __construct(string $name);
+    /**
+     * $name serves as a namespace for the session keys
+     *
+     * @param string $name
+     */
+    abstract public function __construct(string $name);
 
-	/**
-	 * @param mixed $offset
-	 * @return bool
-	 */
-	public function offsetExists($offset): bool {
-		return $this->exists($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset): bool {
+        return $this->exists($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @return mixed
-	 */
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @param mixed $value
-	 */
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	/**
-	 * @param mixed $offset
-	 */
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 
-	/**
-	 * Close the session and release the lock
-	 */
-	public function close() {
-		$this->sessionClosed = true;
-	}
+    /**
+     * Close the session and release the lock
+     */
+    public function close() {
+        $this->sessionClosed = true;
+    }
 }

lib/private/Session/Memory.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *

Indentation +72 added lines, -72 removed lines

@@ -39,86 +39,86 @@
  * @package OC\Session
  */
 class Memory extends Session {
-	protected $data;
+    protected $data;
 
-	public function __construct(string $name) {
-		//no need to use $name since all data is already scoped to this instance
-		$this->data = [];
-	}
+    public function __construct(string $name) {
+        //no need to use $name since all data is already scoped to this instance
+        $this->data = [];
+    }
 
-	/**
-	 * @param string $key
-	 * @param integer $value
-	 */
-	public function set(string $key, $value) {
-		$this->validateSession();
-		$this->data[$key] = $value;
-	}
+    /**
+     * @param string $key
+     * @param integer $value
+     */
+    public function set(string $key, $value) {
+        $this->validateSession();
+        $this->data[$key] = $value;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get(string $key) {
-		if (!$this->exists($key)) {
-			return null;
-		}
-		return $this->data[$key];
-	}
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function get(string $key) {
+        if (!$this->exists($key)) {
+            return null;
+        }
+        return $this->data[$key];
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	public function exists(string $key): bool {
-		return isset($this->data[$key]);
-	}
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function exists(string $key): bool {
+        return isset($this->data[$key]);
+    }
 
-	/**
-	 * @param string $key
-	 */
-	public function remove(string $key) {
-		$this->validateSession();
-		unset($this->data[$key]);
-	}
+    /**
+     * @param string $key
+     */
+    public function remove(string $key) {
+        $this->validateSession();
+        unset($this->data[$key]);
+    }
 
-	public function clear() {
-		$this->data = [];
-	}
+    public function clear() {
+        $this->data = [];
+    }
 
-	/**
-	 * Stub since the session ID does not need to get regenerated for the cache
-	 *
-	 * @param bool $deleteOldSession
-	 */
-	public function regenerateId(bool $deleteOldSession = true) {}
+    /**
+     * Stub since the session ID does not need to get regenerated for the cache
+     *
+     * @param bool $deleteOldSession
+     */
+    public function regenerateId(bool $deleteOldSession = true) {}
 
-	/**
-	 * Wrapper around session_id
-	 *
-	 * @return string
-	 * @throws SessionNotAvailableException
-	 * @since 9.1.0
-	 */
-	public function getId(): string {
-		throw new SessionNotAvailableException('Memory session does not have an ID');
-	}
+    /**
+     * Wrapper around session_id
+     *
+     * @return string
+     * @throws SessionNotAvailableException
+     * @since 9.1.0
+     */
+    public function getId(): string {
+        throw new SessionNotAvailableException('Memory session does not have an ID');
+    }
 
-	/**
-	 * Helper function for PHPUnit execution - don't use in non-test code
-	 */
-	public function reopen() {
-		$this->sessionClosed = false;
-	}
+    /**
+     * Helper function for PHPUnit execution - don't use in non-test code
+     */
+    public function reopen() {
+        $this->sessionClosed = false;
+    }
 
-	/**
-	 * In case the session has already been locked an exception will be thrown
-	 *
-	 * @throws Exception
-	 */
-	private function validateSession() {
-		if ($this->sessionClosed) {
-			throw new Exception('Session has been closed - no further changes to the session are allowed');
-		}
-	}
+    /**
+     * In case the session has already been locked an exception will be thrown
+     *
+     * @throws Exception
+     */
+    private function validateSession() {
+        if ($this->sessionClosed) {
+            throw new Exception('Session has been closed - no further changes to the session are allowed');
+        }
+    }
 }

lib/private/Session/Internal.php

Doc Comments +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
 	 * @param array $parameters
 	 * @param bool $silence whether to suppress warnings
 	 * @throws \ErrorException via trapError
-	 * @return mixed
+	 * @return string
 	 */
 	private function invoke(string $functionName, array $parameters = [], bool $silence = false) {
 		try {

Indentation +127 added lines, -127 removed lines

@@ -40,143 +40,143 @@
  * @package OC\Session
  */
 class Internal extends Session {
-	/**
-	 * @param string $name
-	 * @throws \Exception
-	 */
-	public function __construct(string $name) {
-		set_error_handler([$this, 'trapError']);
-		$this->invoke('session_name', [$name]);
-		try {
-			$this->invoke('session_start');
-		} catch (\Exception $e) {
-			setcookie($this->invoke('session_name'), null, -1, \OC::$WEBROOT ?: '/');
-		}
-		restore_error_handler();
-		if (!isset($_SESSION)) {
-			throw new \Exception('Failed to start session');
-		}
-	}
+    /**
+     * @param string $name
+     * @throws \Exception
+     */
+    public function __construct(string $name) {
+        set_error_handler([$this, 'trapError']);
+        $this->invoke('session_name', [$name]);
+        try {
+            $this->invoke('session_start');
+        } catch (\Exception $e) {
+            setcookie($this->invoke('session_name'), null, -1, \OC::$WEBROOT ?: '/');
+        }
+        restore_error_handler();
+        if (!isset($_SESSION)) {
+            throw new \Exception('Failed to start session');
+        }
+    }
 
-	/**
-	 * @param string $key
-	 * @param integer $value
-	 */
-	public function set(string $key, $value) {
-		$this->validateSession();
-		$_SESSION[$key] = $value;
-	}
+    /**
+     * @param string $key
+     * @param integer $value
+     */
+    public function set(string $key, $value) {
+        $this->validateSession();
+        $_SESSION[$key] = $value;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get(string $key) {
-		if (!$this->exists($key)) {
-			return null;
-		}
-		return $_SESSION[$key];
-	}
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function get(string $key) {
+        if (!$this->exists($key)) {
+            return null;
+        }
+        return $_SESSION[$key];
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	public function exists(string $key): bool {
-		return isset($_SESSION[$key]);
-	}
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function exists(string $key): bool {
+        return isset($_SESSION[$key]);
+    }
 
-	/**
-	 * @param string $key
-	 */
-	public function remove(string $key) {
-		if (isset($_SESSION[$key])) {
-			unset($_SESSION[$key]);
-		}
-	}
+    /**
+     * @param string $key
+     */
+    public function remove(string $key) {
+        if (isset($_SESSION[$key])) {
+            unset($_SESSION[$key]);
+        }
+    }
 
-	public function clear() {
-		$this->invoke('session_unset');
-		$this->regenerateId();
-		$this->invoke('session_start', [], true);
-		$_SESSION = [];
-	}
+    public function clear() {
+        $this->invoke('session_unset');
+        $this->regenerateId();
+        $this->invoke('session_start', [], true);
+        $_SESSION = [];
+    }
 
-	public function close() {
-		$this->invoke('session_write_close');
-		parent::close();
-	}
+    public function close() {
+        $this->invoke('session_write_close');
+        parent::close();
+    }
 
-	/**
-	 * Wrapper around session_regenerate_id
-	 *
-	 * @param bool $deleteOldSession Whether to delete the old associated session file or not.
-	 * @return void
-	 */
-	public function regenerateId(bool $deleteOldSession = true) {
-		try {
-			@session_regenerate_id($deleteOldSession);
-		} catch (\Error $e) {
-			$this->trapError($e->getCode(), $e->getMessage());
-		}
-	}
+    /**
+     * Wrapper around session_regenerate_id
+     *
+     * @param bool $deleteOldSession Whether to delete the old associated session file or not.
+     * @return void
+     */
+    public function regenerateId(bool $deleteOldSession = true) {
+        try {
+            @session_regenerate_id($deleteOldSession);
+        } catch (\Error $e) {
+            $this->trapError($e->getCode(), $e->getMessage());
+        }
+    }
 
-	/**
-	 * Wrapper around session_id
-	 *
-	 * @return string
-	 * @throws SessionNotAvailableException
-	 * @since 9.1.0
-	 */
-	public function getId(): string {
-		$id = $this->invoke('session_id', [], true);
-		if ($id === '') {
-			throw new SessionNotAvailableException();
-		}
-		return $id;
-	}
+    /**
+     * Wrapper around session_id
+     *
+     * @return string
+     * @throws SessionNotAvailableException
+     * @since 9.1.0
+     */
+    public function getId(): string {
+        $id = $this->invoke('session_id', [], true);
+        if ($id === '') {
+            throw new SessionNotAvailableException();
+        }
+        return $id;
+    }
 
-	/**
-	 * @throws \Exception
-	 */
-	public function reopen() {
-		throw new \Exception('The session cannot be reopened - reopen() is ony to be used in unit testing.');
-	}
+    /**
+     * @throws \Exception
+     */
+    public function reopen() {
+        throw new \Exception('The session cannot be reopened - reopen() is ony to be used in unit testing.');
+    }
 
-	/**
-	 * @param int $errorNumber
-	 * @param string $errorString
-	 * @throws \ErrorException
-	 */
-	public function trapError(int $errorNumber, string $errorString) {
-		throw new \ErrorException($errorString);
-	}
+    /**
+     * @param int $errorNumber
+     * @param string $errorString
+     * @throws \ErrorException
+     */
+    public function trapError(int $errorNumber, string $errorString) {
+        throw new \ErrorException($errorString);
+    }
 
-	/**
-	 * @throws \Exception
-	 */
-	private function validateSession() {
-		if ($this->sessionClosed) {
-			throw new SessionNotAvailableException('Session has been closed - no further changes to the session are allowed');
-		}
-	}
+    /**
+     * @throws \Exception
+     */
+    private function validateSession() {
+        if ($this->sessionClosed) {
+            throw new SessionNotAvailableException('Session has been closed - no further changes to the session are allowed');
+        }
+    }
 
-	/**
-	 * @param string $functionName the full session_* function name
-	 * @param array $parameters
-	 * @param bool $silence whether to suppress warnings
-	 * @throws \ErrorException via trapError
-	 * @return mixed
-	 */
-	private function invoke(string $functionName, array $parameters = [], bool $silence = false) {
-		try {
-			if($silence) {
-				return @call_user_func_array($functionName, $parameters);
-			} else {
-				return call_user_func_array($functionName, $parameters);
-			}
-		} catch(\Error $e) {
-			$this->trapError($e->getCode(), $e->getMessage());
-		}
-	}
+    /**
+     * @param string $functionName the full session_* function name
+     * @param array $parameters
+     * @param bool $silence whether to suppress warnings
+     * @throws \ErrorException via trapError
+     * @return mixed
+     */
+    private function invoke(string $functionName, array $parameters = [], bool $silence = false) {
+        try {
+            if($silence) {
+                return @call_user_func_array($functionName, $parameters);
+            } else {
+                return call_user_func_array($functionName, $parameters);
+            }
+        } catch(\Error $e) {
+            $this->trapError($e->getCode(), $e->getMessage());
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -170,12 +170,12 @@ 
 	 */
 	private function invoke(string $functionName, array $parameters = [], bool $silence = false) {
 		try {
-			if($silence) {
+			if ($silence) {
 				return @call_user_func_array($functionName, $parameters);
 			} else {
 				return call_user_func_array($functionName, $parameters);
 			}
-		} catch(\Error $e) {
+		} catch (\Error $e) {
 			$this->trapError($e->getCode(), $e->getMessage());
 		}
 	}

lib/private/Session/CryptoSessionData.php

Indentation +172 added lines, -172 removed lines

@@ -37,176 +37,176 @@
  * @package OC\Session
  */
 class CryptoSessionData implements \ArrayAccess, ISession {
-	/** @var ISession */
-	protected $session;
-	/** @var \OCP\Security\ICrypto */
-	protected $crypto;
-	/** @var string */
-	protected $passphrase;
-	/** @var array */
-	protected $sessionValues;
-	/** @var bool */
-	protected $isModified = false;
-	CONST encryptedSessionName = 'encrypted_session_data';
-
-	/**
-	 * @param ISession $session
-	 * @param ICrypto $crypto
-	 * @param string $passphrase
-	 */
-	public function __construct(ISession $session,
-								ICrypto $crypto,
-								string $passphrase) {
-		$this->crypto = $crypto;
-		$this->session = $session;
-		$this->passphrase = $passphrase;
-		$this->initializeSession();
-	}
-
-	/**
-	 * Close session if class gets destructed
-	 */
-	public function __destruct() {
-		try {
-			$this->close();
-		} catch (SessionNotAvailableException $e){
-			// This exception can occur if session is already closed
-			// So it is safe to ignore it and let the garbage collector to proceed
-		}
-	}
-
-	protected function initializeSession() {
-		$encryptedSessionData = $this->session->get(self::encryptedSessionName) ?: '';
-		try {
-			$this->sessionValues = json_decode(
-				$this->crypto->decrypt($encryptedSessionData, $this->passphrase),
-				true
-			);
-		} catch (\Exception $e) {
-			$this->sessionValues = [];
-		}
-	}
-
-	/**
-	 * Set a value in the session
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function set(string $key, $value) {
-		$this->sessionValues[$key] = $value;
-		$this->isModified = true;
-	}
-
-	/**
-	 * Get a value from the session
-	 *
-	 * @param string $key
-	 * @return string|null Either the value or null
-	 */
-	public function get(string $key) {
-		if(isset($this->sessionValues[$key])) {
-			return $this->sessionValues[$key];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Check if a named key exists in the session
-	 *
-	 * @param string $key
-	 * @return bool
-	 */
-	public function exists(string $key): bool {
-		return isset($this->sessionValues[$key]);
-	}
-
-	/**
-	 * Remove a $key/$value pair from the session
-	 *
-	 * @param string $key
-	 */
-	public function remove(string $key) {
-		$this->isModified = true;
-		unset($this->sessionValues[$key]);
-		$this->session->remove(self::encryptedSessionName);
-	}
-
-	/**
-	 * Reset and recreate the session
-	 */
-	public function clear() {
-		$requesttoken = $this->get('requesttoken');
-		$this->sessionValues = [];
-		if ($requesttoken !== null) {
-			$this->set('requesttoken', $requesttoken);
-		}
-		$this->isModified = true;
-		$this->session->clear();
-	}
-
-	/**
-	 * Wrapper around session_regenerate_id
-	 *
-	 * @param bool $deleteOldSession Whether to delete the old associated session file or not.
-	 * @return void
-	 */
-	public function regenerateId(bool $deleteOldSession = true) {
-		$this->session->regenerateId($deleteOldSession);
-	}
-
-	/**
-	 * Wrapper around session_id
-	 *
-	 * @return string
-	 * @throws SessionNotAvailableException
-	 * @since 9.1.0
-	 */
-	public function getId(): string {
-		return $this->session->getId();
-	}
-
-	/**
-	 * Close the session and release the lock, also writes all changed data in batch
-	 */
-	public function close() {
-		if($this->isModified) {
-			$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
-			$this->session->set(self::encryptedSessionName, $encryptedValue);
-			$this->isModified = false;
-		}
-		$this->session->close();
-	}
-
-	/**
-	 * @param mixed $offset
-	 * @return bool
-	 */
-	public function offsetExists($offset): bool {
-		return $this->exists($offset);
-	}
-
-	/**
-	 * @param mixed $offset
-	 * @return mixed
-	 */
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
-
-	/**
-	 * @param mixed $offset
-	 * @param mixed $value
-	 */
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
-
-	/**
-	 * @param mixed $offset
-	 */
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    /** @var ISession */
+    protected $session;
+    /** @var \OCP\Security\ICrypto */
+    protected $crypto;
+    /** @var string */
+    protected $passphrase;
+    /** @var array */
+    protected $sessionValues;
+    /** @var bool */
+    protected $isModified = false;
+    CONST encryptedSessionName = 'encrypted_session_data';
+
+    /**
+     * @param ISession $session
+     * @param ICrypto $crypto
+     * @param string $passphrase
+     */
+    public function __construct(ISession $session,
+                                ICrypto $crypto,
+                                string $passphrase) {
+        $this->crypto = $crypto;
+        $this->session = $session;
+        $this->passphrase = $passphrase;
+        $this->initializeSession();
+    }
+
+    /**
+     * Close session if class gets destructed
+     */
+    public function __destruct() {
+        try {
+            $this->close();
+        } catch (SessionNotAvailableException $e){
+            // This exception can occur if session is already closed
+            // So it is safe to ignore it and let the garbage collector to proceed
+        }
+    }
+
+    protected function initializeSession() {
+        $encryptedSessionData = $this->session->get(self::encryptedSessionName) ?: '';
+        try {
+            $this->sessionValues = json_decode(
+                $this->crypto->decrypt($encryptedSessionData, $this->passphrase),
+                true
+            );
+        } catch (\Exception $e) {
+            $this->sessionValues = [];
+        }
+    }
+
+    /**
+     * Set a value in the session
+     *
+     * @param string $key
+     * @param mixed $value
+     */
+    public function set(string $key, $value) {
+        $this->sessionValues[$key] = $value;
+        $this->isModified = true;
+    }
+
+    /**
+     * Get a value from the session
+     *
+     * @param string $key
+     * @return string|null Either the value or null
+     */
+    public function get(string $key) {
+        if(isset($this->sessionValues[$key])) {
+            return $this->sessionValues[$key];
+        }
+
+        return null;
+    }
+
+    /**
+     * Check if a named key exists in the session
+     *
+     * @param string $key
+     * @return bool
+     */
+    public function exists(string $key): bool {
+        return isset($this->sessionValues[$key]);
+    }
+
+    /**
+     * Remove a $key/$value pair from the session
+     *
+     * @param string $key
+     */
+    public function remove(string $key) {
+        $this->isModified = true;
+        unset($this->sessionValues[$key]);
+        $this->session->remove(self::encryptedSessionName);
+    }
+
+    /**
+     * Reset and recreate the session
+     */
+    public function clear() {
+        $requesttoken = $this->get('requesttoken');
+        $this->sessionValues = [];
+        if ($requesttoken !== null) {
+            $this->set('requesttoken', $requesttoken);
+        }
+        $this->isModified = true;
+        $this->session->clear();
+    }
+
+    /**
+     * Wrapper around session_regenerate_id
+     *
+     * @param bool $deleteOldSession Whether to delete the old associated session file or not.
+     * @return void
+     */
+    public function regenerateId(bool $deleteOldSession = true) {
+        $this->session->regenerateId($deleteOldSession);
+    }
+
+    /**
+     * Wrapper around session_id
+     *
+     * @return string
+     * @throws SessionNotAvailableException
+     * @since 9.1.0
+     */
+    public function getId(): string {
+        return $this->session->getId();
+    }
+
+    /**
+     * Close the session and release the lock, also writes all changed data in batch
+     */
+    public function close() {
+        if($this->isModified) {
+            $encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
+            $this->session->set(self::encryptedSessionName, $encryptedValue);
+            $this->isModified = false;
+        }
+        $this->session->close();
+    }
+
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset): bool {
+        return $this->exists($offset);
+    }
+
+    /**
+     * @param mixed $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
+
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
+
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -69,7 +69,7 @@ 
 	public function __destruct() {
 		try {
 			$this->close();
-		} catch (SessionNotAvailableException $e){
+		} catch (SessionNotAvailableException $e) {
 			// This exception can occur if session is already closed
 			// So it is safe to ignore it and let the garbage collector to proceed
 		}
@@ -105,7 +105,7 @@ 
 	 * @return string|null Either the value or null
 	 */
 	public function get(string $key) {
-		if(isset($this->sessionValues[$key])) {
+		if (isset($this->sessionValues[$key])) {
 			return $this->sessionValues[$key];
 		}
 
@@ -171,7 +171,7 @@ 
 	 * Close the session and release the lock, also writes all changed data in batch
 	 */
 	public function close() {
-		if($this->isModified) {
+		if ($this->isModified) {
 			$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
 			$this->session->set(self::encryptedSessionName, $encryptedValue);
 			$this->isModified = false;