Skip to content

Commit

Permalink
Merge pull request #729 from daveroverts/laravel-10
Browse files Browse the repository at this point in the history
feat: update to laravel 10
  • Loading branch information
daveroverts authored Sep 7, 2023
2 parents 648724d + 1300543 commit 41238a6
Show file tree
Hide file tree
Showing 13 changed files with 2,195 additions and 1,739 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ["8.1"]
php-versions: ["8.1", "8.2"]
node: [16, 18]
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Connect Development Environment. Details can be found here: <https://github.com/

Before you begin, make sure you have a server with the following installed:

- PHP 8.1
- PHP 8.1 or greater
- PHP extensions:
- [Laravel](https://laravel.com/docs/deployment)
- BCMath PHP Extension
Expand Down
4 changes: 4 additions & 0 deletions app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ protected function schedule(Schedule $schedule)
if (config('queue.default') == 'redis') {
$schedule->command('horizon:snapshot')->everyFiveMinutes();
}

if (config('queue.default') == 'redis') {
$schedule->command('cache:prune-stale-tags')->hourly();
}
}

/**
Expand Down
5 changes: 1 addition & 4 deletions app/Models/Booking.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,7 @@ class Booking extends Model
protected $casts = [
'is_editable' => 'boolean',
'has_already_received_final_information_email' => 'boolean',
];

protected $dates = [
'final_information_email_sent_at',
'final_information_email_sent_at' => 'datetime',
];

/**
Expand Down
20 changes: 6 additions & 14 deletions app/Models/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,6 @@ class Event extends Model
'id', 'slug',
];

/**
* The attributes that should be mutated to dates.
*
* @var array
*/
protected $dates = [
'startEvent',
'endEvent',
'startBooking',
'endBooking',
'created_at',
'updated_at',
];

/**
* The attributes that should be cast to native types.
*
Expand All @@ -112,6 +98,12 @@ class Event extends Model
'uses_times' => 'boolean',
'multiple_bookings_allowed' => 'boolean',
'is_oceanic_event' => 'boolean',
'startEvent' => 'datetime',
'endEvent' => 'datetime',
'startBooking' => 'datetime',
'endBooking' => 'datetime',
'created_at' => 'datetime',
'updated_at' => 'datetime',
];

public function getActivitylogOptions(): LogOptions
Expand Down
9 changes: 6 additions & 3 deletions app/Models/Flight.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,14 @@ class Flight extends Model
protected $guarded = ['id'];

/**
* The attributes that should be mutated to dates.
* The attributes that should be cast to native types.
*
* @var array
* @var array<string, string>
*/
protected $dates = ['ctot', 'eta'];
protected $casts = [
'ctot' => 'datetime',
'eta' => 'datetime',
];

/**
* The relationships that should be touched on save.
Expand Down
42 changes: 20 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,39 @@
"php": "^8.1",
"aws/aws-sdk-php": "^3.209",
"bensampo/laravel-enum": "^6.0",
"blade-ui-kit/blade-ui-kit": "^0.3.3",
"bugsnag/bugsnag-laravel": "^2.22",
"cviebrock/eloquent-sluggable": "^9.0",
"blade-ui-kit/blade-ui-kit": "^0.4",
"bugsnag/bugsnag-laravel": "^2.26",
"cviebrock/eloquent-sluggable": "^10.0",
"doctrine/dbal": "^3.3",
"laravel/framework": "^9.23",
"laravel/framework": "^10.0",
"laravel/horizon": "^5.9",
"laravel/telescope": "^4.9",
"laravel/tinker": "^2.7",
"league/flysystem-aws-s3-v3": "^3.0",
"league/oauth2-client": "^2.6",
"livewire/livewire": "^2.10",
"livewire/livewire": "^2.12",
"maatwebsite/excel": "^3.1",
"predis/predis": "^2.0",
"protonemedia/laravel-form-components": "^3.5",
"sentry/sentry-laravel": "^3.1",
"spatie/laravel-activitylog": "^4.4",
"spatie/laravel-ignition": "^1.0",
"tabuna/breadcrumbs": "^3.0"
"protonemedia/laravel-form-components": "^3.8",
"sentry/sentry-laravel": "^3.2",
"spatie/laravel-activitylog": "^4.7",
"spatie/laravel-ignition": "^2.0",
"tabuna/breadcrumbs": "^4.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.6",
"barryvdh/laravel-ide-helper": "^2.12",
"beyondcode/laravel-query-detector": "^1.6",
"brianium/paratest": "^6.4",
"barryvdh/laravel-ide-helper": "^2.13",
"beyondcode/laravel-query-detector": "^1.7",
"fakerphp/faker": "^1.18",
"laravel/pint": "^1.2",
"laravel/pint": "^1.10",
"laravel/sail": "^1.13",
"mockery/mockery": "^1.5",
"nunomaduro/collision": "^6.1",
"nunomaduro/collision": "^7.0",
"nunomaduro/larastan": "^2.0",
"pestphp/pest": "^1.21",
"pestphp/pest-plugin-laravel": "^1.2",
"pestphp/pest-plugin-livewire": "^1.0",
"pestphp/pest-plugin-parallel": "^1.1",
"phpunit/phpunit": "^9.5"
"pestphp/pest": "^2.0",
"pestphp/pest-plugin-laravel": "^2.0",
"pestphp/pest-plugin-livewire": "^2.0",
"phpunit/phpunit": "^10.0"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -95,6 +93,6 @@
"php-http/discovery": true
}
},
"minimum-stability": "dev",
"minimum-stability": "stable",
"prefer-stable": true
}
}
Loading

0 comments on commit 41238a6

Please sign in to comment.