silverstripe / silverstripe-hybridsessions

src/Store/DatabaseStore.php

Indentation +125 added lines, -125 removed lines

@@ -12,137 +12,137 @@
 class DatabaseStore extends BaseStore
 {
 
-    /**
-     * Determine if the DB is ready to use.
-     *
-     * @return bool
-     * @throws Exception
-     */
-    protected function isDatabaseReady()
-    {
-        // Such as during setup of testsession prior to DB connection.
-        if (!DB::is_active()) {
-            return false;
-        }
-
-        // If we have a DB of the wrong type then complain
-        if (!(DB::get_conn() instanceof MySQLDatabase)) {
-            throw new Exception('HybridSessions\Store\DatabaseStore currently only works with MySQL databases');
-        }
-
-        // Prevent freakout during dev/build
-        return ClassInfo::hasTable('HybridSessionDataObject');
-    }
-
-    public function open($save_path, $name)
-    {
-        // no-op
-    }
-
-    public function close()
-    {
-        // no-op
-    }
-
-    public function read($session_id)
-    {
-        if (!$this->isDatabaseReady()) {
-            return null;
-        }
-
-        $query = sprintf(
-            'SELECT "Data" FROM "HybridSessionDataObject"
+	/**
+	 * Determine if the DB is ready to use.
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	protected function isDatabaseReady()
+	{
+		// Such as during setup of testsession prior to DB connection.
+		if (!DB::is_active()) {
+			return false;
+		}
+
+		// If we have a DB of the wrong type then complain
+		if (!(DB::get_conn() instanceof MySQLDatabase)) {
+			throw new Exception('HybridSessions\Store\DatabaseStore currently only works with MySQL databases');
+		}
+
+		// Prevent freakout during dev/build
+		return ClassInfo::hasTable('HybridSessionDataObject');
+	}
+
+	public function open($save_path, $name)
+	{
+		// no-op
+	}
+
+	public function close()
+	{
+		// no-op
+	}
+
+	public function read($session_id)
+	{
+		if (!$this->isDatabaseReady()) {
+			return null;
+		}
+
+		$query = sprintf(
+			'SELECT "Data" FROM "HybridSessionDataObject"
             WHERE "SessionID" = \'%s\' AND "Expiry" >= %s',
-            Convert::raw2sql($session_id),
-            $this->getNow()
-        );
+			Convert::raw2sql($session_id),
+			$this->getNow()
+		);
 
-        $result = DB::query($query);
+		$result = DB::query($query);
 
-        if ($result && $result->numRecords()) {
-            $data = $result->first();
-            $decoded = static::binaryDataJsonDecode($data['Data']);
-            return is_null($decoded) ? $data['Data'] : $decoded;
-        }
-    }
+		if ($result && $result->numRecords()) {
+			$data = $result->first();
+			$decoded = static::binaryDataJsonDecode($data['Data']);
+			return is_null($decoded) ? $data['Data'] : $decoded;
+		}
+	}
 
-    public function write($session_id, $session_data)
-    {
-        if (!$this->isDatabaseReady()) {
-            return false;
-        }
+	public function write($session_id, $session_data)
+	{
+		if (!$this->isDatabaseReady()) {
+			return false;
+		}
 
-        $expiry = $this->getNow() + $this->getLifetime();
+		$expiry = $this->getNow() + $this->getLifetime();
 
-        DB::query($str = sprintf(
-            'INSERT INTO "HybridSessionDataObject" ("SessionID", "Expiry", "Data")
+		DB::query($str = sprintf(
+			'INSERT INTO "HybridSessionDataObject" ("SessionID", "Expiry", "Data")
             VALUES (\'%1$s\', %2$u, \'%3$s\')
             ON DUPLICATE KEY UPDATE "Expiry" = %2$u, "Data" = \'%3$s\'',
-            Convert::raw2sql($session_id),
-            $expiry,
-            Convert::raw2sql(static::binaryDataJsonEncode($session_data))
-        ));
-
-        return true;
-    }
-
-    public function destroy($session_id)
-    {
-        // NOP
-    }
-
-    public function gc($maxlifetime)
-    {
-        if (!$this->isDatabaseReady()) {
-            return;
-        }
-
-        DB::query(sprintf(
-            'DELETE FROM "HybridSessionDataObject" WHERE "Expiry" < %u',
-            $this->getNow()
-        ));
-    }
-
-    /**
-    * Encode binary data into ASCII string (a subset of UTF-8)
-    *
-    * Silverstripe <= 4.4 does not have a binary db field implementation, so we have to store
-    * binary data as text
-    *
-    * @param string $data This is a binary blob
-    *
-    * @return string
-    */
-    public static function binaryDataJsonEncode($data)
-    {
-        return json_encode([
-            self::class,
-            base64_encode($data)
-        ]);
-    }
-
-    /**
-     * Decode ASCII string into original binary data (a php string)
-     *
-     * Silverstripe <= 4.4 does not have a binary db field implementation, so we have to store
-     * binary data as text
-     *
-     * @param string $text
-     *
-     * @param null|string
-     */
-    public static function binaryDataJsonDecode($text)
-    {
-        $struct = json_decode($text, true, 2);
-
-        if (!is_array($struct) || count($struct) !== 2) {
-            return null;
-        }
-
-        if (!isset($struct[0]) || !isset($struct[1]) || $struct[0] !== self::class) {
-            return null;
-        }
-
-        return base64_decode($struct[1]);
-    }
+			Convert::raw2sql($session_id),
+			$expiry,
+			Convert::raw2sql(static::binaryDataJsonEncode($session_data))
+		));
+
+		return true;
+	}
+
+	public function destroy($session_id)
+	{
+		// NOP
+	}
+
+	public function gc($maxlifetime)
+	{
+		if (!$this->isDatabaseReady()) {
+			return;
+		}
+
+		DB::query(sprintf(
+			'DELETE FROM "HybridSessionDataObject" WHERE "Expiry" < %u',
+			$this->getNow()
+		));
+	}
+
+	/**
+	 * Encode binary data into ASCII string (a subset of UTF-8)
+	 *
+	 * Silverstripe <= 4.4 does not have a binary db field implementation, so we have to store
+	 * binary data as text
+	 *
+	 * @param string $data This is a binary blob
+	 *
+	 * @return string
+	 */
+	public static function binaryDataJsonEncode($data)
+	{
+		return json_encode([
+			self::class,
+			base64_encode($data)
+		]);
+	}
+
+	/**
+	 * Decode ASCII string into original binary data (a php string)
+	 *
+	 * Silverstripe <= 4.4 does not have a binary db field implementation, so we have to store
+	 * binary data as text
+	 *
+	 * @param string $text
+	 *
+	 * @param null|string
+	 */
+	public static function binaryDataJsonDecode($text)
+	{
+		$struct = json_decode($text, true, 2);
+
+		if (!is_array($struct) || count($struct) !== 2) {
+			return null;
+		}
+
+		if (!isset($struct[0]) || !isset($struct[1]) || $struct[0] !== self::class) {
+			return null;
+		}
+
+		return base64_decode($struct[1]);
+	}
 }

