diff --git a/.env.full b/.env.full index ae683d7..a504203 100644 --- a/.env.full +++ b/.env.full @@ -6,7 +6,7 @@ APP_KEY= APP_DEBUG=true APP_TIMEZONE=UTC -APP_URL=https://localhost +APP_URL=http://localhost APP_LOCALE=en APP_FALLBACK_LOCALE=en APP_FAKER_LOCALE=en_US @@ -82,7 +82,7 @@ MAIL_ENCRYPTION=null MAIL_FROM_ADDRESS="no-reply@sp-tarkov.com" MAIL_FROM_NAME="${APP_NAME}" -OCTANE_SERVER=frankenphp -OCTANE_HTTPS=true +OCTANE_SERVER=swoole +OCTANE_HTTPS=false SAIL_XDEBUG_MODE=develop,debug,coverage diff --git a/.github/README.md b/.github/README.md index aa584bd..518895e 100644 --- a/.github/README.md +++ b/.github/README.md @@ -27,9 +27,9 @@ We use [Laravel Sail](https://laravel.com/docs/11.x/sail) to mirror the services | Service | Authentication | Access Via Host | |----------------------------------|----------------|-----------------------------| -| Laravel Filament Admin Panel | Via User Role | | -| Redis Queue Management (Horizon) | Via User Role | | -| Website Status (Pulse) | Via User Role | | +| Laravel Filament Admin Panel | Via User Role | | +| Redis Queue Management (Horizon) | Via User Role | | +| Website Status (Pulse) | Via User Role | | | Meilisearch WebUI | Local Only | | | Mailpit WebUI | Local Only | | diff --git a/.gitignore b/.gitignore index 6062808..54dc261 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ /.idea /.phpunit.cache /.vscode +/caddy +/config/psysh /data /node_modules /public/build @@ -21,4 +23,3 @@ Homestead.json Homestead.yaml npm-debug.log yarn-error.log -config/psysh diff --git a/composer.json b/composer.json index 872fede..88f1c36 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "require": { "php": "^8.3", "ext-curl": "*", + "ext-intl": "*", "aws/aws-sdk-php": "^3.314", "filament/filament": "^3.2", "http-interop/http-factory-guzzle": "^1.2", diff --git a/config/octane.php b/config/octane.php index ee11765..c6b2ad8 100644 --- a/config/octane.php +++ b/config/octane.php @@ -12,10 +12,13 @@ use Laravel\Octane\Events\WorkerErrorOccurred; use Laravel\Octane\Events\WorkerStarting; use Laravel\Octane\Events\WorkerStopping; use Laravel\Octane\Listeners\CloseMonologHandlers; +use Laravel\Octane\Listeners\CollectGarbage; +use Laravel\Octane\Listeners\DisconnectFromDatabases; use Laravel\Octane\Listeners\EnsureUploadedFilesAreValid; use Laravel\Octane\Listeners\EnsureUploadedFilesCanBeMoved; use Laravel\Octane\Listeners\FlushOnce; use Laravel\Octane\Listeners\FlushTemporaryContainerInstances; +use Laravel\Octane\Listeners\FlushUploadedFiles; use Laravel\Octane\Listeners\ReportException; use Laravel\Octane\Listeners\StopWorkerIfNecessary; use Laravel\Octane\Octane; @@ -35,7 +38,7 @@ return [ | */ - 'server' => env('OCTANE_SERVER', 'frankenphp'), + 'server' => env('OCTANE_SERVER', 'swoole'), /* |-------------------------------------------------------------------------- @@ -48,7 +51,7 @@ return [ | */ - 'https' => env('OCTANE_HTTPS', true), + 'https' => env('OCTANE_HTTPS', false), /* |-------------------------------------------------------------------------- @@ -132,7 +135,7 @@ return [ ], 'flush' => [ - // + \Barryvdh\Debugbar\LaravelDebugbar::class, ], /* diff --git a/docker-compose.yml b/docker-compose.yml index d228206..85194b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,9 +19,7 @@ services: XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}' XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}' IGNITION_LOCAL_SITES_PATH: '${PWD}' - SUPERVISOR_PHP_COMMAND: "/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan octane:start --host=localhost --port=443 --admin-port=2019 --https --watch" - XDG_CONFIG_HOME: /var/www/html/config - XDG_DATA_HOME: /var/www/html/data + SUPERVISOR_PHP_COMMAND: "/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan octane:start --server=swoole --host=0.0.0.0 --port=80 --watch" volumes: - '.:/var/www/html' networks: