Skip to content

Commit

Permalink
[Debt] Laravel11 upgrade (#11718)
Browse files Browse the repository at this point in the history
* upgrade laravel 11

* upgrade nunomaduro/collision to 8.1 as
per the laravel doc

* remove unnecessary ignore

* fix linting

* add null check

* remove ignores

* remove getBody error ignore again!

* remove extended language tag for french
  • Loading branch information
brindasasi authored Oct 16, 2024
1 parent a994de5 commit 837063d
Show file tree
Hide file tree
Showing 6 changed files with 614 additions and 576 deletions.
2 changes: 1 addition & 1 deletion api/app/Http/Controllers/SupportController.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function createTicket(Request $request)
}

// we don't recognize an error so send a generic 500
Log::error('Error when trying to create a ticket: '.$response->getBody(true));
Log::error('Error when trying to create a ticket: '.$response->getBody());

return response([
'serviceResponse' => 'error',
Expand Down
6 changes: 3 additions & 3 deletions api/app/Models/Pool.php
Original file line number Diff line number Diff line change
Expand Up @@ -350,13 +350,13 @@ public function getStatusAttribute()
return PoolStatus::DRAFT->name;
}

if (Carbon::now()->gte($this->archived_at)) {
if ($this->archived_at && Carbon::now()->gte($this->archived_at)) {
return PoolStatus::ARCHIVED->name;
}
if (Carbon::now()->gte($this->closing_date)) {
if ($this->closing_date && Carbon::now()->gte($this->closing_date)) {
return PoolStatus::CLOSED->name;
}
if (Carbon::now()->gte($this->published_at)) {
if ($this->published_at && Carbon::now()->gte($this->published_at)) {
return PoolStatus::PUBLISHED->name;
}

Expand Down
4 changes: 2 additions & 2 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
"doctrine/dbal": "^3.1",
"gctc-ntgc/laravel-scout-postgres-tsvector": "^1.0",
"guzzlehttp/guzzle": "^7.4",
"laravel/framework": "^10.0",
"laravel/framework": "^11.0",
"laravel/scout": "^10.5",
"laravel/tinker": "^2.6",
"lcobucci/clock": "^3.0.0",
"lcobucci/jwt": "^5.0.0",
"mll-lab/graphql-php-scalars": "^6.2",
"mll-lab/laravel-graphiql": "^3.0",
"nunomaduro/collision": "^8.1",
"nuwave/lighthouse": "^6.15",
"phpoffice/phpspreadsheet": "^3.3",
"phpoffice/phpword": "^1.2",
Expand All @@ -35,7 +36,6 @@
"larastan/larastan": "^2.0",
"laravel/pint": "^1.11",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0",
"phpunit/phpunit": "^10.0"
},
"autoload": {
Expand Down
Loading

0 comments on commit 837063d

Please sign in to comment.