tests/OpenSSLCryptoTest.php

Indentation +10 added lines, -10 removed lines

@@ -10,17 +10,17 @@
  */
 class OpenSSLCryptoTest extends SapphireTest
 {
-    public function testIntegrity()
-    {
-        $key = random_bytes(8);
-        $salt = random_bytes(16);
+	public function testIntegrity()
+	{
+		$key = random_bytes(8);
+		$salt = random_bytes(16);
 
-        $handler = new OpenSSLCrypto($key, $salt);
+		$handler = new OpenSSLCrypto($key, $salt);
 
-        for ($i = 0; $i < 1000; ++$i) {
-            $data = random_bytes(1024 * 4);
+		for ($i = 0; $i < 1000; ++$i) {
+			$data = random_bytes(1024 * 4);
 
-            $this->assertEquals($data, $handler->decrypt($handler->encrypt($data)));
-        }
-    }
+			$this->assertEquals($data, $handler->decrypt($handler->encrypt($data)));
+		}
+	}
 }

tests/DatabaseStoreTest.php

Indentation +25 added lines, -25 removed lines

@@ -9,29 +9,29 @@
 
 class DatabaseStoreTest extends AbstractTest
 {
-    protected function setUp()
-    {
-        parent::setUp();
-
-        if (!DB::get_conn() instanceof MySQLDatabase) {
-            $this->markTestSkipped('Only MySQL databases are supported');
-        }
-    }
-
-    protected function getStore()
-    {
-        $store = Injector::inst()->get(DatabaseStore::class);
-        $store->setKey(uniqid());
-
-        return $store;
-    }
-
-    public function testDataCodecIntegrity()
-    {
-        for ($i = 0; $i < 1000; ++$i) {
-            $data = random_bytes(1024 * 4);
-
-            $this->assertEquals($data, DatabaseStore::binaryDataJsonDecode(DatabaseStore::binaryDataJsonEncode($data)));
-        }
-    }
+	protected function setUp()
+	{
+		parent::setUp();
+
+		if (!DB::get_conn() instanceof MySQLDatabase) {
+			$this->markTestSkipped('Only MySQL databases are supported');
+		}
+	}
+
+	protected function getStore()
+	{
+		$store = Injector::inst()->get(DatabaseStore::class);
+		$store->setKey(uniqid());
+
+		return $store;
+	}
+
+	public function testDataCodecIntegrity()
+	{
+		for ($i = 0; $i < 1000; ++$i) {
+			$data = random_bytes(1024 * 4);
+
+			$this->assertEquals($data, DatabaseStore::binaryDataJsonDecode(DatabaseStore::binaryDataJsonEncode($data)));
+		}
+	}
 }

