silverstripe / silverstripe-hybridsessions

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

Indentation +148 added lines, -148 removed lines

@@ -9,152 +9,152 @@
 class HybridSession extends BaseStore
 {
 
-    /**
-     * List of session handlers
-     *
-     * @var array
-     */
-    protected $handlers = [];
-
-    /**
-     * True if this session store has been initialised
-     *
-     * @var bool
-     */
-    protected static $enabled = false;
-
-    /**
-     * @param SessionHandlerInterface[]
-     *
-     * @return $this
-     */
-    public function setHandlers($handlers)
-    {
-        $this->handlers = $handlers;
-        $this->setKey($this->getKey());
-
-        return $this;
-    }
-
-    /**
-     * @param string
-     *
-     * @return $this
-     */
-    public function setKey($key)
-    {
-        parent::setKey($key);
-
-        foreach ($this->getHandlers() as $handler) {
-            $handler->setKey($key);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return SessionHandlerInterface[]
-     */
-    public function getHandlers()
-    {
-        return $this->handlers ?: [];
-    }
-
-    /**
-     * @param string $save_path
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function open($save_path, $name)
-    {
-        foreach ($this->getHandlers() as $handler) {
-            $handler->open($save_path, $name);
-        }
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function close()
-    {
-        foreach ($this->getHandlers() as $handler) {
-            $handler->close();
-        }
-
-        return true;
-    }
-
-    /**
-     * @param string $session_id
-     *
-     * @return string
-     */
-    public function read($session_id)
-    {
-        foreach ($this->getHandlers() as $handler) {
-            if ($data = $handler->read($session_id)) {
-                return $data;
-            }
-        }
-
-        return '';
-    }
-
-    public function write($session_id, $session_data)
-    {
-        foreach ($this->getHandlers() as $handler) {
-            if ($handler->write($session_id, $session_data)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function destroy($session_id)
-    {
-        foreach ($this->getHandlers() as $handler) {
-            $handler->destroy($session_id);
-        }
-
-        return true;
-    }
-
-    public function gc($maxlifetime)
-    {
-        foreach ($this->getHandlers() as $handler) {
-            $handler->gc($maxlifetime);
-        }
-    }
-
-    /**
-     * Register the session handler as the default
-     *
-     * @param string $key Desired session key
-     */
-    public static function init($key = null)
-    {
-        $instance = Injector::inst()->get(__CLASS__);
-
-        if (empty($key)) {
-            user_error(
-                'HybridSession::init() was not given a $key. Disabling cookie-based storage',
-                E_USER_WARNING
-            );
-        } else {
-            $instance->setKey($key);
-        }
-
-        session_set_save_handler($instance, true);
-
-        self::$enabled = true;
-    }
-
-    public static function is_enabled()
-    {
-        return self::$enabled;
-    }
+	/**
+	 * List of session handlers
+	 *
+	 * @var array
+	 */
+	protected $handlers = [];
+
+	/**
+	 * True if this session store has been initialised
+	 *
+	 * @var bool
+	 */
+	protected static $enabled = false;
+
+	/**
+	 * @param SessionHandlerInterface[]
+	 *
+	 * @return $this
+	 */
+	public function setHandlers($handlers)
+	{
+		$this->handlers = $handlers;
+		$this->setKey($this->getKey());
+
+		return $this;
+	}
+
+	/**
+	 * @param string
+	 *
+	 * @return $this
+	 */
+	public function setKey($key)
+	{
+		parent::setKey($key);
+
+		foreach ($this->getHandlers() as $handler) {
+			$handler->setKey($key);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @return SessionHandlerInterface[]
+	 */
+	public function getHandlers()
+	{
+		return $this->handlers ?: [];
+	}
+
+	/**
+	 * @param string $save_path
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	public function open($save_path, $name)
+	{
+		foreach ($this->getHandlers() as $handler) {
+			$handler->open($save_path, $name);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function close()
+	{
+		foreach ($this->getHandlers() as $handler) {
+			$handler->close();
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param string $session_id
+	 *
+	 * @return string
+	 */
+	public function read($session_id)
+	{
+		foreach ($this->getHandlers() as $handler) {
+			if ($data = $handler->read($session_id)) {
+				return $data;
+			}
+		}
+
+		return '';
+	}
+
+	public function write($session_id, $session_data)
+	{
+		foreach ($this->getHandlers() as $handler) {
+			if ($handler->write($session_id, $session_data)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public function destroy($session_id)
+	{
+		foreach ($this->getHandlers() as $handler) {
+			$handler->destroy($session_id);
+		}
+
+		return true;
+	}
+
+	public function gc($maxlifetime)
+	{
+		foreach ($this->getHandlers() as $handler) {
+			$handler->gc($maxlifetime);
+		}
+	}
+
+	/**
+	 * Register the session handler as the default
+	 *
+	 * @param string $key Desired session key
+	 */
+	public static function init($key = null)
+	{
+		$instance = Injector::inst()->get(__CLASS__);
+
+		if (empty($key)) {
+			user_error(
+				'HybridSession::init() was not given a $key. Disabling cookie-based storage',
+				E_USER_WARNING
+			);
+		} else {
+			$instance->setKey($key);
+		}
+
+		session_set_save_handler($instance, true);
+
+		self::$enabled = true;
+	}
+
+	public static function is_enabled()
+	{
+		return self::$enabled;
+	}
 }

tests/HybridSessionTest.php

Indentation +79 added lines, -79 removed lines

@@ -9,83 +9,83 @@
 
 class HybridSessionTest extends SapphireTest
 {
-    /**
-     * @var BaseStore
-     */
-    protected $handler;
-
-    /**
-     * @var HybridSession
-     */
-    protected $instance;
-
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->handler = $this->createMock(TestCookieStore::class);
-
-        $this->instance = new HybridSession();
-    }
-
-    public function testSetHandlersAlsoSetsKeyToEachHandler()
-    {
-        $this->instance->setKey('foobar');
-        $this->handler->expects($this->once())->method('setKey')->with('foobar');
-        $this->instance->setHandlers([$this->handler]);
-    }
-
-    public function testOpenDelegatesToAllHandlers()
-    {
-        $this->handler->expects($this->once())->method('open')->with('foo', 'bar');
-        $this->instance->setHandlers([$this->handler]);
-        $this->assertTrue($this->instance->open('foo', 'bar'), 'Method returns true after delegation');
-    }
-
-    public function testCloseDelegatesToAllHandlers()
-    {
-        $this->handler->expects($this->once())->method('close');
-        $this->instance->setHandlers([$this->handler]);
-        $this->assertTrue($this->instance->close(), 'Method returns true after delegation');
-    }
-
-    public function testReadReturnsEmptyStringWithNoHandlers()
-    {
-        $this->handler->expects($this->once())->method('read')->with('foosession')->willReturn(false);
-        $this->instance->setHandlers([$this->handler]);
-        $this->assertSame('', $this->instance->read('foosession'));
-    }
-
-    public function testReadReturnsHandlerDelegateResult()
-    {
-        $this->handler->expects($this->once())->method('read')->with('foo.session')->willReturn('success!');
-        $this->instance->setHandlers([$this->handler]);
-        $this->assertSame('success!', $this->instance->read('foo.session'));
-    }
-
-    public function testWriteDelegatesToHandlerAndReturnsTrue()
-    {
-        $this->handler->expects($this->once())->method('write')->with('foo', 'bar')->willReturn(true);
-        $this->instance->setHandlers([$this->handler]);
-        $this->assertTrue($this->instance->write('foo', 'bar'));
-    }
-
-    public function testWriteReturnsFalseWithNoHandlers()
-    {
-        $this->assertFalse($this->instance->write('no', 'handlers'));
-    }
-
-    public function testDestroyDelegatesToHandler()
-    {
-        $this->handler->expects($this->once())->method('destroy')->with('sessid1234');
-        $this->instance->setHandlers([$this->handler]);
-        $this->assertTrue($this->instance->destroy('sessid1234'), 'Method returns true after delegation');
-    }
-
-    public function testGcDelegatesToHandlers()
-    {
-        $this->handler->expects($this->once())->method('gc')->with(12345);
-        $this->instance->setHandlers([$this->handler]);
-        $this->instance->gc(12345);
-    }
+	/**
+	 * @var BaseStore
+	 */
+	protected $handler;
+
+	/**
+	 * @var HybridSession
+	 */
+	protected $instance;
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->handler = $this->createMock(TestCookieStore::class);
+
+		$this->instance = new HybridSession();
+	}
+
+	public function testSetHandlersAlsoSetsKeyToEachHandler()
+	{
+		$this->instance->setKey('foobar');
+		$this->handler->expects($this->once())->method('setKey')->with('foobar');
+		$this->instance->setHandlers([$this->handler]);
+	}
+
+	public function testOpenDelegatesToAllHandlers()
+	{
+		$this->handler->expects($this->once())->method('open')->with('foo', 'bar');
+		$this->instance->setHandlers([$this->handler]);
+		$this->assertTrue($this->instance->open('foo', 'bar'), 'Method returns true after delegation');
+	}
+
+	public function testCloseDelegatesToAllHandlers()
+	{
+		$this->handler->expects($this->once())->method('close');
+		$this->instance->setHandlers([$this->handler]);
+		$this->assertTrue($this->instance->close(), 'Method returns true after delegation');
+	}
+
+	public function testReadReturnsEmptyStringWithNoHandlers()
+	{
+		$this->handler->expects($this->once())->method('read')->with('foosession')->willReturn(false);
+		$this->instance->setHandlers([$this->handler]);
+		$this->assertSame('', $this->instance->read('foosession'));
+	}
+
+	public function testReadReturnsHandlerDelegateResult()
+	{
+		$this->handler->expects($this->once())->method('read')->with('foo.session')->willReturn('success!');
+		$this->instance->setHandlers([$this->handler]);
+		$this->assertSame('success!', $this->instance->read('foo.session'));
+	}
+
+	public function testWriteDelegatesToHandlerAndReturnsTrue()
+	{
+		$this->handler->expects($this->once())->method('write')->with('foo', 'bar')->willReturn(true);
+		$this->instance->setHandlers([$this->handler]);
+		$this->assertTrue($this->instance->write('foo', 'bar'));
+	}
+
+	public function testWriteReturnsFalseWithNoHandlers()
+	{
+		$this->assertFalse($this->instance->write('no', 'handlers'));
+	}
+
+	public function testDestroyDelegatesToHandler()
+	{
+		$this->handler->expects($this->once())->method('destroy')->with('sessid1234');
+		$this->instance->setHandlers([$this->handler]);
+		$this->assertTrue($this->instance->destroy('sessid1234'), 'Method returns true after delegation');
+	}
+
+	public function testGcDelegatesToHandlers()
+	{
+		$this->handler->expects($this->once())->method('gc')->with(12345);
+		$this->instance->setHandlers([$this->handler]);
+		$this->instance->gc(12345);
+	}
 }

tests/Store/TestCookieStore.php

Indentation +15 added lines, -15 removed lines

@@ -7,21 +7,21 @@
 
 class TestCookieStore extends CookieStore implements TestOnly
 {
-    /**
-     * Override value of 'headers_sent' but only if running tests.
-     *
-     * Set to true or false, or null to not override
-     *
-     * @var string
-     */
-    public static $override_headers_sent = null;
+	/**
+	 * Override value of 'headers_sent' but only if running tests.
+	 *
+	 * Set to true or false, or null to not override
+	 *
+	 * @var string
+	 */
+	public static $override_headers_sent = null;
 
-    protected function canWrite()
-    {
-        if (self::$override_headers_sent !== null) {
-            return !self::$override_headers_sent;
-        }
+	protected function canWrite()
+	{
+		if (self::$override_headers_sent !== null) {
+			return !self::$override_headers_sent;
+		}
 
-        parent::canWrite();
-    }
+		parent::canWrite();
+	}
 }

tests/OpenSSLCryptoTest.php

Indentation +13 added lines, -13 removed lines

@@ -8,20 +8,20 @@
 
 class OpenSSLCryptoTest extends SapphireTest
 {
-    /**
-     * @requires extension openssl
-     */
-    public function testIntegrity()
-    {
-        $key = random_bytes(8);
-        $salt = random_bytes(16);
+	/**
+	 * @requires extension openssl
+	 */
+	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)));
+		}
+	}
 }

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

Indentation +13 added lines, -13 removed lines

@@ -8,20 +8,20 @@
 
 class McryptCryptoTest extends SapphireTest
 {
-    /**
-     * @requires extension mcrypt
-     */
-    public function testIntegrity()
-    {
-        $key = random_bytes(8);
-        $salt = random_bytes(16);
+	/**
+	 * @requires extension mcrypt
+	 */
+	public function testIntegrity()
+	{
+		$key = random_bytes(8);
+		$salt = random_bytes(16);
 
-        $handler = new McryptCrypto($key, $salt);
+		$handler = new McryptCrypto($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)));
+		}
+	}
 }

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

src/Store/DatabaseStore/BinaryDataJsonCodec.php

Indentation +30 added lines, -30 removed lines

@@ -11,38 +11,38 @@
  */
 trait BinaryDataJsonCodec
 {
-    /**
-     * Encode binary data into ASCII string (a subset of UTF-8)
-     *
-     * @param string $data This is a binary blob
-     *
-     * @return string
-     */
-    public function binary_data_json_encode($data) {
-        return json_encode([
-            self::class,
-            base64_encode($data)
-        ]);
-    }
+	/**
+	 * Encode binary data into ASCII string (a subset of UTF-8)
+	 *
+	 * @param string $data This is a binary blob
+	 *
+	 * @return string
+	 */
+	public function binary_data_json_encode($data) {
+		return json_encode([
+			self::class,
+			base64_encode($data)
+		]);
+	}
 
-    /**
-     * Decode ASCII string into original binary data (a php string)
-     *
-     * @param string $text
-     *
-     * @param null|string
-     */
-    public function binary_data_json_decode($text) {
-        $struct = json_decode($text, true, 2);
+	/**
+	 * Decode ASCII string into original binary data (a php string)
+	 *
+	 * @param string $text
+	 *
+	 * @param null|string
+	 */
+	public function binary_data_json_decode($text) {
+		$struct = json_decode($text, true, 2);
 
-        if (!is_array($struct) || count($struct) !== 2) {
-            return null;
-        }
+		if (!is_array($struct) || count($struct) !== 2) {
+			return null;
+		}
 
-        if (!isset($struct[0]) || !isset($struct[1]) || $struct[0] !== self::class) {
-            return null;
-        }
+		if (!isset($struct[0]) || !isset($struct[1]) || $struct[0] !== self::class) {
+			return null;
+		}
 
-        return base64_decode($struct[1]);
-    }
+		return base64_decode($struct[1]);
+	}
 }

src/Store/DatabaseStore.php

Indentation +84 added lines, -84 removed lines

@@ -12,96 +12,96 @@
 
 class DatabaseStore extends BaseStore
 {
-    use BinaryDataJsonCodec;
-
-    /**
-     * 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"
+	use BinaryDataJsonCodec;
+
+	/**
+	 * 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 = $this->binary_data_json_decode($data['Data']);
-            return is_null($decoded) ? $data['Data'] : $decoded;
-        }
-    }
+		if ($result && $result->numRecords()) {
+			$data = $result->first();
+			$decoded = $this->binary_data_json_decode($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($this->binary_data_json_encode($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()
-        ));
-    }
+			Convert::raw2sql($session_id),
+			$expiry,
+			Convert::raw2sql($this->binary_data_json_encode($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()
+		));
+	}
 }

tests/Store/BinaryDataJsonCodecImplementation.php

Indentation +1 added lines, -1 removed lines

@@ -7,5 +7,5 @@
 
 class BinaryDataJsonCodecImplementation implements TestOnly
 {
-    use BinaryDataJsonCodec;
+	use BinaryDataJsonCodec;
 }

tests/DatabaseStoreTest.php

Indentation +21 added lines, -21 removed lines

@@ -11,31 +11,31 @@
 
 class DatabaseStoreTest extends AbstractTest
 {
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        if (!DB::get_conn() instanceof MySQLDatabase) {
-            $this->markTestSkipped('Only MySQL databases are supported');
-        }
-    }
+		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());
+	protected function getStore()
+	{
+		$store = Injector::inst()->get(DatabaseStore::class);
+		$store->setKey(uniqid());
 
-        return $store;
-    }
+		return $store;
+	}
 
-    public function testDataCodecIntegrity()
-    {
-        $codec = new BinaryDataJsonCodecImplementation;
+	public function testDataCodecIntegrity()
+	{
+		$codec = new BinaryDataJsonCodecImplementation;
 
-        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, $codec->binary_data_json_decode($codec->binary_data_json_encode($data)));
-        }
-    }
+			$this->assertEquals($data, $codec->binary_data_json_decode($codec->binary_data_json_encode($data)));
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     {
         $codec = new BinaryDataJsonCodecImplementation;
 
-        for ($i=0; $i<1000; ++$i) {
+        for ($i = 0; $i < 1000; ++$i) {
             $data = random_bytes(1024 * 4);
 
             $this->assertEquals($data, $codec->binary_data_json_decode($codec->binary_data_json_encode($data)));