Skip to content

Commit 74804e1

Browse files
authored
Merge pull request #44 from laravelcm/migrate-laravel-9
⬆️ migration vers Laravel 9
2 parents d6e2a49 + bea926c commit 74804e1

File tree

6 files changed

+1370
-1055
lines changed

6 files changed

+1370
-1055
lines changed

app/Http/Middleware/TrustProxies.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Middleware;
44

5-
use Fideloper\Proxy\TrustProxies as Middleware;
5+
use Illuminate\Http\Middleware\TrustProxies as Middleware;
66
use Illuminate\Http\Request;
77

88
class TrustProxies extends Middleware
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
1919
*
2020
* @var int
2121
*/
22-
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;
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
}

app/helpers.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
22

3+
use GrahamCampbell\Markdown\Facades\Markdown;
34
use Illuminate\Support\Facades\Auth;
45

56
if (! function_exists('active')) {
@@ -28,7 +29,7 @@ function is_active($routes): bool
2829
*/
2930
function md_to_html(string $markdown): string
3031
{
31-
return Markdown::convertToHtml($markdown);
32+
return Markdown::convert($markdown);
3233
}
3334
}
3435

composer.json

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,35 @@
88
"php": "^8.0",
99
"ext-fileinfo": "*",
1010
"ext-json": "*",
11-
"archtechx/laravel-seo": "^0.2.2",
12-
"blade-ui-kit/blade-heroicons": "^1.2",
13-
"blade-ui-kit/blade-ui-kit": "^0.2.0",
14-
"cyrildewit/eloquent-viewable": "^6.0",
15-
"doctrine/dbal": "^3.1",
16-
"fideloper/proxy": "^4.4",
11+
"archtechx/laravel-seo": "^0.4.0",
12+
"blade-ui-kit/blade-heroicons": "^1.3",
13+
"blade-ui-kit/blade-ui-kit": "^0.3",
14+
"cyrildewit/eloquent-viewable": "^6.1",
15+
"doctrine/dbal": "^3.3",
1716
"fruitcake/laravel-cors": "^2.0",
18-
"graham-campbell/markdown": "^13.1",
17+
"graham-campbell/markdown": "^14.0",
1918
"guzzlehttp/guzzle": "^7.0.1",
2019
"jenssegers/agent": "^2.6",
21-
"laravel-notification-channels/telegram": "^0.7.0",
22-
"laravel-notification-channels/twitter": "^5.1",
23-
"laravel/fortify": "^1.7",
24-
"laravel/framework": "^v8.76",
25-
"laravel/slack-notification-channel": "^2.3",
20+
"laravel-notification-channels/telegram": "^2.0",
21+
"laravel-notification-channels/twitter": "^6.0",
22+
"laravel/fortify": "^1.13",
23+
"laravel/framework": "^9.0",
24+
"laravel/slack-notification-channel": "^2.4",
2625
"laravel/socialite": "^5.2",
2726
"laravel/tinker": "^2.5",
2827
"livewire/livewire": "^2.10",
29-
"qcod/laravel-gamify": "^1.0",
28+
"qcod/laravel-gamify": "^1.0.6",
3029
"ramsey/uuid": "^4.2",
3130
"sentry/sentry-laravel": "^2.10",
3231
"socialiteproviders/twitter": "^4.1",
33-
"spatie/laravel-feed": "^4.0",
32+
"spatie/laravel-feed": "^4.1",
3433
"spatie/laravel-medialibrary": "^9.0.0",
3534
"spatie/laravel-permission": "^5.1",
36-
"spatie/laravel-sitemap": "^6.0",
35+
"spatie/laravel-sitemap": "^6.1",
3736
"stevebauman/location": "^6.2",
38-
"torchlight/torchlight-commonmark": "^0.5.2",
37+
"symfony/http-client": "^6.0",
38+
"symfony/mailgun-mailer": "^6.0",
39+
"torchlight/torchlight-commonmark": "^0.5.5",
3940
"wire-elements/modal": "^1.0",
4041
"wire-elements/spotlight": "^1.0",
4142
"wireui/wireui": "^1.1.3",
@@ -44,15 +45,15 @@
4445
"require-dev": {
4546
"barryvdh/laravel-debugbar": "^3.6",
4647
"brianium/paratest": "^6.3",
47-
"facade/ignition": "^2.5",
48+
"spatie/laravel-ignition": "^1.0",
4849
"fakerphp/faker": "^1.9.1",
4950
"friendsofphp/php-cs-fixer": "^3.0",
5051
"laravel/sail": "^1.0.1",
5152
"mockery/mockery": "^1.4.2",
52-
"nunomaduro/collision": "^5.0",
53-
"pestphp/pest-plugin-laravel": "^1.1",
53+
"nunomaduro/collision": "^6.0",
54+
"pestphp/pest-plugin-laravel": "^1.2.0",
5455
"pestphp/pest-plugin-livewire": "^1.0",
55-
"phpunit/phpunit": "^9.3.3",
56+
"phpunit/phpunit": "^9.5.20",
5657
"spatie/test-time": "^1.2"
5758
},
5859
"autoload": {

0 commit comments

Comments
 (0)