tests/McryptCryptoTest.php

Indentation +24 added lines, -24 removed lines

@@ -11,28 +11,28 @@
  */
 class McryptCryptoTest extends SapphireTest
 {
-    public function testIntegrity()
-    {
-        $this->markTestSkipped(
-            'McryptCrypto is losing zero bytes at the end of messages: ' .
-            'https://github.com/silverstripe/silverstripe-hybridsessions/issues/53'
-        );
-
-        $error_reporting = ini_set('error_reporting', (int) ini_get('error_reporting') & ~E_DEPRECATED);
-
-        try {
-            $key = random_bytes(8);
-            $salt = random_bytes(16);
-
-            $handler = new McryptCrypto($key, $salt);
-
-            for ($i = 0; $i < 1000; ++$i) {
-                $data = random_bytes(1024 * 4);
-
-                $this->assertEquals($data, $handler->decrypt($handler->encrypt($data)));
-            }
-        } finally {
-            ini_set('error_reporting', $error_reporting);
-        }
-    }
+	public function testIntegrity()
+	{
+		$this->markTestSkipped(
+			'McryptCrypto is losing zero bytes at the end of messages: ' .
+			'https://github.com/silverstripe/silverstripe-hybridsessions/issues/53'
+		);
+
+		$error_reporting = ini_set('error_reporting', (int) ini_get('error_reporting') & ~E_DEPRECATED);
+
+		try {
+			$key = random_bytes(8);
+			$salt = random_bytes(16);
+
+			$handler = new McryptCrypto($key, $salt);
+
+			for ($i = 0; $i < 1000; ++$i) {
+				$data = random_bytes(1024 * 4);
+
+				$this->assertEquals($data, $handler->decrypt($handler->encrypt($data)));
+			}
+		} finally {
+			ini_set('error_reporting', $error_reporting);
+		}
+	}
 }

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'
         );