Compare commits

..

No commits in common. "98120f1ce903cfb51fc3a0dee42e4557472befab" and "116875b769afcd4bfe1f018a23d270b63c8dfe9b" have entirely different histories.

5 changed files with 1370 additions and 2088 deletions

View file

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

View file

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

View file

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

View file

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

3413
composer.lock generated

File diff suppressed because it is too large Load diff