Compare commits

...

9 commits

5 changed files with 2099 additions and 1381 deletions

View file

@ -1,4 +1,4 @@
FROM php:7.4-fpm FROM php:8.3-fpm
# Arguments defined in docker-compose.yml # Arguments defined in docker-compose.yml
ARG user ARG user
@ -12,7 +12,8 @@ RUN apt-get update && apt-get install -y \
libonig-dev \ libonig-dev \
libxml2-dev \ libxml2-dev \
zip \ zip \
unzip unzip \
libzip-dev
# Install node # Install node
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
@ -22,7 +23,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
RUN apt-get clean && rm -rf /var/lib/apt/lists/* RUN apt-get clean && rm -rf /var/lib/apt/lists/*
# Install PHP extensions # Install PHP extensions
RUN docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath gd RUN docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath gd zip
# Get latest Composer # Get latest Composer
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

View file

@ -18,7 +18,7 @@ class Kernel extends HttpKernel
protected $middleware = [ protected $middleware = [
// \App\Http\Middleware\TrustHosts::class, // \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class, \App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class, \Illuminate\Http\Middleware\HandleCors::class,
\App\Http\Middleware\CheckForMaintenanceMode::class, \App\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class, \App\Http\Middleware\TrimStrings::class,

View file

@ -2,8 +2,8 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Fideloper\Proxy\TrustProxies as Middleware; use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request; use Symfony\Component\HttpFoundation\Request;
class TrustProxies extends Middleware class TrustProxies extends Middleware
{ {
@ -19,5 +19,8 @@ class TrustProxies extends Middleware
* *
* @var int * @var int
*/ */
protected $headers = Request::HEADER_X_FORWARDED_ALL; protected $headers = Request::HEADER_X_FORWARDED_FOR |
Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO;
} }

View file

@ -8,23 +8,20 @@
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^7.4", "php": "^8.3",
"doctrine/dbal": "^2.2.0", "doctrine/dbal": "^3.0",
"fideloper/proxy": "^4.4", "guzzlehttp/guzzle": "^7.0.1",
"fruitcake/laravel-cors": "^2.0", "laravel/framework": "^12.0",
"guzzlehttp/guzzle": "^6.3.1|^7.0.1", "laravel/sanctum": "^4.0",
"laravel/framework": "^7.29", "laravel/tinker": "^2.8",
"laravel/sanctum": "^2.13", "laravel/ui": "^4.3",
"laravel/tinker": "^2.5",
"laravel/ui": "*",
"league/csv": "^9.8", "league/csv": "^9.8",
"mpdf/mpdf": "^8.1", "mpdf/mpdf": "^8.2",
"prexview/prexview": "^1.1" "prexview/prexview": "^1.1"
}, },
"require-dev": { "require-dev": {
"facade/ignition": "^2.0",
"fakerphp/faker": "^1.9.1", "fakerphp/faker": "^1.9.1",
"nunomaduro/collision": "^4.3" "nunomaduro/collision": "^8.0"
}, },
"config": { "config": {
"optimize-autoloader": true, "optimize-autoloader": true,
@ -55,13 +52,13 @@
"scripts": { "scripts": {
"post-autoload-dump": [ "post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php7.4 artisan package:discover --ansi" "@php artisan package:discover --ansi"
], ],
"post-root-package-install": [ "post-root-package-install": [
"@php7.4 -r \"file_exists('.env') || copy('.env.example', '.env');\"" "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
], ],
"post-create-project-cmd": [ "post-create-project-cmd": [
"@php7.4 artisan key:generate --ansi" "@php artisan key:generate --ansi"
] ]
} }
} }

3435
composer.lock generated

File diff suppressed because it is too large Load diff