silverstripe / silverstripe-hybridsessions

src/Crypto/McryptCrypto.php

Doc Comments +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
      *
      * @param $data - The encrypted-and-signed message as base64 ASCII
      *
-     * @return bool|string - The decrypted cleartext or false if signature failed
+     * @return string|false - The decrypted cleartext or false if signature failed
      */
     public function decrypt($data)
     {

src/Crypto/OpenSSLCrypto.php

Doc Comments +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
      *
      * @param string $data - The encrypted-and-signed message as base64 ASCII
      *
-     * @return bool|string - The decrypted cleartext or false if signature failed
+     * @return string|false - The decrypted cleartext or false if signature failed
      */
     public function decrypt($data)
     {

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
         $ivlen = openssl_cipher_iv_length($cipher);
         $iv = substr($c, 0, $ivlen);
         $hmac = substr($c, $ivlen, $sha2len = 32);
-        $ciphertext_raw = substr($c, $ivlen+$sha2len);
+        $ciphertext_raw = substr($c, $ivlen + $sha2len);
         $cleartext = openssl_decrypt($ciphertext_raw, $cipher, $this->saltedKey, $options = OPENSSL_RAW_DATA, $iv);
         $calcmac = hash_hmac('sha256', $ciphertext_raw, $this->saltedKey, $as_binary = true);
 

src/Store/CookieStore.php

Spacing +3 added lines, -3 removed lines

@@ -111,7 +111,7 @@ 
 
         // Verify expiration
         if ($cookieData) {
-            $expiry = (int)substr($cookieData, 0, 10);
+            $expiry = (int) substr($cookieData, 0, 10);
             $data = substr($cookieData, 10);
 
             if ($expiry > $this->getNow()) {
@@ -148,11 +148,11 @@ 
 
         // Restore the known good cookie value
         $this->currentCookieData = $this->crypto->encrypt(
-            sprintf('%010u', $expiry) . $session_data
+            sprintf('%010u', $expiry).$session_data
         );
 
         // Respect auto-expire on browser close for the session cookie (in case the cookie lifetime is zero)
-        $cookieLifetime = min((int)$params['lifetime'], $lifetime);
+        $cookieLifetime = min((int) $params['lifetime'], $lifetime);
 
         Cookie::set(
             $this->cookie,

src/Store/BaseStore.php

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
     protected function getLifetime()
     {
         $params = session_get_cookie_params();
-        $cookieLifetime = (int)$params['lifetime'];
-        $gcLifetime = (int)ini_get('session.gc_maxlifetime');
+        $cookieLifetime = (int) $params['lifetime'];
+        $gcLifetime = (int) ini_get('session.gc_maxlifetime');
 
         return $cookieLifetime ? min($cookieLifetime, $gcLifetime) : $gcLifetime;
     }

src/HybridSession.php

Doc Comments +2 added lines

@@ -25,6 +25,7 @@ 
 
     /**
      * @param SessionHandlerInterface[]
+     * @param BaseStore[] $handlers
      *
      * @return $this
      */
@@ -38,6 +39,7 @@ 
 
     /**
      * @param string
+     * @param string $key
      *
      * @return $this
      */