diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f81463d..2a7234a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.7...master) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.9...master) + + +## [v8.5.9 (2021-01-19)](https://github.com/laravel/laravel/compare/v8.5.8...v8.5.9) + +### Removed +- Delete `docker-compose.yml` ([#5522](https://github.com/laravel/laravel/pull/5522)) + + +## [v8.5.8 (2021-01-12)](https://github.com/laravel/laravel/compare/v8.5.7...v8.5.8) + +### Fixed +- Update `TrustProxies.php` ([#5514](https://github.com/laravel/laravel/pull/5514)) ## [v8.5.7 (2021-01-05)](https://github.com/laravel/laravel/compare/v8.5.6...v8.5.7) diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 14befceb..a3b6aef9 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -19,5 +19,5 @@ class TrustProxies extends Middleware * * @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 | Request::HEADER_X_FORWARDED_AWS_ELB; } diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index c7f92ef5..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,74 +0,0 @@ -# For more information: https://laravel.com/docs/sail -version: '3' -services: - laravel.test: - build: - context: ./vendor/laravel/sail/runtimes/8.0 - dockerfile: Dockerfile - args: - WWWGROUP: '${WWWGROUP}' - image: sail-8.0/app - ports: - - '${APP_PORT:-80}:80' - environment: - WWWUSER: '${WWWUSER}' - LARAVEL_SAIL: 1 - volumes: - - '.:/var/www/html' - networks: - - sail - depends_on: - - mysql - - redis - # - selenium - # selenium: - # image: 'selenium/standalone-chrome' - # volumes: - # - '/dev/shm:/dev/shm' - # networks: - # - sail - # depends_on: - # - laravel.test - mysql: - image: 'mysql:8.0' - ports: - - '${FORWARD_DB_PORT:-3306}:3306' - environment: - MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' - MYSQL_DATABASE: '${DB_DATABASE}' - MYSQL_USER: '${DB_USERNAME}' - MYSQL_PASSWORD: '${DB_PASSWORD}' - MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' - volumes: - - 'sailmysql:/var/lib/mysql' - networks: - - sail - redis: - image: 'redis:alpine' - ports: - - '${FORWARD_REDIS_PORT:-6379}:6379' - volumes: - - 'sailredis:/data' - networks: - - sail - # memcached: - # image: 'memcached:alpine' - # ports: - # - '11211:11211' - # networks: - # - sail - mailhog: - image: 'mailhog/mailhog:latest' - ports: - - '${FORWARD_MAILHOG_PORT:-1025}:1025' - - '${FORWARD_MAILHOG_DASHBOARD_PORT:-8025}:8025' - networks: - - sail -networks: - sail: - driver: bridge -volumes: - sailmysql: - driver: local - sailredis: - driver: local diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 2e2820b0..c77e41ce 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -90,7 +90,7 @@ return [ 'string' => 'The :attribute must be at least :min characters.', 'array' => 'The :attribute must have at least :min items.', ], - 'multiple_of' => 'The :attribute must be a multiple of :value', + 'multiple_of' => 'The :attribute must be a multiple of :value.', 'not_in' => 'The selected :attribute is invalid.', 'not_regex' => 'The :attribute format is invalid.', 'numeric' => 'The :attribute must be a number.',