silverstripe / silverstripe-hybridsessions

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 +2 added lines, -2 removed lines

@@ -64,9 +64,9 @@
         $iv = openssl_random_pseudo_bytes($ivlen);
         $ciphertext_raw = openssl_encrypt($cleartext, $cipher, $this->saltedKey, $options = OPENSSL_RAW_DATA, $iv);
         $hmac = hash_hmac('sha256', $ciphertext_raw, $this->saltedKey, $as_binary = true);
-        $ciphertext = base64_encode($iv . $hmac . $ciphertext_raw);
+        $ciphertext = base64_encode($iv.$hmac.$ciphertext_raw);
 
-        return base64_encode($iv . $hmac . $ciphertext_raw);
+        return base64_encode($iv.$hmac.$ciphertext_raw);
     }
 
     /**

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
      */

src/Crypto/McryptCrypto.php

Doc Comments +3 added lines, -3 removed lines

@@ -35,8 +35,8 @@ 
     }
 
     /**
-     * @param $key a per-site secret string which is used as the base encryption key.
-     * @param $salt a per-session random string which is used as a salt to generate a per-session key
+     * @param string $key a per-site secret string which is used as the base encryption key.
+     * @param string $salt a per-session random string which is used as a salt to generate a per-session key
      *
      * The base encryption key needs to stay secret. If an attacker ever gets it, they can read their session,
      * and even modify & re-sign it.
@@ -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)
     {

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 
         $hash = hash_hmac('sha256', $enc, $this->saltedKey);
 
-        return base64_encode($iv . $hash . $enc);
+        return base64_encode($iv.$hash.$enc);
     }
 
     /**

tests/CookieStoreTest.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     {
         $store = Injector::inst()->get(CookieStore::class);
         $store->setKey(uniqid());
-        $store->open(TempFolder::getTempFolder(BASE_PATH) . '/' . __CLASS__, 'SESSIONCOOKIE');
+        $store->open(TempFolder::getTempFolder(BASE_PATH).'/'.__CLASS__, 'SESSIONCOOKIE');
 
         return $store;
     }

src/Store/CookieStore.php

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
 
     public function open($save_path, $name)
     {
-        $this->cookie = $name . '_2';
+        $this->cookie = $name.'_2';
 
         // Read the incoming value, then clear the cookie - we might not be able
         // to do so later if write() is called after headers are sent
@@ -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()) {
@@ -164,11 +164,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,

tests/McryptCryptoTest.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     public function testIntegrity()
     {
         $this->markTestSkipped(
-            'McryptCrypto is losing zero bytes at the end of messages: ' .
+            'McryptCrypto is losing zero bytes at the end of messages: '.
             'https://github.com/silverstripe/silverstripe-hybridsessions/issues/53'
         );