chillerlan / php-session

src/SessionHandlerAbstract.php

Spacing +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @param \chillerlan\Session\SessionHandlerOptions $options
 	 */
-	public function __construct(SessionHandlerOptions $options = null){
+	public function __construct(SessionHandlerOptions $options = null) {
 		$this->set_options($options);
 
 		session_set_save_handler($this, true);
@@ -47,7 +47,7 @@ 
 	/**
 	 * @return void
 	 */
-	public function start(){
+	public function start() {
 		$cookie_params = session_get_cookie_params();
 
 		session_start();
@@ -56,7 +56,7 @@ 
 		setcookie(
 			session_name(),
 			session_id(),
-			time()+$this->options->cookie_lifetime,
+			time() + $this->options->cookie_lifetime,
 			$this->options->cookie_path,
 			$cookie_params['domain']
 		);
@@ -65,7 +65,7 @@ 
 	/**
 	 * @return void
 	 */
-	public function end(){
+	public function end() {
 		session_regenerate_id(true);
 		setcookie(session_name(), '', 0, $this->options->cookie_path);
 		session_unset();
@@ -82,7 +82,7 @@ 
 	public function encrypt(string $data):string {
 		$nonce = random_bytes(24);
 
-		if($this->options->use_encryption && function_exists('sodium_crypto_secretbox')){
+		if ($this->options->use_encryption && function_exists('sodium_crypto_secretbox')) {
 			return sodium_bin2hex($nonce.sodium_crypto_secretbox($data, $nonce, sodium_hex2bin($this->key)));
 		}
 
@@ -97,7 +97,7 @@ 
 	 */
 	public function decrypt(string $box):string {
 
-		if($this->options->use_encryption && function_exists('sodium_crypto_secretbox_open')){
+		if ($this->options->use_encryption && function_exists('sodium_crypto_secretbox_open')) {
 			$box = sodium_hex2bin($box);
 
 			return sodium_crypto_secretbox_open(substr($box, 24), substr($box, 0, 24), sodium_hex2bin($this->key));
@@ -111,10 +111,10 @@ 
 	 *
 	 * @return void
 	 */
-	protected function set_options(SessionHandlerOptions $options = null){
+	protected function set_options(SessionHandlerOptions $options = null) {
 		$this->options = $options ?? new SessionHandlerOptions;
 
-		if(!is_null($this->options->save_path)){
+		if (!is_null($this->options->save_path)) {
 			$this->options->save_path .=
 				!in_array(substr($this->options->save_path, -1), ['/', '\\'])
 					? DIRECTORY_SEPARATOR
@@ -137,14 +137,14 @@ 
 		ini_set('session.cookie_lifetime', 0);
 #		ini_set('session.referer_check', '');
 
-		if(PHP_VERSION_ID < 70100){
+		if (PHP_VERSION_ID < 70100) {
 			ini_set('session.hash_bits_per_character', 6);
 
-			if(in_array($this->options->hash_algo, hash_algos())){
+			if (in_array($this->options->hash_algo, hash_algos())) {
 				ini_set('session.hash_function', $this->options->hash_algo);
 			}
 		}
-		else{
+		else {
 			ini_set('session.sid_bits_per_character', 6);
 			ini_set('session.sid_length', 128);
 		}

Braces +1 added lines, -2 removed lines

@@ -143,8 +143,7 @@
 			if(in_array($this->options->hash_algo, hash_algos())){
 				ini_set('session.hash_function', $this->options->hash_algo);
 			}
-		}
-		else{
+		} else{
 			ini_set('session.sid_bits_per_character', 6);
 			ini_set('session.sid_length', 128);
 		}

src/SessionHandlerException.php

Spacing +1 added lines, -1 removed lines

@@ -12,4 +12,4 @@
 
 namespace chillerlan\Session;
 
-class SessionHandlerException extends \Exception{}
+class SessionHandlerException extends \Exception {}

src/FileSessionHandler.php

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * Class FileSessionHandler
  */
-class FileSessionHandler extends SessionHandlerAbstract{
+class FileSessionHandler extends SessionHandlerAbstract {
 
 	/**
 	 * @var \chillerlan\Filereader\Drivers\FSDriverInterface
@@ -29,7 +29,7 @@ 
 	 * @param \chillerlan\Filereader\Drivers\FSDriverInterface $FSdriver
 	 * @param \chillerlan\Session\SessionHandlerOptions        $options
 	 */
-	public function __construct(FSDriverInterface $FSdriver, SessionHandlerOptions $options = null){
+	public function __construct(FSDriverInterface $FSdriver, SessionHandlerOptions $options = null) {
 		parent::__construct($options);
 
 		// use the internal DiskDriver if no other filereader was given
@@ -66,7 +66,7 @@ 
 	public function destroy($session_id):bool{
 		$file = $this->options->save_path.$this->options->filename_prefix.$session_id;
 
-		if($this->filereader->fileExists($file)) {
+		if ($this->filereader->fileExists($file)) {
 			$this->filereader->deleteFile($file);
 		}
 
@@ -92,11 +92,11 @@ 
 	public function gc($maxlifetime):bool{
 		$files = $this->filereader->findFiles($this->options->save_path.$this->options->filename_prefix.'*');
 
-		if(is_array($files)){
+		if (is_array($files)) {
 
-			foreach($files as $file){
+			foreach ($files as $file) {
 
-				if($this->filereader->fileModifyTime($file) + $maxlifetime < time() && $this->filereader->fileExists($file)){
+				if ($this->filereader->fileModifyTime($file) + $maxlifetime < time() && $this->filereader->fileExists($file)) {
 					$this->filereader->deleteFile($file);
 				}
 
@@ -123,7 +123,7 @@ 
 	 */
 	public function open($save_path, $name):bool{
 
-		if(!$this->filereader->isWritable($save_path)){
+		if (!$this->filereader->isWritable($save_path)) {
 			return false;
 		}
 

src/SessionInterface.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 namespace chillerlan\Session;
 
-interface SessionInterface{
+interface SessionInterface {
 
 	/**
 	 * @return void

src/SessionHandlerOptions.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
  * @property string $use_encryption
  * @property string $cryptoKey
  */
-class SessionHandlerOptions implements ContainerInterface{
+class SessionHandlerOptions implements ContainerInterface {
 	use Container;
 
 	protected $filename_prefix = 'SESSION_';

src/DBSessionHandler.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
 use chillerlan\Database\Connection;
 
-class DBSessionHandler extends SessionHandlerAbstract{
+class DBSessionHandler extends SessionHandlerAbstract {
 
 	/**
 	 * @var \chillerlan\Database\Connection
@@ -27,7 +27,7 @@ 
 	 * @param \chillerlan\Session\SessionHandlerOptions $options
 	 * @param \chillerlan\Database\Connection           $db
 	 */
-	public function __construct(SessionHandlerOptions $options = null, Connection $db){
+	public function __construct(SessionHandlerOptions $options = null, Connection $db) {
 		parent::__construct($options);
 
 		$this->db = $db;
@@ -138,15 +138,15 @@ 
 			->where('id', $session_id)
 			->execute();
 
-		try{
+		try {
 
-			if(!$q || !isset($q[0])){
+			if (!$q || !isset($q[0])) {
 				return '';
 			}
 
 			return $this->decrypt($q[0]->data);
 		}
-		catch(\Exception $e){
+		catch (\Exception $e) {
 			throw new SessionHandlerException($e->getMessage());
 		}
 

Braces +1 added lines, -2 removed lines

@@ -145,8 +145,7 @@
 			}
 
 			return $this->decrypt($q[0]->data);
-		}
-		catch(\Exception $e){
+		} catch(\Exception $e){
 			throw new SessionHandlerException($e->getMessage());
 		}