silverstripe / silverstripe-hybridsessions

src/Store/CookieStore.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use SilverStripe\Control\Cookie;
 use SilverStripe\HybridSessions\Crypto\CryptoHandler;
-use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Injector\Injector;
 
 /**

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,

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;
     }

tests/OpenSSLCryptoTest.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
         $handler = new OpenSSLCrypto($key, $salt);
 
-        for ($i=0; $i<1000; ++$i) {
+        for ($i = 0; $i < 1000; ++$i) {
             $data = random_bytes(1024 * 4);
 
             $this->assertEquals($data, $handler->decrypt($handler->encrypt($data)));

tests/McryptCryptoTest.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
         $handler = new McryptCrypto($key, $salt);
 
-        for ($i=0; $i<1000; ++$i) {
+        for ($i = 0; $i < 1000; ++$i) {
             $data = random_bytes(1024 * 4);
 
             $this->assertEquals($data, $handler->decrypt($handler->encrypt($data)));

tests/DatabaseStoreTest.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function testDataCodecIntegrity()
     {
-        for ($i=0; $i<1000; ++$i) {
+        for ($i = 0; $i < 1000; ++$i) {
             $data = random_bytes(1024 * 4);
 
             $this->assertEquals($data, DatabaseStore::binaryDataJsonDecode(DatabaseStore::binaryDataJsonEncode($data)));

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/Crypto/McryptCrypto.php

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);
     }
 
     /**

src/Crypto/OpenSSLCrypto.php

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);
     }
 
     /**