Laravel octane (not merge)

.gitignore

@@ -52,4 +52,7 @@ devhub/pm-font/dist
 test-db-snapshot.db
 snapshot_*.db
 storage/transitions
-.envrc
+.envrc
+**/caddy
+frankenphp
+frankenphp-worker.php

ProcessMaker/Http/Middleware/SetLocale.php

@@ -2,9 +2,11 @@
 
 namespace ProcessMaker\Http\Middleware;
 
+use Carbon\Carbon;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
 
 /**
  * Sets the locale based on url parameter
@@ -19,18 +21,15 @@ class SetLocale
      */
     public function handle(Request $request, Closure $next)
     {
-        // Grab the locale
-        $locale = config('app.locale');
-        $user = \Auth::user();
-        if ($user && $user->language !== null) {
-            $locale = \Auth::user()->language;
-        }
-        if ($locale) {
-            // Use the App facade to set the locale for our request lifecycle
-            App::setLocale($locale);
+        $locale = config('app.locale', 'en');
+
+        if (($user = Auth::user()) && !empty($user->language)) {
+            $locale = $user->language;
         }
 
-        // Process next
+        App::setLocale($locale);
+        Carbon::setLocale($locale);
+
         return $next($request);
     }
 }

ProcessMaker/Repositories/SettingsConfigRepository.php

@@ -39,7 +39,7 @@ public function get($key, $default = null)
         if ($key === 'session.lifetime') {
             $settingValue = $this->getFromSettings($key);
 
-            return $settingValue ?? $default;
+            return $settingValue ?: Arr::get($this->items, $key) ?: $default ?: 120;
         }
 
         if (Arr::has($this->items, $key)) {

composer.json

@@ -26,6 +26,7 @@
         "jenssegers/agent": "^2.6",
         "laravel/framework": "^13.0",
         "laravel/horizon": "^5.45",
+        "laravel/octane": "^2.17",
         "laravel/pail": "^1.2",
         "laravel/passport": "^13.7",
         "laravel/scout": "^11.1",