Complete Handler tests, update autoload

Completed SessionHandlerTest, added SessionDBTest and set the autoloader to PSR-4 standard

Author: likel

src/autoload.php

@@ -1,10 +1,8 @@
 <?php
 /**
- * Load the models
- *
- * Sadly we can't use an autoloader here in the case that the end-user
- * is using one. Multiple autoloaders can cause conflicts
+ * PSR-4 autoload
  *
+ * After registering this autoload function with require_once()
  * Likel/Session/Handler can be called like this:
  *
  *      $session = new Likel\Session\Handler();
@@ -17,6 +15,25 @@
  * @version     1.0.0
  */
 
-// Require the models
-require_once(__DIR__ . '/models/DB.php');
-require_once(__DIR__ . '/models/Session/Handler.php');
+// Require the models when called
+spl_autoload_register(function ($class_name) {
+    // Change these depending on the project
+    $project_prefix = 'Likel\\';
+    $models_dir = __DIR__ . '/models/';
+
+    // Helper variables used in the autoloader
+    $project_prefix_length = strlen($project_prefix);
+    $relative_class = substr($class_name, $project_prefix_length);
+
+    // Return if the requested class does not include the prefix
+    if (strncmp($project_prefix, $class_name, $project_prefix_length) !== 0) {
+        return;
+    }
+
+    // Replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the class name and append with .php
+    $file = $models_dir . str_replace('\\', '/', $relative_class) . '.php';
+    if (file_exists($file)) {
+        require_once($file);
+    }
+});

src/models/Session/Handler.php

@@ -305,6 +305,9 @@ private function start_session($session_name, $secure)
         session_name($session_name);
         session_start();
 
+        // Put it into the DB so we don't delay
+        $this->_write(session_id(), '');
+
         // Regenerate ID is recommended to reset the session every reload
         // Bug occurs if set to true that causes the current session to
         // be removed if loading pages too quickly

test/SessionDBTest.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * PHPUnit tests for models/DB.php
+ *
+ * Test errors in PHPUnit 6.4.0 make sure to upgrade to 6.4.1
+ *
+ * @package     php-simple-sessions
+ * @author      Liam Kelly <https://github.com/likel>
+ * @copyright   2017 Liam Kelly
+ * @license     MIT License <https://github.com/likel/php-simple-sessions/blob/master/LICENSE>
+ * @link        https://github.com/likel/php-simple-sessions
+ * @version     1.0.0
+ */
+use PHPUnit\Framework\TestCase;
+
+// Require the autoloader to load the models when required
+require_once(__DIR__ . '/../src/autoload.php');
+
+/**
+ * @runTestsInSeparateProcesses
+ */
+final class SessionDBTest extends TestCase
+{
+    /**
+     * No parameters supplied to constructor
+     */
+    public function testConstructorNoParameters()
+    {
+
+    }
+}

test/SessionHandlerTest.php

@@ -21,8 +21,6 @@
  */
 final class SessionHandlerTest extends TestCase
 {
-    private $session;
-
     /**
      * Destroy the session at the end of each test
      */
@@ -38,7 +36,7 @@ protected function tearDown()
      */
     public function testConstructorNoParameters()
     {
-        $this->session = new \Likel\Session\Handler();
+        $session = new \Likel\Session\Handler();
         $this->assertEquals(session_status(), PHP_SESSION_ACTIVE);
     }
 
@@ -47,7 +45,7 @@ public function testConstructorNoParameters()
      */
     public function testConstructorNonArray()
     {
-        $this->session = new \Likel\Session\Handler("a");
+        $session = new \Likel\Session\Handler("a");
         $this->assertEquals(session_status(), PHP_SESSION_ACTIVE);
     }
 
@@ -56,7 +54,7 @@ public function testConstructorNonArray()
      */
     public function testConstructorSessionNameSet()
     {
-        $this->session = new \Likel\Session\Handler(array(
+        $session = new \Likel\Session\Handler(array(
             'session_name' => "test_session"
         ));
         $this->assertEquals(session_status(), PHP_SESSION_ACTIVE);
@@ -68,7 +66,7 @@ public function testConstructorSessionNameSet()
      */
     public function testConstructorSecureSet()
     {
-        $this->session = new \Likel\Session\Handler(array(
+        $session = new \Likel\Session\Handler(array(
             'secure' => "true"
         ));
         $this->assertEquals(session_status(), PHP_SESSION_ACTIVE);
@@ -79,7 +77,7 @@ public function testConstructorSecureSet()
      */
     public function testConstructorCredentialsLocationSet()
     {
-        $this->session = new \Likel\Session\Handler(array(
+        $session = new \Likel\Session\Handler(array(
             'credentials_location' => __DIR__ . '/../src/ini/credentials.ini'
         ));
         $this->assertEquals(session_status(), PHP_SESSION_ACTIVE);
@@ -90,7 +88,7 @@ public function testConstructorCredentialsLocationSet()
      */
     public function testConstructorNonExistantParameter()
     {
-        $this->session = new \Likel\Session\Handler(array(
+        $session = new \Likel\Session\Handler(array(
             'foo' => 'bar'
         ));
         $this->assertEquals(session_status(), PHP_SESSION_ACTIVE);
@@ -101,7 +99,7 @@ public function testConstructorNonExistantParameter()
      */
     public function testConstructorIncorrectSecureType()
     {
-        $this->session = new \Likel\Session\Handler(array(
+        $session = new \Likel\Session\Handler(array(
             'secure' => "false"
         ));
         $this->assertEquals(session_status(), PHP_SESSION_ACTIVE);
@@ -113,9 +111,53 @@ public function testConstructorIncorrectSecureType()
     public function testConstructorIncorrectCredentialsLocation()
     {
         $this->expectOutputString('The credential file could not be located.');
-        $this->session = new \Likel\Session\Handler(array(
+        $session = new \Likel\Session\Handler(array(
             'credentials_location' => "path"
         ));
         $this->assertEquals(session_status(), PHP_SESSION_NONE);
     }
+
+    /**
+     * Check session is in the database
+     */
+    public function testSessionInDatabase()
+    {
+        $session = new \Likel\Session\Handler();
+        $db = new \Likel\DB(__DIR__ . '/../src/ini/credentials.ini');
+        $db->query("
+            SELECT * FROM {$db->getTableName("sessions")}
+            WHERE id = :id
+        ");
+        $db->bind(":id", session_id());
+        $this->assertNotNull($db->result());
+    }
+
+    /**
+     * Test ArrayAccess implementation
+     */
+    public function testArrayAccessImplementation()
+    {
+        $session = new \Likel\Session\Handler();
+
+        // offsetSet test
+        $session["set"] = "foo";
+        $this->assertEquals($session["set"], "foo");
+
+        // offsetGet tests
+        $bar = $session["set"];
+        $this->assertEquals($session["set"], $bar);
+        $this->assertNull($session["not_set"]);
+
+        // offsetExists tests
+        $this->assertTrue(isset($session["set"]));
+        $this->assertFalse(isset($session["not_set"]));
+
+        // offsetUnset test
+        unset($session["set"]);
+        $this->assertNull($session["set"]);
+
+        // __debugInfo test
+        $session["set"] = "foo";
+        $this->assertEquals('Likel\Session\HandlerObject([set]=>foo)', preg_replace('/\s+/', '', print_r($session, true)));
+    }
 }