Skip to content

Commit 92dfff5

Browse files
committed
feat(FOUR-31695): add support for Laravel Octane in core
1 parent 46dd5a3 commit 92dfff5

4 files changed

Lines changed: 15 additions & 12 deletions

File tree

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,7 @@ devhub/pm-font/dist
5252
test-db-snapshot.db
5353
snapshot_*.db
5454
storage/transitions
55-
.envrc
55+
.envrc
56+
**/caddy
57+
frankenphp
58+
frankenphp-worker.php

‎ProcessMaker/Http/Middleware/SetLocale.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
namespace ProcessMaker\Http\Middleware;
44

5+
use Carbon\Carbon;
56
use Closure;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Facades\App;
9+
use Illuminate\Support\Facades\Auth;
810

911
/**
1012
* Sets the locale based on url parameter
@@ -19,18 +21,15 @@ class SetLocale
1921
*/
2022
public function handle(Request $request, Closure $next)
2123
{
22-
// Grab the locale
23-
$locale = config('app.locale');
24-
$user = \Auth::user();
25-
if ($user && $user->language !== null) {
26-
$locale = \Auth::user()->language;
27-
}
28-
if ($locale) {
29-
// Use the App facade to set the locale for our request lifecycle
30-
App::setLocale($locale);
24+
$locale = config('app.locale', 'en');
25+
26+
if (($user = Auth::user()) && !empty($user->language)) {
27+
$locale = $user->language;
3128
}
3229

33-
// Process next
30+
App::setLocale($locale);
31+
Carbon::setLocale($locale);
32+
3433
return $next($request);
3534
}
3635
}

‎ProcessMaker/Repositories/SettingsConfigRepository.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function get($key, $default = null)
3939
if ($key === 'session.lifetime') {
4040
$settingValue = $this->getFromSettings($key);
4141

42-
return $settingValue ?? $default;
42+
return $settingValue ?: Arr::get($this->items, $key) ?: $default ?: 120;
4343
}
4444

4545
if (Arr::has($this->items, $key)) {

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"jenssegers/agent": "^2.6",
2727
"laravel/framework": "^13.0",
2828
"laravel/horizon": "^5.45",
29+
"laravel/octane": "^2.17",
2930
"laravel/pail": "^1.2",
3031
"laravel/passport": "^13.7",
3132
"laravel/scout": "^11.1",

0 commit comments

Comments
 (0)