Skip to content

Commit efae7f7

Browse files
Merge pull request #8 from rakibhasansabbir/feature/upgrade-laravel
Feature/upgrade laravel
2 parents 3dc1a24 + e0beef6 commit efae7f7

4 files changed

Lines changed: 1731 additions & 1486 deletions

File tree

.github/workflows/Test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
php-version: [ 7.4 ]
17+
php-version: [ 8.1 ]
1818

1919
services:
2020
mysql:
@@ -27,11 +27,11 @@ jobs:
2727
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
2828

2929
steps:
30-
- name: Verify MySQL connection
31-
run: |
32-
mysql --version
33-
sudo apt-get install -y mysql-client
34-
mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -ppassword -e "SHOW DATABASES"
30+
# - name: Verify MySQL connection
31+
# run: |
32+
# mysql --version
33+
# sudo apt-get install mysql-client
34+
# mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -ppassword -e "SHOW DATABASES"
3535
- name: Checkout code
3636
uses: actions/checkout@v2
3737

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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,22 @@
88
"license": "MIT",
99
"type": "project",
1010
"require": {
11-
"php": "^7.4",
11+
"php": "^8.1",
1212
"alrik11es/cowsayphp": "^1.2",
13-
"fideloper/proxy": "^4.4",
1413
"fruitcake/laravel-cors": "^2.0",
1514
"guzzlehttp/guzzle": "^7.0.1",
16-
"laravel/framework": "^8.12",
15+
"laravel/framework": "^9.0",
1716
"laravel/passport": "^10.1",
1817
"laravel/tinker": "^2.5",
1918
"laravel/ui": "^3.0",
20-
"league/flysystem": "^1.0"
19+
"league/flysystem": "^3.0"
2120
},
2221
"require-dev": {
2322
"fakerphp/faker": "^1.14",
2423
"beyondcode/laravel-dump-server": "^1.0",
2524
"filp/whoops": "^2.0",
2625
"mockery/mockery": "^1.0",
27-
"nunomaduro/collision": "^5.0",
26+
"nunomaduro/collision": "^6.1",
2827
"phpunit/phpunit": "^9.0"
2928
},
3029
"autoload": {

0 commit comments

Comments
 (0)