Skip to content

Commit cb580c5

Browse files
authored
Merge pull request #18 from abdelhamiderrahmouni/main
Redesign of Laravel-zero.com's home page, update laravel to v9 and update of npm dependencies
2 parents a486bee + 6f267f2 commit cb580c5

30 files changed

+4796
-13651
lines changed

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ PUSHER_APP_KEY=
4242
PUSHER_APP_SECRET=
4343
PUSHER_APP_CLUSTER=mt1
4444

45-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
46-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
45+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
46+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ npm-debug.log
1717
yarn-error.log
1818
.php-cs-fixer.cache
1919
/.idea
20+
/public/build

app/Http/Middleware/TrustProxies.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace App\Http\Middleware;
44

55
use Illuminate\Http\Request;
6-
use Fideloper\Proxy\TrustProxies as Middleware;
6+
use Illuminate\Http\Middleware\TrustProxies as Middleware;
77

88
class TrustProxies extends Middleware
99
{
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
1919
*
2020
* @var int
2121
*/
22-
protected $headers = Request::HEADER_X_FORWARDED_ALL;
22+
protected $headers =
23+
Request::HEADER_X_FORWARDED_FOR |
24+
Request::HEADER_X_FORWARDED_HOST |
25+
Request::HEADER_X_FORWARDED_PORT |
26+
Request::HEADER_X_FORWARDED_PROTO |
27+
Request::HEADER_X_FORWARDED_AWS_ELB;
2328
}

composer.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,33 @@
44
"description": "The Laravel Zero website",
55
"license": "MIT",
66
"require": {
7-
"php": "^7.4|^8.0",
7+
"php": "^8.1",
88
"ext-json": "*",
99
"ext-simplexml": "*",
1010
"erusev/parsedown-extra": "^0.8.1",
11-
"fideloper/proxy": "^4.4",
1211
"fruitcake/laravel-cors": "^2.0",
1312
"guzzlehttp/guzzle": "^7.2",
14-
"laravel/framework": "^8.71",
13+
"laravel/framework": "^9.19.0",
1514
"laravel/tinker": "^2.6",
16-
"league/commonmark": "^1.5",
15+
"league/commonmark": "^2.2",
1716
"spatie/yaml-front-matter": "^2.0",
1817
"symfony/yaml": "^5.2"
1918
},
2019
"require-dev": {
21-
"facade/ignition": "^2.7",
20+
"spatie/laravel-ignition": "^1.0",
2221
"friendsofphp/php-cs-fixer": "^3.0",
2322
"fakerphp/faker": "^1.14",
2423
"mockery/mockery": "^1.4",
25-
"nunomaduro/collision": "^5.3",
24+
"nunomaduro/collision": "^6.1",
2625
"pestphp/pest": "^1.2",
27-
"pestphp/pest-plugin-laravel": "^1.0"
26+
"pestphp/pest-plugin-laravel": "^1.4"
2827
},
2928
"config": {
3029
"optimize-autoloader": true,
3130
"preferred-install": "dist",
3231
"sort-packages": true,
3332
"platform": {
34-
"php": "7.4"
33+
"php": "8.1"
3534
},
3635
"allow-plugins": {
3736
"pestphp/pest-plugin": true

0 commit comments

Comments
 (0)