Session: Added DatabaseHandler, replaces Symfony PdoSessionHandler

4 files changed, 204 insertions, 25 deletions

diff --git a/tests/Unit/Http/SessionHandlers/AbstractHandlerTest.php b/tests/Unit/Http/SessionHandlers/AbstractHandlerTest.php
new file mode 100644
index 00000000..bfd2e883
--- /dev/null
+++ b/tests/Unit/Http/SessionHandlers/AbstractHandlerTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\SessionHandlers;
+
+use Engelsystem\Test\Unit\Http\SessionHandlers\Stub\ArrayHandler;
+use PHPUnit\Framework\TestCase;
+
+class AbstractHandlerTest extends TestCase
+{
+    /**
+     * @covers \Engelsystem\Http\SessionHandlers\AbstractHandler::open
+     */
+    public function testOpen()
+    {
+        $handler = new ArrayHandler();
+        $return = $handler->open('/foo/bar', '1337asd098hkl7654');
+
+        $this->assertTrue($return);
+        $this->assertEquals('1337asd098hkl7654', $handler->getName());
+        $this->assertEquals('/foo/bar', $handler->getSessionPath());
+    }
+
+    /**
+     * @covers \Engelsystem\Http\SessionHandlers\AbstractHandler::close
+     */
+    public function testClose()
+    {
+        $handler = new ArrayHandler();
+        $return = $handler->close();
+
+        $this->assertTrue($return);
+    }
+
+    /**
+     * @covers \Engelsystem\Http\SessionHandlers\AbstractHandler::gc
+     */
+    public function testGc()
+    {
+        $handler = new ArrayHandler();
+        $return = $handler->gc(60 * 60 * 24);
+
+        $this->assertTrue($return);
+    }
+}
diff --git a/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php b/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php
new file mode 100644
index 00000000..ea4f3701
--- /dev/null
+++ b/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\SessionHandlers;
+
+use Engelsystem\Http\SessionHandlers\DatabaseHandler;
+use Engelsystem\Test\Unit\HasDatabase;
+use PHPUnit\Framework\TestCase;
+
+class DatabaseHandlerTest extends TestCase
+{
+    use HasDatabase;
+
+    /**
+     * @covers \Engelsystem\Http\SessionHandlers\DatabaseHandler::__construct
+     * @covers \Engelsystem\Http\SessionHandlers\DatabaseHandler::read
+     * @covers \Engelsystem\Http\SessionHandlers\DatabaseHandler::getQuery
+     */
+    public function testRead()
+    {
+        $handler = new DatabaseHandler($this->database);
+        $this->assertEquals('', $handler->read('foo'));
+
+        $this->database->insert("INSERT INTO sessions VALUES ('foo', 'Lorem Ipsum', CURRENT_TIMESTAMP)");
+        $this->assertEquals('Lorem Ipsum', $handler->read('foo'));
+    }
+
+    /**
+     * @covers \Engelsystem\Http\SessionHandlers\DatabaseHandler::write
+     * @covers \Engelsystem\Http\SessionHandlers\DatabaseHandler::getCurrentTimestamp
+     */
+    public function testWrite()
+    {
+        $handler = new DatabaseHandler($this->database);
+
+        foreach (['Lorem Ipsum', 'Dolor Sit!'] as $data) {
+            $this->assertTrue($handler->write('foo', $data));
+
+            $return = $this->database->select('SELECT * FROM sessions WHERE id = :id', ['id' => 'foo']);
+            $this->assertCount(1, $return);
+
+            $return = array_shift($return);
+            $this->assertEquals($data, $return->payload);
+        }
+    }
+
+    /**
+     * @covers \Engelsystem\Http\SessionHandlers\DatabaseHandler::destroy
+     */
+    public function testDestroy()
+    {
+        $this->database->insert("INSERT INTO sessions VALUES ('foo', 'Lorem Ipsum', CURRENT_TIMESTAMP)");
+        $this->database->insert("INSERT INTO sessions VALUES ('bar', 'Dolor Sit', CURRENT_TIMESTAMP)");
+
+        $handler = new DatabaseHandler($this->database);
+        $this->assertTrue($handler->destroy('batz'));
+
+        $return = $this->database->select('SELECT * FROM sessions');
+        $this->assertCount(2, $return);
+
+        $this->assertTrue($handler->destroy('bar'));
+
+        $return = $this->database->select('SELECT * FROM sessions');
+        $this->assertCount(1, $return);
+
+        $return = array_shift($return);
+        $this->assertEquals('foo', $return->id);
+    }
+
+    /**
+     * @covers \Engelsystem\Http\SessionHandlers\DatabaseHandler::gc
+     */
+    public function testGc()
+    {
+        $this->database->insert("INSERT INTO sessions VALUES ('foo', 'Lorem Ipsum', '2000-01-01 01:00')");
+        $this->database->insert("INSERT INTO sessions VALUES ('bar', 'Dolor Sit', '3000-01-01 01:00')");
+
+        $handler = new DatabaseHandler($this->database);
+
+        $this->assertTrue($handler->gc(60 * 60));
+
+        $return = $this->database->select('SELECT * FROM sessions');
+        $this->assertCount(1, $return);
+
+        $return = array_shift($return);
+        $this->assertEquals('bar', $return->id);
+    }
+
+    /**
+     * Prepare tests
+     */
+    protected function setUp()
+    {
+        $this->initDatabase();
+    }
+}
diff --git a/tests/Unit/Http/SessionHandlers/Stub/ArrayHandler.php b/tests/Unit/Http/SessionHandlers/Stub/ArrayHandler.php
new file mode 100644
index 00000000..4d37da48
--- /dev/null
+++ b/tests/Unit/Http/SessionHandlers/Stub/ArrayHandler.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\SessionHandlers\Stub;
+
+use Engelsystem\Http\SessionHandlers\AbstractHandler;
+
+class ArrayHandler extends AbstractHandler
+{
+    /** @var string[] */
+    protected $content = [];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($id): string
+    {
+        if (isset($this->content[$id])) {
+            return $this->content[$id];
+        }
+
+        return '';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($id, $data): bool
+    {
+        $this->content[$id] = $data;
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function destroy($id): bool
+    {
+        unset($this->content[$id]);
+
+        return true;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSessionPath(): string
+    {
+        return $this->sessionPath;
+    }
+}
diff --git a/tests/Unit/Http/SessionServiceProviderTest.php b/tests/Unit/Http/SessionServiceProviderTest.php
index 5e4575b3..dd0e538f 100644
--- a/tests/Unit/Http/SessionServiceProviderTest.php
+++ b/tests/Unit/Http/SessionServiceProviderTest.php
@@ -4,12 +4,11 @@ namespace Engelsystem\Test\Unit\Http;
 
 use Engelsystem\Config\Config;
 use Engelsystem\Http\Request;
+use Engelsystem\Http\SessionHandlers\DatabaseHandler;
 use Engelsystem\Http\SessionServiceProvider;
 use Engelsystem\Test\Unit\ServiceProviderTest;
-use PDO;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
 use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface as StorageInterface;
@@ -26,7 +25,7 @@ class SessionServiceProviderTest extends ServiceProviderTest
 
         $sessionStorage = $this->getMockForAbstractClass(StorageInterface::class);
         $sessionStorage2 = $this->getMockForAbstractClass(StorageInterface::class);
-        $pdoSessionHandler = $this->getMockBuilder(PdoSessionHandler::class)
+        $databaseHandler = $this->getMockBuilder(DatabaseHandler::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -41,10 +40,6 @@ class SessionServiceProviderTest extends ServiceProviderTest
 
         /** @var Config|MockObject $config */
         $config = $this->createMock(Config::class);
-        /** @var PDO|MockObject $pdo */
-        $pdo = $this->getMockBuilder(PDO::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $serviceProvider->expects($this->exactly(3))
             ->method('isCli')
@@ -60,22 +55,10 @@ class SessionServiceProviderTest extends ServiceProviderTest
                     ['options' => ['cookie_httponly' => true, 'name' => 'session'], 'handler' => null]
                 ],
                 [Session::class],
-                [
-                    PdoSessionHandler::class,
-                    [
-                        'pdoOrDsn' => $pdo,
-                        'options'  => [
-                            'db_table'        => 'sessions',
-                            'db_id_col'       => 'id',
-                            'db_data_col'     => 'payload',
-                            'db_lifetime_col' => 'lifetime',
-                            'db_time_col'     => 'last_activity',
-                        ],
-                    ]
-                ],
+                [DatabaseHandler::class],
                 [
                     NativeSessionStorage::class,
-                    ['options' => ['cookie_httponly' => true, 'name' => 'foobar'], 'handler' => $pdoSessionHandler]
+                    ['options' => ['cookie_httponly' => true, 'name' => 'foobar'], 'handler' => $databaseHandler]
                 ],
                 [Session::class]
             )
@@ -84,7 +67,7 @@ class SessionServiceProviderTest extends ServiceProviderTest
                 $session,
                 $sessionStorage2,
                 $session,
-                $pdoSessionHandler,
+                $databaseHandler,
                 $sessionStorage2,
                 $session
             );
@@ -96,14 +79,13 @@ class SessionServiceProviderTest extends ServiceProviderTest
                 ['session', $session]
             );
 
-        $app->expects($this->exactly(6))
+        $app->expects($this->exactly(5))
             ->method('get')
             ->withConsecutive(
                 ['request'],
                 ['config'],
                 ['request'],
                 ['config'],
-                ['db.pdo'],
                 ['request']
             )
             ->willReturnOnConsecutiveCalls(
@@ -111,7 +93,6 @@ class SessionServiceProviderTest extends ServiceProviderTest
                 $config,
                 $request,
                 $config,
-                $pdo,
                 $request
             );