Fix session locking

Author: w3labkr

app.test/.env

@@ -20,7 +20,7 @@ CACHE_DRIVER=file
 FILESYSTEM_DRIVER=local
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
-SESSION_LIFETIME=120
+SESSION_LIFETIME=1440
 
 MEMCACHED_HOST=127.0.0.1
 

app.test/app/Controllers/Auth/Farewell.php

@@ -9,7 +9,7 @@ class Farewell extends Controller implements ControllerInterface
 {
     public function get()
     {
-        session_destroy();
+        session()->destroy();
 
         echo $this->view('pages.auth.farewell');
     }

app.test/app/Controllers/Auth/Logout.php

@@ -9,7 +9,7 @@ class Logout extends Controller implements ControllerInterface
 {
     public function get()
     {
-        session_destroy();
+        session()->destroy();
 
         cookie('Strict')->del('uuid');
         cookie('Strict')->del('remember_token');

app.test/app/Controllers/Auth/ResetPassword.php

@@ -47,7 +47,7 @@ public function post()
                 $data['status'] = 'success';
                 $data['message'] = 'Your password has been successfully changed.';
 
-                session_destroy();
+                session()->destroy();
             }
         } else {
             $data['status'] = 'fail';

app.test/app/Controllers/Auth/Welcome.php

@@ -13,7 +13,7 @@ public function get()
         $userid = session()->get('userid');
         (new Users())->updateWelcomedById(1, $userid);
 
-        session_destroy();
+        session()->destroy();
 
         echo $this->view('pages.auth.welcome');
     }

app.test/app/Helpers/Session.php

@@ -6,7 +6,9 @@ class Session
 {
     public function set(string $path, mixed $value = null, string $separator = '.'): void
     {
+        session_start();
         Dot::set($_SESSION, $path, $value, $separator);
+        session_write_close();
     }
 
     public function get(string $path, string $separator = '.'): mixed
@@ -21,6 +23,15 @@ public function has(string $path, string $separator = '.'): bool
 
     public function del(string $path, string $separator = '.'): void
     {
+        session_start();
         Dot::del($_SESSION, $path, $separator);
+        session_write_close();
+    }
+
+    public function destroy(): void
+    {
+        session_start();
+        session_unset();
+        session_destroy();
     }
 }

app.test/app/Models/UserFaker.php

@@ -19,7 +19,7 @@ public function createTable(): UserFaker
     {
         $this->pdo->exec(file_get_contents(SQL_PATH.'/createUsersTable.sql'));
 
-        session_destroy();
+        session()->destroy();
 
         echo "Created User Table.\n";
 
@@ -30,7 +30,7 @@ public function dropTable(): UserFaker
     {
         $this->pdo->exec(file_get_contents(SQL_PATH.'/dropUsersTable.sql'));
 
-        session_destroy();
+        session()->destroy();
 
         echo "Dropped User Table.\n";
 

app.test/app/helpers.php

@@ -45,7 +45,7 @@ function bin2uuid4(string $binary = ''): string
 if (!function_exists('session')) {
     function session(): App\Helpers\Session
     {
-        return new \App\Helpers\Session();
+        return new \App\Helpers\Session;
     }
 }
 
@@ -63,37 +63,9 @@ function mailer(): PHPMailer\PHPMailer\PHPMailer
     }
 }
 
-if (!function_exists('str_random')) {
-    function str_random(int $length = 10): string
-    {
-        return \App\Helpers\Str::random($length);
-    }
-}
-
-if (!function_exists('str_starts_with')) {
-    function str_starts_with(string $haystack, string $needle): bool
-    {
-        return \App\Helpers\Str::str_starts_with($haystack, $needle);
-    }
-}
-
-if (!function_exists('str_ends_with')) {
-    function str_ends_with(string $haystack, string $needle): bool
-    {
-        return \App\Helpers\Str::str_ends_with($haystack, $needle);
-    }
-}
-
-if (!function_exists('str_contains')) {
-    function str_contains(string $haystack, string $needle): bool
-    {
-        return \App\Helpers\Str::str_contains($haystack, $needle);
-    }
-}
-
 if (!function_exists('substr_replace_offset')) {
     function substr_replace_offset(string $search, string $replace, int $start = 0, int|null $end = null): string
     {
         return \App\Helpers\Str::substr_replace_offset($search, $replace, $start, $end);
     }
-}
+}

app.test/config/session.php

@@ -28,7 +28,8 @@
     |
     */
 
-    'lifetime' => env('SESSION_LIFETIME', 120),
+    'lifetime' => env('SESSION_LIFETIME', 1440),
+    'expire' => env('SESSION_EXPIRE', 30),
 
     /*
     |--------------------------------------------------------------------------

app.test/public/index.php

@@ -8,13 +8,13 @@
 ini_set('display_errors', 1);
 
 // Start The Application
-require_once __DIR__.'/../server.php';
+require_once __DIR__ . '/../server.php';
 
 // Create Router instance
 $router = new \Bramus\Router\Router();
 
 // Define routes
-(require_once __DIR__.'/../routes/web.php')($router);
+(require_once __DIR__ . '/../routes/web.php')($router);
 
 // Run it!
-$router->run();
+$router->run();